From patchwork Tue May 2 01:01:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49739 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6A3FE27BBE2; Tue, 2 May 2023 02:03:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7933127BBE9 for ; Tue, 2 May 2023 02:03:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pteQ5-0001Sw-LK; Mon, 01 May 2023 21:03:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pteQ2-0001S3-SC for guix-patches@gnu.org; Mon, 01 May 2023 21:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pteQ2-00037Q-Ce for guix-patches@gnu.org; Mon, 01 May 2023 21:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pteQ2-0005DZ-8W for guix-patches@gnu.org; Mon, 01 May 2023 21:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch 1/4] gnu: mesa: Fix library paths in Vulkan layer manifests. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 May 2023 01:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63219@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: 63219@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168298933219919 (code B ref -1); Tue, 02 May 2023 01:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2023 01:02:12 +0000 Received: from localhost ([127.0.0.1]:41294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptePD-0005B9-OT for submit@debbugs.gnu.org; Mon, 01 May 2023 21:02:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:48420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pteP8-0005Am-OC for submit@debbugs.gnu.org; Mon, 01 May 2023 21:02:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pteP8-0001Gg-HZ for guix-patches@gnu.org; Mon, 01 May 2023 21:02:06 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pteP6-0002sw-Lo for guix-patches@gnu.org; Mon, 01 May 2023 21:02:06 -0400 Date: Tue, 02 May 2023 01:01:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682989322; x=1683248522; bh=vixj9XIYRm2gNp2J6c7vSww3fUz3dCObaj2JEM+6ezA=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=RybmREq00a7tDSMvzfgLPjUinOlM0ySsfr5RIjFK8EhjmfqrjzGr4XHcgSUd4W9Ig mgbbHUkuQWKJjneDimLZDcTswcKi0yQoGH9kwLHIOjyhC2Di2aAxs0mSsWHFKqwi/F Gb6q65y9bPjJlOtPdgGGJ/Ys4Oqp7OGb3HBL9hvJmZNByP8dHFfgd/HE6ALoqdZkwI zb3d0wsvZL37e9ung6PWQbNM1vbZoTei3/h+N4n3DDjl+X6J89a2ldY+BNkn3YuSXI mSy+o7sdpnpArBWzt5AlQjQarr9KPEgwPzj2dpWaM3nF3afXRahmCOm/tVmNVnGY87 oFaSZSNvGBZYw== Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.22; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-4322.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (mesa): Fix library paths in Vulkan layer manifests. --- gnu/packages/gl.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) -- 2.39.2 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3a63d70c7a..6521170ebb 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021, 2022 John Kehayias ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2023 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -488,7 +489,28 @@ (define-public mesa file) (symlink reference file))) others)))) - (delete-duplicates inodes)))))))) + (delete-duplicates inodes))))) + (add-after 'install 'set-layer-path-in-manifests + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (implicit-path (string-append + out + "/share/vulkan/implicit_layer.d/")) + (explicit-path (string-append + out + "/share/vulkan/explicit_layer.d/")) + (fix-layer-path + (lambda (layer-name) + (let* ((explicit (string-append explicit-path layer-name ".json")) + (implicit (string-append implicit-path layer-name ".json")) + (manifest (if (file-exists? explicit) + explicit + implicit))) + (substitute* manifest + (((string-append "\"lib" layer-name ".so\"")) + (string-append "\"" out "/lib/lib" layer-name ".so\""))))))) + (for-each fix-layer-path '("VkLayer_MESA_device_select" + "VkLayer_MESA_overlay")))))))) (home-page "https://mesa3d.org/") (synopsis "OpenGL and Vulkan implementations") (description "Mesa is a free implementation of the OpenGL and Vulkan