From patchwork Fri Sep 6 15:07:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67666 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 AF4F027BBEA; Fri, 6 Sep 2024 16:08:17 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 EFCCF27BBE2 for ; Fri, 6 Sep 2024 16:08:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaZB-0007Dk-Hu; Fri, 06 Sep 2024 11:08: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 1smaZ9-00076B-96 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaZ9-0003Sj-00 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=Hx+4LLjq9fszJThul22pTkiXdP+/ZXxVnksxMx3a2eE=; b=MDsKh41LdC3q/XCw3eMGqBhrIAHnnQCn7EHJBDHmGp4hZ7SADF+91E5+D43wigLbr8/dl5djGybn4J6Bqb3JuxZy9hpbXhR7jC3PMw3lv13ZzsFmzadPBSxDvLLNPc05ArisFIkTWyvAvtyh1RvzaN1bw8ZjJRBOpKhjYJ+CpfGR5EuSBwVIfvpqG4uXRQqEbgXjmg2F+UIY4vmMEX5Fvn7BhQ8jlSlKbsUHvYEx0APGfHlWDTl8ZJh7FM4lGXtdfrMdBtEDaVQPyDdTqK1AIKfArGACuEj6t+UjFZjYtb1MJlWa+A7hJePndbBDixG3I8qESLG2w6lv68WRhm04bw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaZ8-00053l-Fc for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 4/8] gnu: vulkan-headers: Hard-code libvulkan.so file name. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , nathan , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563524319354 (code B ref 73071); Fri, 06 Sep 2024 15:08:02 +0000 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:07:23 +0000 Received: from localhost ([127.0.0.1]:53810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYU-000526-KZ for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:22 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:35163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYS-00051r-Ex for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635235; x=1725894435; bh=Hx+4LLjq9fszJThul22pTkiXdP+/ZXxVnksxMx3a2eE=; 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=B0+NG6arGPTsAaxMQLWfiZ5eWRDjHvJwNqaKEftscYnfbW+UkiyBxdj1eePoClLFM yt15jRxTYXxrw8GO1gKncKF4J4W7gqcjlRx4fI4nBQxyrZBJZjYUP+1ObpaMfOsQ1j 8KeRLR8i51WkO30zQodwXiT+denLSW+h73qlRgsOBo8NIOcS5VNa6PfO+fYqZsG4EQ YgcUcUACC9vWQUBqdJLjxF9X0HRMj/GWLQX/+l9jAoQygNedPtylahlKXMLsg9Yx2T ECSjxzfJoTwhYmBr912ANtu7B2j+LO7CEBSela3kM51vVPqrEEulBZsveHDz4pvAH5 TnY8rWfRSfJKA== Date: Fri, 06 Sep 2024 15:07:13 +0000 Message-ID: <5eec37609a42d1dc349b3e37a96d794140f154fa.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 623a0fa05cc7d6d1619f3e8183368460eeb0cc4f MIME-Version: 1.0 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: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias 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 From: nathan * gnu/packages/vulkan.scm (vulkan-headers): Rename to… (vulkan-headers/no-loader): … this. (vulkan-headers): New variable. (vulkan-loader): Depend on ‘vulkan-headers/no-loader’. Change-Id: Ic674a4d965d8049e388d75137111ed0253ca3b18 Co-authored-by: Ludovic Courtès Signed-off-by: John Kehayias --- gnu/packages/vulkan.scm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) -- 2.45.2 diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1b69da1a4d..e76455a835 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -299,7 +299,8 @@ (define-public vkbasalt (license (list license:bsd-3 ; src/reshade/LICENSE.md license:zlib)))) ; LICENSE -(define-public vulkan-headers +;; vulkan-headers, but without the path to vulkan-loader patched in. +(define-public vulkan-headers/no-loader (package (name "vulkan-headers") (version "1.3.280.0") @@ -316,6 +317,7 @@ (define-public vulkan-headers (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. + (properties '((hidden? . #t))) (home-page "https://github.com/KhronosGroup/Vulkan-Headers") (synopsis "Vulkan Header files and API registry") @@ -323,6 +325,25 @@ (define-public vulkan-headers "Vulkan-Headers contains header files and API registry for Vulkan.") (license (list license:asl2.0)))) ;LICENSE.txt +(define-public vulkan-headers + (package + (inherit vulkan-headers/no-loader) + (arguments + (substitute-keyword-arguments (package-arguments vulkan-headers/no-loader) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-libvulkan-file-name + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "include/vulkan/vulkan.hpp" + (("dlopen\\( \"libvulkan.so") + (string-append "dlopen(\"" + (search-input-file + inputs "/lib/libvulkan.so")))))))))) + (inputs + (modify-inputs (package-inputs vulkan-headers/no-loader) + (prepend vulkan-loader))) + (properties '()))) + (define-public vulkan-loader (package (name "vulkan-loader") @@ -383,7 +404,7 @@ (define-public vulkan-loader python wayland)) (inputs - (list vulkan-headers libxrandr)) + (list vulkan-headers/no-loader libxrandr)) (native-search-paths (list (search-path-specification (variable "XDG_DATA_DIRS")