From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:29:25 2024 Received: (at submit) by debbugs.gnu.org; 28 Feb 2024 17:29:25 +0000 Received: from localhost ([127.0.0.1]:56053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNkB-00070f-OY for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:29:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:57354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNk6-00070O-8K for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:29:21 -0500 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 1rfNjX-0004OO-Vb for guix-patches@gnu.org; Wed, 28 Feb 2024 12:28:45 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNjV-0001AK-51 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:28:43 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.west.internal (Postfix) with ESMTP id 03EAE1800079; Wed, 28 Feb 2024 12:28:34 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 28 Feb 2024 12:28:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm2; t=1709141314; x=1709227714; bh=ILvsBj/QUXoBcssUKsl9Q SmeGP/OnnsPzpwRl7Ljyl4=; b=pd5u9HFwliENkyja4oKZ+St0xe1GyZKAO8Vym BhXkyCL0xCTtlOaJomxfPwlO3LcIs87WJprB+xMZ6PidPdz6EGspGZWkRHfEg+Oy a6JLqb6QBe99fXVhWMY2ruFWs8d6XYFLaUD3n/1mNQI+nkzEnqZBQNZkoeD3XF+8 Kq+RMPNGhYhnm909iUGhj8oUBvVg1RplIO6TeZrKmrvXoSOqQ2fPh3rMnPgrS9NH +2BQcEgMyWTuah/dzQK/oySCeyhnCwPwpZFEskfvffZWYxZ6AaYxhJJIFAsjqMKf aTnD59VfqdOhNSpe14dq6WfwJv1Xx0LbTRxI9gacKC+mg/TcA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1709141314; x=1709227714; bh=ILvsBj/QUXoBcssUKsl9QSmeGP/O nnsPzpwRl7Ljyl4=; b=WvvCD9ljP6nfQmvMHE4PqONPBVKUnBzIUVwBBR0ZjD58 TVGWvl+JjJFHpyHxDH/ZzPLSxYwOu1wpKsQp8OnlsTHBLL6EUVgFo3ncoB7gr8tu xSHtmEyw3ughaDZRjXDNzYVGOAuaKcbTcaXHyvhdkVSg+26mMZwfg/DR73WX3z7V DWeWOqdee0enFPVsd+JtzyqqVi9B/zmjGRYpFymQNpQdV97I4UMhJoUg6s4XmhZ8 8NRIxi52gykq/MGwlNQWZO1XJNX3JLS9HpPKyX6G4NTLyQpF5MAy6ZCUX2AQIel/ qfjQPYXqsEqNieOJYXE4uVZywDAIuM3b28Qe9DiGjw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgggfestdekredtre dttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeevfffgvdejkefhkeejvdeltdeugfeiveejgeehudfftdevgeeujefhueefgeevve enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegu rghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 28 Feb 2024 12:28:32 -0500 (EST) From: dan To: guix-patches@gnu.org Subject: [mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler. Date: Thu, 29 Feb 2024 01:28:24 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.154; envelope-from=i@dan.games; helo=wfhigh3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: submit Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.7 (--) This patch series updates several vulkan-sdk packages to the latest vulkan-sdk release version 1.3.275.0, and adds directx-shader-compiler, the shader compiler by Microsoft. vulkan-utility-libraries was also added as it's now the dependency of vulkan-validationlayers. Noted that many of the repos explicitly uses "vulkan-sdk-1.3.275.0" as their release tag, but I'm not sure if it's a good name for us to use for version. dan (13): gnu: spirv-headers: Update to vulkan-sdk-1.3.275.0. gnu: spirv-tools: Update to vulkan-sdk-1.3.275.0. gnu: glslang: Update to vulkan-sdk-1.3.275.0. gnu: spirv-cross: Update to vulkan-sdk-1.3.275.0. gnu: shaderc: Update to 2023.8. gnu: vulkan-headers: Update to vulkan-sdk-1.3.275.0. gnu: vulkan-loader: Update to vulkan-sdk-1.3.275.0 gnu: volk: Update to vulkan-sdk-1.3.275.0. gnu: vulkan-tools: Update to vulkan-sdk-1.3.275.0. gnu: magic-enum: Update to 0.9.5. gnu: Add vulkan-utility-libraries. gnu: vulkan-validationlayers: Update to vulkan-sdk-1.3.275.0. gnu: Add directx-shader-compiler. gnu/local.mk | 1 - gnu/packages/cpp.scm | 4 +- .../patches/glslang-install-static-libs.patch | 61 --- gnu/packages/vulkan.scm | 478 ++++++++++-------- 4 files changed, 274 insertions(+), 270 deletions(-) delete mode 100644 gnu/packages/patches/glslang-install-static-libs.patch base-commit: bc6840316c665e5959469e5c857819142cc4a47b -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:32:42 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:42 +0000 Received: from localhost ([127.0.0.1]:56295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnO-0007Bw-63 for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:42 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:33635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnL-0007BZ-Kr for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:40 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.west.internal (Postfix) with ESMTP id 29DCC1C0008F for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:07 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 28 Feb 2024 12:32:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1709141526; x=1709227926; bh=CPkhoYJtDp/lndhKX4XFe9mSvA3KUsL5vubC4C56JpM=; b= VyIpqCvRTLi34bgO34BCdE3HRA71v5zdjGXdOamfsvN691BwhAUQ1G04NUc+Fhvv LunpgZuYAC44kynJfD2eDShB+xwUjj7WN+jU34wbhhrX25SHn9F+AIM/dl16bNUf WmEO1yajRTDUK9Zs4BSSTh7/h9csAe9OhSGx7pDTi3Nz0sIBITu7r91udG1u6WVu ZcVTpJvPXFLAd/rd8xyBIoy4R2YGi9jd9bHIIzsyDG0TJtW6ewBGoENUzHO4rurx 7Sw6AiHZynq/GC7aGRLhlRAOI7g092oqX1l0obZd13za6KdlRYIcJ7y/g78esG2/ HjOY92L/dcE7eux2tLTFIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1709141526; x= 1709227926; bh=CPkhoYJtDp/lndhKX4XFe9mSvA3KUsL5vubC4C56JpM=; b=Q wcDpu23F1L2AzGWzgitIU0S303qwLG5vmc9jlF7mpIBKGTrha7IRj6v1Rm0gQjEZ wnhUQ5l/RHy2kVX6qUAgNqUXh1VQ+VPHoR10cYzq5mCw3vAF9P3tu5cNVbhpkn3t m+oV+zZ55RDCvxeSb5Y0sJOY8SL+liQ3CLHUyvwK/zrorT3TsdSxizM9stD4JMfe 9kNDgyeRPIu0z0ic7ZhLQqLtjkeDyt25uhpHRZvJwwyopbVjzWaORC97pHvErIBS xgL/a/k0WqRsvyXrak6Ytr9ktAdBrkVMvFeyb3NuI20AsJVWRaCKxctjk6jiaaIO fF7aWFWwmFXGTi+Nfaghg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpeekgedvvddtjedtuedvtdffheehgeekveekhfetffefkeelvddvieeggefgke eludenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:05 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 01/13] gnu: spirv-headers: Update to vulkan-sdk-1.3.275.0. Date: Thu, 29 Feb 2024 01:31:34 +0800 Message-ID: <6925020499c96ba08bb9cf59615c6ec96a4f24cd.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (spirv-headers): Update to vulkan-sdk-1.3.275.0. Change-Id: Ibe72c71d0d269f1e3bddba1d880a4d5fce8ed4a9 --- gnu/packages/vulkan.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 285d6be7f5..2fb1884795 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2020, 2023 Marius Bakke ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata -;;; Copyright © 2022 dan +;;; Copyright © 2022, 2024 dan ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -47,7 +47,7 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages xorg)) ;; Note: Remember to change vulkan-loader version when bumping this. -(define %vulkan-sdk-version "sdk-1.3.231.1") +(define %vulkan-sdk-version "vulkan-sdk-1.3.275.0") (define-public spirv-headers (package @@ -60,12 +60,11 @@ (define-public spirv-headers (url "https://github.com/KhronosGroup/SPIRV-Headers") (commit version))) (sha256 - (base32 - "0z8b485hryya2g0jxv7amwg3fjj7pchbgnsa5ldf5fwgh5js0icm")) + (base32 "18gr715ap9w1rjvzd6l9pl9lwfqiikm2la5apv2lplj4a0k5v3zw")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ;no tests + `(#:tests? #f)) ;no tests (home-page "https://github.com/KhronosGroup/SPIRV-Headers") (synopsis "Machine-readable files from the SPIR-V Registry") (description @@ -76,10 +75,11 @@ (define-public spirv-headers @item JSON files describing the grammar for the SPIR-V core instruction set, and for the GLSL.std.450 extended instruction set. @item The XML registry file. -@end itemize\n") - (license (license:x11-style - (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" - version "/LICENSE"))))) +@end itemize +") + (license (license:x11-style (string-append + "https://github.com/KhronosGroup/SPIRV-Headers/blob/" + version "/LICENSE"))))) (define-public spirv-tools (package -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:32:48 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:49 +0000 Received: from localhost ([127.0.0.1]:56309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnT-0007CM-P3 for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:48 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:49427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnQ-0007Bl-V7 for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:46 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id 98F4F1C00091 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:12 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 28 Feb 2024 12:32:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141532; x= 1709227932; bh=5oyZ2a0juuvfvFQhXhPhQD+8NjQs5vHcMeQJyZtphcY=; b=t O9D851tLwQhlFYMbUxDfxJJvushAYFkvMVAh9oeWonehG4m5gd4JRNg7mkz1vivP qVnmqa6aYJAD0x+SXgb7a8xjursmnc/fBALWH8iMfRZ7PdrExIsiQAc2Ffs2ZgaP LcssEav2VwX6+IvD7DAyp/tKXKFqjCQFWaLnnDX0YBh100r/yWZe683ijy/tFL1T OeT32HfosOAiqSPKSTkvAlHMdkoV0wDytHEyirymhUCoK9Qq4/MOLXe5Wslvu5E7 JZ/tkl6w9oOgKFSsDlN7VrzsMyUTt7czpwsZj3cfC8bEL7lwPYPGb8K1DrvrkFYX eOKhHvo3NPkv4uPSMW7wA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141532; x=1709227932; bh=5oyZ2a0juuvfv FQhXhPhQD+8NjQs5vHcMeQJyZtphcY=; b=YcvX7ZWCf8zerhB2VOIEoRQ6OmYG8 EpM/eLbQv7A/nasvjVKQVzDjMdFhA6NQ1YznEMsBPzv5pzMazBNqEppJUL3NTq0f fvMEi4OaDuKtu1Ermub1UStjlmzQkd9fnUb2R85PvqZuaOF9O/+8L4oeydb3jHK9 qLvN/+k8s18X4PwVXww4LKv8uQa0lD0gFcnjrhZT+21+BgPDvJ4J4euuH/As/+ah LoLB0klvh/2s5YPQ1UVmOH7U6UUVQs5a1aWGPGZHcmyVIX2amUN3GGWNql3NhJm2 G55hzlwkoIU9wfR8A/gM/aeTUjwnASX+V3wwOFofpEKL+OVTCZxrShQ4Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepkeehfeelieeghfegiedugeeufeegieekvefhhfegheeiiefgvdefheetgeefhf dunecuffhomhgrihhnpehgvghnthhoohdrohhrghdpghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:10 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 03/13] gnu: glslang: Update to vulkan-sdk-1.3.275.0. Date: Thu, 29 Feb 2024 01:31:36 +0800 Message-ID: <61fa2d39ac8f0fce6be8946887cd19d136b3d7fc.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (glslang): Update to vulkan-sdk-1.3.275.0. [source]: Remove patch. [arguments]: Run tests. [inputs]: Add spirv-tools. * gnu/packages/patches/glslang-install-static-libs.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Ungerister it. Change-Id: I053bb7fd2d510395a248b0f5c0107a7b264a38c7 --- gnu/local.mk | 1 - .../patches/glslang-install-static-libs.patch | 61 ------------------- gnu/packages/vulkan.scm | 17 +++--- 3 files changed, 10 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/patches/glslang-install-static-libs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 208d74ef3e..6177b178b3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1352,7 +1352,6 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.29-git-updates.patch \ %D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-supported-locales.patch \ - %D%/packages/patches/glslang-install-static-libs.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ diff --git a/gnu/packages/patches/glslang-install-static-libs.patch b/gnu/packages/patches/glslang-install-static-libs.patch deleted file mode 100644 index a155dde30e..0000000000 --- a/gnu/packages/patches/glslang-install-static-libs.patch +++ /dev/null @@ -1,61 +0,0 @@ -Install OGLCompiler et.al. even when building shared libraries. Also fix -CMake file locations. - -Patch taken from Gentoo: - - https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch - -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -41,7 +41,7 @@ if(WIN32) - source_group("Source" FILES ${SOURCES}) - endif(WIN32) - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OGLCompiler EXPORT glslang-targets) - - # Backward compatibility -@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OGLCompiler) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OGLCompiler ALIAS glslang::OGLCompiler) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -203,7 +203,7 @@ endif() - ################################################################################ - if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang EXPORT glslang-targets) -- if(NOT BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS) - install(TARGETS MachineIndependent EXPORT glslang-targets) - install(TARGETS GenericCodeGen EXPORT glslang-targets) - -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -52,7 +52,7 @@ else() - target_link_libraries(OSDependent Threads::Threads) - endif() - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OSDependent EXPORT glslang-targets) - - # Backward compatibility -@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OSDependent) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OSDependent ALIAS glslang::OSDependent) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index d29810f4c6..3b485901d8 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -196,17 +196,20 @@ (define-public glslang (uri (git-reference (url "https://github.com/KhronosGroup/glslang") (commit version))) - (patches (search-patches "glslang-install-static-libs.patch")) (sha256 - (base32 - "12a1zl8qxa28nbf6m67260c0lwdw3bqbj0jz1382wgm5px1fpqw6")) + (base32 "15xf1p9wwyvcps2kbyfiqnch3x2a1a9bd9aixq2y4yv9ir9hhhpf")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;FIXME: requires bundled SPIRV-Tools - #:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) - (native-inputs - (list pkg-config python)) + '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" + "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON") + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest"))))))) + (inputs (list spirv-tools)) + (native-inputs (list pkg-config python)) (home-page "https://github.com/KhronosGroup/glslang") (synopsis "OpenGL and OpenGL ES shader front end and validator") (description -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:32:53 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:53 +0000 Received: from localhost ([127.0.0.1]:56316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnY-0007Cp-Tj for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:53 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]:58771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnW-0007C8-BG for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:50 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 040D0180008A for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:17 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 28 Feb 2024 12:32:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141537; x= 1709227937; bh=cGm53XoSBpmO6RnQUjYsL2duH7mKSmNQkXIyZGKK24o=; b=m pvIIYcqsVrqojOVL8oozVmIDVbj5BmjTGYjq79CnqFNvFXQm9R5+fB/CwB6g1yTS 30S0/ZWFDsvY50vOvb7IGGhM1xslgfK4B0foU2sh3VMJiwrLH6XWnpaDCbrlo77/ ibN8POLuSVsCzhb1awsBomr2ugeAyJqmf6uVF6jy8n+Nj0B6QPpyglVHjS8bSAiQ YxwkCtzItxUZ+hd7Wp43P3HuqPv7yjHB8Z/6FNlGxtSx4e4PkQdG0fSoQ5H2IDL3 Jv1iWq96lQpsgCPF+usqIMvC+nEdY6TyZZYJCVTX17ZUP/VCSwfvb8p/vCrmRX87 BbxitoJmsVaYXJr88CaCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141537; x=1709227937; bh=cGm53XoSBpmO6 RnQUjYsL2duH7mKSmNQkXIyZGKK24o=; b=FX2Hor3fIzXPBSLhIzqrtDV4MmPG0 aXdyfq69alBum8jnbdATrP6qaX9IZJgLkXoQ4ZYajN4ZIBLjQ4UFvPQTx8ui40+3 AGQkztPHiHw/wgkGOX40UUgmmPlwWGxgBRuIjllSLqdGBU+k61a1C/s2JKAavuAU gUXnjCp8LaXxnEoKC3oiH/ZYM6+adZCH/gt5uQt4g6ALJAK4VRWONa73D/HD+6uE CxLuGjV1fHAGKJh63ClMfUOU0wcewbuVs4afKPX5YWINGSpQQ/SCoOCTPP3qeD9m 7niUsEBiYX4D3PU9cz58Z1/o0Y3buCs4Ea5TCwwbycJhsClFpbG+gERRw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepueevieevgfduieduhfethfduiedvueektdeltdeutedvhffhfeetfefhgefgfe ehnecuffhomhgrihhnpehgihhthhhusgdrtghomhdplhhunhgrrhhgrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:16 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 05/13] gnu: shaderc: Update to 2023.8. Date: Thu, 29 Feb 2024 01:31:38 +0800 Message-ID: <3e30ab660277e638f54846fab8c10ef298107114.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (shaderc): Update to 2023.8. [arguments]<#:configure-flags>: Specify python executable. <#:phases>: Remove drop-additional-glslang-deps phase. [inputs]: Remove python. [native-inputs]: Add python. Change-Id: I1babcabf0be17c6a6237d30fad9b8dcd7a2d2ccf --- gnu/packages/vulkan.scm | 77 +++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 12baf52f92..38f723bd91 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -355,7 +355,7 @@ (define-public shaderc (package (name "shaderc") ;; shaderc doesn't follow the versioning scheme of vulkan sdk - (version "2022.3") + (version "2023.8") (source (origin (method git-fetch) @@ -364,53 +364,46 @@ (define-public shaderc (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d")))) + (base32 "0cs36p1y2269gjfv75fvs43ymsapmc8gsy2n91jnaqs3mpgqkjbk")))) (build-system cmake-build-system) (arguments `(;; FIXME: Skip most of the tests, because enabling system gtest breaks ;; the build: . - #:configure-flags - (list "-DSHADERC_SKIP_TESTS=ON" - ;; Note: despite the name, this just specifies the headers. - (string-append "-Dglslang_SOURCE_DIR=" - (assoc-ref %build-inputs "glslang") "/include/glslang")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-look-for-bundled-sources - (lambda _ - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(third_party\\)") - "")) + #:configure-flags (list "-DSHADERC_SKIP_TESTS=ON" + ;; These two flags are copied from: + ;; https://sdk.lunarg.com/sdk/download/1.3.275.0/linux/config.json + "-DSHADERC_ENABLE_SHARED_CRT=ON" + "-DSHADERC_SKIP_COPYRIGHT_CHECK=ON" + "-DPYTHON_EXECUTABLE=python3" + ;; Note: despite the name, this just specifies the headers. + (string-append "-Dglslang_SOURCE_DIR=" + (assoc-ref %build-inputs + "glslang") + "/include/glslang")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'do-not-look-for-bundled-sources + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(third_party\\)") + "")) - (substitute* "glslc/test/CMakeLists.txt" - (("\\$") - (which "spirv-dis"))) + (substitute* "glslc/test/CMakeLists.txt" + (("\\$") + (which "spirv-dis"))) - ;; Do not attempt to use git to encode version information. - (substitute* "glslc/CMakeLists.txt" - (("add_dependencies\\(glslc_exe build-version\\)") - "")) - (call-with-output-file "glslc/src/build-version.inc" - (lambda (port) - (format port "\"~a\"\n\"~a\"\n\"~a\"~%" - ,version - ,(package-version spirv-tools) - ,(package-version glslang)))) - #t)) - ;; see: https://github.com/google/shaderc/pull/1276 - (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps - (lambda _ - (substitute* "glslc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc_util/CMakeLists.txt" - (("OSDependent OGLCompiler") ""))))))) - (inputs - (list glslang python spirv-headers spirv-tools)) - (native-inputs - (list pkg-config)) + ;; Do not attempt to use git to encode version information. + (substitute* "glslc/CMakeLists.txt" + (("add_dependencies\\(glslc_exe build-version\\)") + "")) + (call-with-output-file "glslc/src/build-version.inc" + (lambda (port) + (format port "\"~a\"\n\"~a\"\n\"~a\"~%" + ,version + ,(package-version spirv-tools) + ,(package-version glslang)))) + #t))))) + (inputs (list glslang spirv-headers spirv-tools)) + (native-inputs (list pkg-config python)) (home-page "https://github.com/google/shaderc") (synopsis "Tools for shader compilation") (description "Shaderc is a collection of tools, libraries, and tests for -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:32:59 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:59 +0000 Received: from localhost ([127.0.0.1]:56331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNne-0007DL-LE for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:59 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]:48847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnZ-0007CN-1i for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:53 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.west.internal (Postfix) with ESMTP id B332F180008B for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:20 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 28 Feb 2024 12:32:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141540; x= 1709227940; bh=cWuPkGctHh5zvKobE80J3d6JzZHfh2oYXBeKrE9dWDk=; b=j bIsq6iKgd/ohX6iQ92J/d9WghaBTPzSxokuVODvWvyrm2AatesVTd/RijhHVTjsA kJHPSdoa5NtiT+twiKCkE7wx9MYbMESG46iUe4FHP5kdVXa47UUeMPAy4S3HOLLh /qi9GrK61YSuREyS7LODzTIBttZxD27PIj6+Izqnm63wxRc814On5yaHeuvQo2sf V0J/xil0qd3/lbrj8uT8xqjqYzGr+0PAlmHDrssW7bLhhlZZBOlVEIao1WK5S8wl QCNDBRJ5+2t8CnuDEoZgSR4yoaqE1G8SM6tE5qQwYQ8Srik37fqPpiiRkB9DTZq9 9drwSG82ZxjMsRFneRylQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141540; x=1709227940; bh=cWuPkGctHh5zv KobE80J3d6JzZHfh2oYXBeKrE9dWDk=; b=Uaj/dsBplBi1LvpznFDCmNXkIpWhb iPY0VhMzP6vG0Y1hUfGz4Q4qqSABRAZPEUav+Js/nKBbVV4m4gtEFyWRb+CFh0LX KKz0snIcGmDRluQQ8s4xLOJZVo/ywNI2xc33zZ7hgFpIjlHrANSpdyFnrIp78b+6 tEep+S2sqBWgXk5T1Y5mEFhoO8tE3j8Unq0SzCAGnrBGaUajnD9j4d8eNyz7m0wJ YH4/oRABCkcQQn32DtVrDcxQSIeNlLNJ28RTp2qRF+aI5lF+p/F0rGeftojospaa iqci8vS3wGujMGPfea3WikyynPTUSUpvJoppm0PZjhbzapDefmaIpDFpQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:18 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 06/13] gnu: vulkan-headers: Update to vulkan-sdk-1.3.275.0. Date: Thu, 29 Feb 2024 01:31:39 +0800 Message-ID: <62d151e6c27c8f56ebaf6b034183a59483d3ab4c.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-headers): Update to vulkan-sdk-1.3.275.0. Change-Id: I453837144979fbf63b8b45704cec90aafc002b58 --- gnu/packages/vulkan.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 38f723bd91..ea02d9887b 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -232,13 +232,11 @@ (define-public vulkan-headers (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "167zdank6pn66mzjdwgrdlmhmsy4v2k0nhw0nwg649k863rgi00j")))) + (base32 "1ihzbn6aw20i40mlqv2ys3xw1g9ld79890a0bm7wpqmbp67s84wh")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; No tests. - (home-page - "https://github.com/KhronosGroup/Vulkan-Headers") + `(#:tests? #f)) ;No tests. + (home-page "https://github.com/KhronosGroup/Vulkan-Headers") (synopsis "Vulkan Header files and API registry") (description "Vulkan-Headers contains header files and API registry for Vulkan.") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:33:00 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:00 +0000 Received: from localhost ([127.0.0.1]:56337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnf-0007DS-4E for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:00 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:50943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnb-0007Ce-Ql for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:56 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.west.internal (Postfix) with ESMTP id 7C76C1C00084 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:23 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 28 Feb 2024 12:32:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141543; x= 1709227943; bh=hCu+MciDf/k7Xb8B2H//k+erTsR2Ap65+g2nJu1lEBU=; b=T /AfM3eaS2xc3c9OEQHcX5Udb7zohplvFVojH2GQT0+uPBnDCaOKEbozBRK7LAyDj U/soO8tssDzVehC+plewM2zG0NEshX+sUAqXxNgKP8GvB/ULOn6FhzOKadgH+6vr i2OUvjcw/ekWjeyB9F/tKgYNU2CCu/zR0Kkz5pY2pE8rPC/iiVBsafcJbckQC1R8 Cx+eH893M/tppBue11tZLfJh7SIfg1vnV7F+bUvnjpPl2X1P/CwphrJCBAf+j0Ie 6TAJIJK94DZX71PxPwfSgYGN8QtKY36lOJq4RpLR6U5akHrLre+8b+g8aysOjDSe Tvgmd7GG9eISdN5CAyTTw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141543; x=1709227943; bh=hCu+MciDf/k7X b8B2H//k+erTsR2Ap65+g2nJu1lEBU=; b=CDsDoZUcRIeANC1cFtiTKSMj9Ry6k v/HGjqfDDiO2cKdZO2cNHlMcZ2CMR3EmtYFs7YeFOOUfUEUB8lafc9kZuTab/ZAo yn96hRZZOhO6MC7xq38+soxtyCOVOcvjlX8fJaIT1CE4PPJW14WToN+LXuPA5zdh tK3o4hbuTsABfkkrkhtbHYtlCAxryL+1h+RXrb1tbcxT3zl6MFSFy9HRreNhftmR rZrWad27pmPZFbEdkP9RFxd7KZV4RCqsAl55imQ6ANjs9Ub1ykvaqbA1gPPvBLxZ LYGF8eb5IsuS7vRykh1FzKE/LDmd+ezqOOnic9d37o1d94TzT9uLhM1lw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepudekheduvdejjeduhedtgeelveffledvuddvkeehhffftdelhedvkeekveegve einecuffhomhgrihhnpehgihhthhhusgdrtghomhdpphgtrdhinhenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:21 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 07/13] gnu: vulkan-loader: Update to vulkan-sdk-1.3.275.0 Date: Thu, 29 Feb 2024 01:31:40 +0800 Message-ID: <8f806fbbb811debf1f63899fc8a882b4ac8ec723.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-loader): Update to vulkan-sdk-1.3.275.0. [arguments]<#:phases>: Change the place setting system googletest. [native-search-paths]: export XDG_DATA_DIRS. Change-Id: Ibd74e303a2be4f972917c2e88367eca7db6fbc5b --- gnu/packages/vulkan.scm | 86 ++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 49 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ea02d9887b..8e162402fa 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -46,7 +46,6 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages wine) #:use-module (gnu packages xorg)) -;; Note: Remember to change vulkan-loader version when bumping this. (define %vulkan-sdk-version "vulkan-sdk-1.3.275.0") (define-public spirv-headers @@ -245,19 +244,16 @@ (define-public vulkan-headers (define-public vulkan-loader (package (name "vulkan-loader") - ;; XXX: Take a slightly newer commit to fix a test failure on i686: - ;; https://github.com/KhronosGroup/Vulkan-Loader/pull/1036 - (version "sdk-1.3.232") + (version %vulkan-sdk-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Loader") - (commit "v1.3.232"))) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) + (base32 "0kcq6xsm151mk08vvqjlhj5mfxv4zgq35a2yi4f7yax20mfd8wz7")))) (build-system cmake-build-system) (arguments (list @@ -265,45 +261,38 @@ (define-public vulkan-loader ;; Limit the tests to those architectures tested upstream. #:tests? (and (%current-system) (target-x86?)) - #:configure-flags - #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs "include/vulkan")))) - #$@(if (%current-target-system) - #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF") - #~("-DBUILD_TESTS=ON"))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-pkg-config-file - (lambda* (#:key inputs #:allow-other-keys) - (let ((vulkan-headers (dirname (search-input-directory - inputs "include/vulkan")))) - ;; Ensure the pkg-config file refers to vulkan-headers. - (substitute* "loader/vulkan.pc.in" - (("^includedir=.*") - (string-append "includedir=" vulkan-headers "\n")))))) - (add-after 'unpack 'use-system-googletest - (lambda _ - ;; Inform the build system that googletest is already built. - (substitute* "CMakeLists.txt" - ((".*if\\(TARGET gtest\\)") - (string-append " find_package(GTest REQUIRED)\n" - " if(true)"))) - ;; Use the namespaced variable. - (substitute* "tests/framework/CMakeLists.txt" - (("PUBLIC gtest ") - "PUBLIC GTest::gtest "))))))) - (native-inputs - (list googletest - libxrandr - pkg-config - python - wayland)) - (inputs - (list vulkan-headers libxrandr)) - (home-page - "https://github.com/KhronosGroup/Vulkan-Loader") + #:configure-flags #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" + (dirname (dirname (search-input-directory + %build-inputs + "include/vulkan")))) + #$@(if (%current-target-system) + #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF") + #~("-DBUILD_TESTS=ON"))) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-pkg-config-file + (lambda* (#:key inputs #:allow-other-keys) + (let ((vulkan-headers (dirname (search-input-directory + inputs "include/vulkan")))) + ;; Ensure the pkg-config file refers to vulkan-headers. + (substitute* "loader/vulkan.pc.in" + (("^includedir=.*") + (string-append "includedir=" vulkan-headers "\n")))))) + (add-after 'unpack 'use-system-googletest + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("message\\(FATAL_ERROR \"Could not find googletest directory. See BUILD.md\"\\)") + "find_package(GTest REQUIRED)")) + ;; Use the namespaced variable. + (substitute* "tests/framework/CMakeLists.txt" + (("PUBLIC gtest ") + "PUBLIC GTest::gtest "))))))) + (native-inputs (list googletest libxrandr pkg-config python wayland)) + (inputs (list vulkan-headers libxrandr)) + (native-search-paths + (list (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))))) + (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan") (description "Vulkan allows multiple @dfn{Installable Client Drivers} (ICDs) each @@ -313,9 +302,8 @@ (define-public vulkan-loader and the ICD.") ;; This software is mainly Apache 2.0 licensed, but contains some components ;; covered by other licenses. See COPYRIGHT.txt for details. - (license (list license:asl2.0 ;LICENSE.txt - (license:x11-style "file://COPYRIGHT.txt") - license:bsd-3)))) + (license (list license:asl2.0 ;LICENSE.txt + (license:x11-style "file://COPYRIGHT.txt") license:bsd-3)))) (define-public vulkan-tools (package -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:33:09 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000 Received: from localhost ([127.0.0.1]:56360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnp-0007FJ-9f for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:09 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]:51169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNne-0007Cr-KH for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:58 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 4B8D21800085 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:26 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 28 Feb 2024 12:32:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141545; x= 1709227945; bh=F3Z6W+JHSG4aIkPwWiu84pAFAiI4fS3ltSLFHmh7ITc=; b=C ewgMcRVYV7JrFIExKkXoEoF6CR90tbbttbl2CiS9YZYJuKM2bCYOIjVuxPhEaI+G TZlzDD+u7ZE9PElvX3cUVRpxx/syt9m6eAgJEWubQewnq1DJN6HYtv+L2FYcpfwB dbdb7IZS464zKex1GR4GcutQoHUS/RHZz7FcCfaSXGiE3nhX2Dk+vgcf7NFgkb1W S8Gxqe6G8sDx7cAxr/OnA4fTIwKr1BFI0wRJNibbUYOQPR6UBAU5e9X+ES0bxOQ8 QnaskmQ5Gh1qHN7bId/XeIkyKHOPr/O/Bq+0D8+cKXxX+RJ1x+pavy24ijhTBLh9 djULd4FG00soORmnskaWw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141545; x=1709227945; bh=F3Z6W+JHSG4aI kPwWiu84pAFAiI4fS3ltSLFHmh7ITc=; b=Yz6ryEhHiLI9ypkj+xUUy3oTAW952 KNfYwtJxvid2nJieKPFxN3Fax92JqlcuYRrBnjzvgTOP94sboXfmKpSKNMJhAEkX hBTdSFWLsrrQCs+mAtPgAHOBmQiWDm5QdsA8DdC0B8O8ZFf+Hwj8MHn0AJEfLSb5 GSXT958IJNQwsG91T3HxXzMESVi0j6SyFA4wBqj30+ab6cKdQg8EArPby1l/im0T shPNPqQKfTJFIrVaw1f13DCXJmBCY+Cw00tC3WiSbR/ebnAB1AL1938gXU9C6s2d QcNwpoIbb2iOSBYL3vtkolSS2BQzPwH5HoB+PBV5LCF9i7KvRmkEbwJvg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:24 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 08/13] gnu: volk: Update to vulkan-sdk-1.3.275.0. Date: Thu, 29 Feb 2024 01:31:41 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (volk): Update to vulkan-sdk-1.3.275.0. Change-Id: I19aa13158daccaed801b60226e829c3cb2044e8e --- gnu/packages/vulkan.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 8e162402fa..807b0be8af 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -515,18 +515,18 @@ (define-public volk (package (name "volk") (version %vulkan-sdk-version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zeux/volk") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xaw3kg754mknx8lfj1p74a9npjfvdvlpicvn0hla4495zpc10rq")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zeux/volk") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zmr3wy0hc1hpwyifvjyxxfs7vc4ipqrfj0mav7cjdq6jf0cnf5r")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;no test + '(#:tests? #f ;no test #:configure-flags '("-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON"))) (inputs (list vulkan-headers)) (synopsis "Meta loader for Vulkan API") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:33:10 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000 Received: from localhost ([127.0.0.1]:56362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnp-0007FM-Rg for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:10 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:33665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnh-0007DB-Rr for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:02 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailfout.west.internal (Postfix) with ESMTP id 802FA1C00090 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:29 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 28 Feb 2024 12:32:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141549; x= 1709227949; bh=c/4ySSE17nbkcXoGuvRjP9rZZqEn6Vfq/zjwdX6g/tU=; b=C EFLQWQfXQw7lAEG2HsCxJ+0caJ8gzycttnbKgbKv1FCcFoHs5AieAVo+sGu2+vnd uJsH4z1orVC+fcxHptxCn+E38QirK/BQfOfjtJtb1EnbEApjd2E3Mr6N9GPqWwux F3nDetvAP+yD613bfzN2S69kBSqhuJGV9lgvw+WcIyy1O7kCMMil3ZPdhgsLhllH RhslgEYaruXb0IEDy37nAd76Q/8d6PHjSC4cK9FA3qxmxEE75yeMsWB5OaZsNUTy MZq3txPJl358Eb0QMgE8HQQfN0Z0FfllheodKIH6pmiWrrw+9jq74QkAOUSAxq3k JS51/4QlKilMozYnQL14Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141549; x=1709227949; bh=c/4ySSE17nbkc XoGuvRjP9rZZqEn6Vfq/zjwdX6g/tU=; b=PmIKDbfopXl5MJGTiVdK1PpLoz5BY unY0RNVkJ+B8Ldepu0fiZgVY1c4Hvm650CCKnMmQhd7Urj4irqf3ZahQO4XW26xj C52nX3SU2MEWZlIeDvCbV6IVIKieE8xCOeN4i7lzkVc3nOxhtCqzrZagmyDBKxNj tO8eJ54M30q+OT6Nne74W2oR1Rc9t1ZHuiVZfidesTdL0r0brCes1kt5Npf/qdiF euVS5472jMSeI5QLcv0u8uBM9mcji7RsSQaTkQ98zKmHxug6AbXdU0mLgpnz+T6G 7wnCAZDRQC8v6rIKarMzQTv/J2gkCN9U0G4J75qAtpKpWdhF1ispccKcg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:27 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 09/13] gnu: vulkan-tools: Update to vulkan-sdk-1.3.275.0. Date: Thu, 29 Feb 2024 01:31:42 +0800 Message-ID: <617d4147db2b9bb37b94514cb79aaebf1fb5d5d5.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-tools): Update to vulkan-sdk-1.3.275.0. [arguments]: Turn on tests. [arguments]<:#configure-flags>: Remove GLSLANG_INSTALL_DIR. [native-inputs]: Add googletest. Change-Id: I607c7ce414f8c0c8ee25ad0701d91771f5c4a7fc --- gnu/packages/vulkan.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 807b0be8af..82bc87dcd6 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -316,20 +316,24 @@ (define-public vulkan-tools (url "https://github.com/KhronosGroup/Vulkan-Tools") (commit version))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet #~(substitute* "tests/icd/mock_icd_tests.cpp" + ;; Disable driver info test since it relies on git branch info + (("ASSERT_EQ\\(std::string\\(driver_properties\\.driverInfo\\)") + "// ASSERT_EQ(std::string(driver_properties.driverInfo)"))) (sha256 - (base32 - "0jzwjfx4c7y15wkwfhhc64rzljpi47bxrm5jw5blfsqjh8zsd27a")))) + (base32 "0g604gzzlqibnkjd18iss6iwn852nnsfrrgfnwn97khpr0xk1h6j")))) (build-system cmake-build-system) - (inputs - (list glslang libxrandr vulkan-loader wayland wayland-protocols)) - (native-inputs - (list pkg-config python vulkan-headers)) + (inputs (list glslang libxrandr vulkan-loader wayland wayland-protocols)) + (native-inputs (list googletest pkg-config python volk vulkan-headers)) (arguments - `(#:tests? #f ;no tests - #:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR=" - (assoc-ref %build-inputs "glslang"))))) - (home-page - "https://github.com/KhronosGroup/Vulkan-Tools") + `(#:configure-flags (list "-DBUILD_TESTS=ON") + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./tests/vulkan_tools_tests"))))))) + (home-page "https://github.com/KhronosGroup/Vulkan-Tools") (synopsis "Tools and utilities for Vulkan") (description "Vulkan-Tools provides tools and utilities that can assist development by -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:33:10 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000 Received: from localhost ([127.0.0.1]:56364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnq-0007FT-7w for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:10 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:42433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnl-0007Df-0g for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:05 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 3D2F83200AF3 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:32 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 28 Feb 2024 12:32:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141551; x= 1709227951; bh=GRkVbMvdrzFVxEyOepnwnUIy6xvVZqqzYf8tJEg5wtQ=; b=E fl5ZuCjrH51Hha4Dti/fXJMhLvCHkV2LZKzQvVZlITRroQZJvleEAizF0keRZZtw woMBu4UPfgwfHigd48wgjjhsNcnLY9uG9gzBmtY4Ee32YGVy2MqUw+pmIm2GZSD8 +3vP3vakfq6Wap50mgXsMgEC4A0fcExbSi6aAEAZA1m6R6XJbE2RGczS6Jq2QQc5 K3SGOcyhAasfb0DAGBkq66mRrrsxZNUNqUE0zK+GSRKZSMizqpnDUE/LPSdBYzaY ewX4BAWrQdkf49IZCdg18igNwAtf9oiIPYF2FYhMT0x5iYcI2jAtSoQjCo1AIh6B ocLNjtatPc5w1LdaWgBOA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141551; x=1709227951; bh=GRkVbMvdrzFVx EyOepnwnUIy6xvVZqqzYf8tJEg5wtQ=; b=iRRr9zNnUvglWiP3RMSMpsYlsp4iZ 76LHV4G9yjq1jHzYVB6QaEXSQ1F5FyYMDrU9OgWYFL+fnW/65JVZrPyDJfnVZ/BU BujFvIChKVF5Hw/agHF96j+6wLMcwX1Tjn0+6JZ7Jwk/ozzVxt+8IvwbKJSzSsUe D6vV1lm3TezQA2PP61u9/pCKusTh1NXRTOPYYUfQo3dO5quXmZf+KmIdirE8HE9e yrqwt7LshG49SPNDa6bvk1WcNflnXVrwhqyH1kAeqOKbhaTMICnP6YE9TxucAinh lb7BX+1jNFGjm+S+toPU6Qi1MfgdHlg5qUtfXUeSg4kMofQhhQfLV9WDA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:30 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 10/13] gnu: magic-enum: Update to 0.9.5. Date: Thu, 29 Feb 2024 01:31:43 +0800 Message-ID: <28ec014c9c98fd17ed875d03b54daa191300e942.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cpp.scm (magic-enum): Update to 0.9.5. Change-Id: Ic9223ead920f99ec5fe0824681e5cbc845174cca --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index e530d1d2a8..e8237c6cc1 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1759,7 +1759,7 @@ (define-public atomic-queue (define-public magic-enum (package (name "magic-enum") - (version "0.7.3") + (version "0.9.5") (home-page "https://github.com/Neargye/magic_enum") (source (origin (method git-fetch) @@ -1769,7 +1769,7 @@ (define-public magic-enum (file-name (git-file-name name version)) (sha256 (base32 - "1x47radgsifgz3vn2561mlvf4cq46ii33cpyqf01znm56iirwq89")))) + "14ys5sn2v1mai8bclvi81cp65g6jblqpdsi94639hphca5v8gka3")))) (build-system cmake-build-system) (synopsis "C++17 header only library for compile time reflection of enums") (description "Magic Enum offers static reflection of enums, with -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:33:11 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:11 +0000 Received: from localhost ([127.0.0.1]:56366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnq-0007Fb-J9 for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:10 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:56929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnn-0007Dz-Dj for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:07 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id 18E0F1C00099 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:35 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 28 Feb 2024 12:32:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141554; x= 1709227954; bh=mC4rTcREp/ON0jJ2NKx7zjbCKK0DEG6kJMTW9wbAuEM=; b=b Ot/G2HmZ8+/GC/JBaLcLT17AYxm4JZC1FF08JveVSCnIfaVGWC1zaJhyK477KrDo d+OjgC3oR1pwPle7fQ0rJTzsnjTBJbVosIJ6/wz9DWatlb3u3syS7g4YeaDWKxim gFtu4/uNXiTDl+dOWJAXFERt962ile3cq1nZ+8Widk3vokj/fnS5aF7S5WtmICWL JAGsSMdwmF18QMyxaAgUtjKNP+bHltEKM7QgiYuJ7vycPh+TwGq7PzVQYqrNKPiZ Q5mns29BfG62yO8+ugLeibfQVoA0nGh/nKAJr8VY+LndUsCPJMcUD9M76kQRUPrQ TyibahBf+gowHRDS5Gqgg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141554; x=1709227954; bh=mC4rTcREp/ON0 jJ2NKx7zjbCKK0DEG6kJMTW9wbAuEM=; b=JQFken/BrQN9Dxi/DJCuJW4ReRfdA jgOKHWwMu7iP8ffUpLQ+VMRSNxt8pAF9fyYqqVQfy/kgEGfAh4mI2kHn0+movfpd zMS5ZEiGIflwQgcxJAQKcKZJoPB8uTgOwvWQekfv29EsEfMX9mw9/b3xtrUVLtmQ wvN0A7/XE9qbnwtEfLfCzapchisMwtcZfyQmQmZoNaSEg3fN8Zk8zgfoCVwerveV AoDKcf//9e/hwMtyKK5iQPWbB/i9jD0DRVYnbfBiV9Y049WWLpCmGkrn4VD5MF/p 9JBCxigoywO1+OsylFvX5ldkrsEHoQSiQb8OPsCkYizlGcIzHAfAqgh/g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:33 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 11/13] gnu: Add vulkan-utility-libraries. Date: Thu, 29 Feb 2024 01:31:44 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-utility-libraries): New variable. Change-Id: I618c1e25bb122deac543dbc6b7903c40a359f1a1 --- gnu/packages/vulkan.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 82bc87dcd6..f8ffcddff3 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -572,3 +572,27 @@ (define-public vulkan-memory-allocator (home-page "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator") (license license:expat))) + +(define-public vulkan-utility-libraries + (package + (name "vulkan-utility-libraries") + (version %vulkan-sdk-version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-Utility-Libraries") + (commit version))) + (sha256 + (base32 "11bqb18mvb9h7xv5d83b3mz43km7l1sa6jh47jir61pxfvwrmy42")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DBUILD_TESTS=ON"))) + (inputs (list vulkan-headers)) + (native-inputs (list googletest magic-enum)) + (home-page "https://github.com/KhronosGroup/Vulkan-Utility-Libraries") + (synopsis "Utility libraries for Vulkan developers") + (description "Utility libraries for Vulkan developers.") + (license license:asl2.0))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:33:29 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:29 +0000 Received: from localhost ([127.0.0.1]:56388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNo5-0007Ga-1M for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:29 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:41107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnt-0007F9-0s for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:13 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id AC4D63200AC4 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:40 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 28 Feb 2024 12:32:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141560; x= 1709227960; bh=UyIPEDIJLKlFNLTEhZG6+8vjlKn8nfYWXAh99nap28s=; b=J MhjzFtDfEU4UlpULUtw7EXUUdUv8gAOEcAw2Z4dyGJ3jmDG3WVHuFwGITXggW43j GFbWrMyctruZmQZBzu7BCpOD3iiVuIdIjbY7w1njOavfwiXnG6wN+1KgT0vJEE6M 4gveWoHbpFums9fuQ6rS574cTxs5yFwgEO1h8OOdoQRia+KTWTXZn4z9mi8Cvn0s OPU/7+cVcYmTCc5hryGccWyjTHyFaM5DtMd7tiYK3YJrhv0QLxe4laMoPCB84o3T 5Tn45n1h882oyPBGDK2HnMBOvix46qpjnZ1kEdggCObSg0jppjKIP3Dam/TAH0WY AEPeHBSuUD00a4cTkIAhg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141560; x=1709227960; bh=UyIPEDIJLKlFN LTEhZG6+8vjlKn8nfYWXAh99nap28s=; b=HI6WupxWzGT3YhH7YS28aXKGg78Ra fijoQfY4RfflxCr0YbWqtV+OpCHR83EsTUCaLQ08NiQ3P0+Zj84bmVqZE7BW/g31 V26nuE8FIocIKC33QQUpxfXwqfPGaJ5aGNsqho9FZ0EqEACmDutwcqMfPt3zboOR PtDuU6FG/PRPKkQxLiryUoh5aQXZ2mgeKH4B3BV8JBvPNGSKaRgQ5WsKk2/srXB8 cCqLF0fUcuATn69cpoxwbiFem0reMPx4AONXU8FJofVaUfSUHCZ2rZ+BDNYEZTnV doGCL7uyNSqxu1VfvvFwtqXfVoVye+aqff8+/m5Z0QQ61PRNOmQ8JND1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:38 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 13/13] gnu: Add directx-shader-compiler. Date: Thu, 29 Feb 2024 01:31:46 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (directx-headers-for-dxc): New variable. * gnu/packages/vulkan.scm (directx-shader-compiler): New variable. Change-Id: I6e81f59ebd7122c007cce2df820359c055df5fd9 --- gnu/packages/vulkan.scm | 72 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 599b0a47d3..2597f6d701 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -44,7 +44,9 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages version-control) #:use-module (gnu packages wine) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define %vulkan-sdk-version "vulkan-sdk-1.3.275.0") @@ -582,3 +584,73 @@ (define-public vulkan-utility-libraries (synopsis "Utility libraries for Vulkan developers") (description "Utility libraries for Vulkan developers.") (license license:asl2.0))) + +;; directx-shader-compiler depends on an old version of directx-headers. +(define directx-headers-for-dxc + (let ((commit "980971e835876dc0cde415e8f9bc646e64667bf7") + (revision "115")) + (origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/microsoft/DirectX-Headers.git") + (commit commit))) + (file-name (git-file-name "directx-headers-for-dxc" + (git-version "0" revision commit))) + (sha256 (base32 "0c7l2xdsbr132ga2nyqjhz9xa42dxvhh9idjxnl673mz5kab1j6h"))))) + +(define-public directx-shader-compiler + ;; This commit drops the dependency on effcee. + (let ((commit "5f7834de562eeda3689fba0824008e1bcd7958b8") + (revision "0")) + (package + (name "directx-shader-compiler") + (version "1.7.2308") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/microsoft/DirectXShaderCompiler.git") + (commit commit))) + (file-name (git-file-name "directx-shader-compiler" + (git-version version revision commit))) + (sha256 + (base32 "0awnn5qb9hci3pprl6p84y4hlh6xibgsv0vwp6sm6n7wn71z2cb9")) + (modules '((guix build utils))) + (snippet '(substitute* "CMakeLists.txt" + (("add_subdirectory\\(external\\)") + "find_package(SPIRV-Tools REQUIRED) +find_package(SPIRV-Tools-opt CONFIG REQUIRED)"))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-G" + "Unix Makefiles" + "-C" + "../source/cmake/caches/PredefinedParams.cmake" + (string-append "-DSPIRV_HEADER_INCLUDE_DIR=" + #$(this-package-input + "spirv-headers") "/include") + (string-append "-DSPIRV_TOOLS_INCLUDE_DIR=" + #$(this-package-input + "spirv-tools") "/include") + (string-append "-DDIRECTX_HEADER_INCLUDE_DIR=" + #$directx-headers-for-dxc + "/include")) + #:phases #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install-distribution" + make-flags)))))) + (inputs (list libxml2 spirv-headers spirv-tools)) + (native-inputs (list git python)) + (home-page "https://github.com/microsoft/DirectXShaderCompiler") + (synopsis + "Compiler and related tools used to compile High-Level Shader Language (HLSL)") + (description + "The DirectX Shader Compiler project includes a compiler and related +tools used to compile High-Level Shader Language (HLSL) programs into DirectX +Intermediate Language (DXIL) representation. Applications that make use of +DirectX for graphics, games, and computation can use it to generate shader +programs.") + (license license:ncsa)))) + -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:42:02 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:42:02 +0000 Received: from localhost ([127.0.0.1]:57057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNwP-0007hN-KK for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:42:02 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:54747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNwJ-0007gc-KY for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:42:00 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.west.internal (Postfix) with ESMTP id CF30C1C00096 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:37 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 28 Feb 2024 12:32:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141557; x= 1709227957; bh=ZriR4D8hQpB9fMFAQVvQLaNs4FH7aHEUf+eFWcsSVbI=; b=X ZKLY2dm4Rz6ROPJXA8rkuhOPmg/aY2x8wgfHDHm/pzfS3k4NcRcoVFA39UJBrE3I Vh2sryyMzw34YGm3GTQc/fvT0tW7QJ0ftpFuause3LWYiA+gkcGtgjNNT9nJTNTi wRnPbpzV2IH78/SIdUyF1R3zyQz5KXLZYQGRkCcE5OHpmfVRit9uANdWL24sWedP aommH0E5XneiWgfJyaYtwlgCnKf9D+wPgRXlLFPJYFfk/tMVk3Nc5rlx2RabFJ8u ikAd5dQ2zvroTVUyEWMtpT/O8oUaym2g7Dk7vM/8iw4SZesgErwibiBDrwyK6en5 AQBSy/Sx97Gz5aUV6TmaA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141557; x=1709227957; bh=ZriR4D8hQpB9f MFAQVvQLaNs4FH7aHEUf+eFWcsSVbI=; b=nwDRS5/O0AIGH+PcYScmMJSqZ2sMI lzAvqT07H462psGbbiooxP7d6EslTZqfE4sDgePoWjcoXsHFOZDrP6qE7yFj9Ss+ ezN9GMo3JAHd2q0G3Sbiz7udPdzTzp6TlTpphvHWMLWuhoUumH4WlChFMBhSyBdU wDrfx41oPQj+IGV/blWVEHGZ2NZD5zECQxbbH9mHxHHyCIFuA5jzP1/A6/bwsiyh 1LhntqQ7015j5slvJR0t5Au7gkyz456l30+kQ11mZJ+SING7ziuLXhkP3donZK4u XsW5X4rUMqhRsub1OfuutxjPwqNND8O/Ri5n3ZlKC7/cLdbSDDDSiqL8w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:35 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 12/13] gnu: vulkan-validationlayers: Update to vulkan-sdk-1.3.275.0. Date: Thu, 29 Feb 2024 01:31:45 +0800 Message-ID: <0af764f02fe999685998050a65aa66c341238d50.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-validationlayers): Update to vulkan-sdk-1.3.275.0. [source]: Add snippet. [inputs]: Add robin-hood-hashing and vulkan-utility-libraries. [arguments]: Remove configure-flags and update the reason why disable tests. Change-Id: I01e25a974a0d4b4c672a621e07c46bdb17baab42 --- gnu/packages/vulkan.scm | 74 +++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 44 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f8ffcddff3..599b0a47d3 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -37,6 +37,7 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages cmake) + #:use-module (gnu packages cpp) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -453,60 +454,45 @@ (define-public vulkan-validationlayers (package (name "vulkan-validationlayers") (version %vulkan-sdk-version) - (source (origin - (method git-fetch) - (uri (git-reference - (url - "https://github.com/KhronosGroup/Vulkan-ValidationLayers") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-ValidationLayers") + (commit version))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + ;; We don't build static libraries in SPIRV-Tools. + (snippet '(substitute* "tests/CMakeLists.txt" + (("-static") + ""))) + (sha256 + (base32 "0j39j43siz6jwqai8miy0hgcz5b4lln9xfhk1vzds21kgn17r744")))) (build-system cmake-build-system) (inputs (list glslang libxrandr mesa + robin-hood-hashing shaderc spirv-tools vulkan-loader + vulkan-utility-libraries wayland)) (native-inputs (list pkg-config python spirv-headers vulkan-headers)) (arguments - (list #:tests? #f ;no tests - #:configure-flags - #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF" - (string-append "-DGLSLANG_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/glslang")))) - (string-append "-DSPIRV_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/spirv")))) - (string-append "-DSPIRV_TOOLS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/spirv-tools")))) - (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/vulkan")))) - "-Wno-dev") - #:phases #~(modify-phases %standard-phases - (add-after 'install 'set-layer-path-in-manifest - (lambda _ - (let ((manifest (string-append #$output - "/share/vulkan/explicit_layer.d" - "/VkLayer_khronos_validation.json"))) - (substitute* manifest - (("\"libVkLayer_khronos_validation.so\"") - (string-append "\"" #$output - "/lib/libVkLayer_khronos_validation.so\""))))))))) + (list + #:tests? #f ;Tests requires GPU driver + #:phases #~(modify-phases %standard-phases + (add-after 'install 'set-layer-path-in-manifest + (lambda _ + (let ((manifest (string-append #$output + "/share/vulkan/explicit_layer.d" + "/VkLayer_khronos_validation.json"))) + (substitute* manifest + (("\"libVkLayer_khronos_validation.so\"") + (string-append "\"" + #$output + "/lib/libVkLayer_khronos_validation.so\""))))))))) (home-page "https://github.com/KhronosGroup/Vulkan-ValidationLayers") (synopsis "Khronos official validation layers for Vulkan") (description -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 12:55:23 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:55:23 +0000 Received: from localhost ([127.0.0.1]:58006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfO9J-0008P0-Ur for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:55:22 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]:57643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNwI-0007gP-At for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:41:58 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.west.internal (Postfix) with ESMTP id 3A4521800084 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:15 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 28 Feb 2024 12:32:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141534; x= 1709227934; bh=sS8Bxd4BpFZwrqUGFkUpbIs8tSiTQsJhw0lkwMLUD3Y=; b=F UFsHZJaTp813956j2CINq0CMwx2oTh/nG/UDK9l4jmb7TSRmQUepmGKOnxAQS9Oy SG5KqECbcmXlACXJ51nCpMuys6LpMldaIHd518rYiJzWpC2O4z4R6JHpaW6Qcxu0 LHPzok8Z8xizUjuxh0fFO/jaTlNUBo6xU29daXT3LBZLVCWTUcsbhGGis4DcazLi OKa+1if4Bf+i+s1LeWq7SBJwv/alOe0hea2+z5JKg40bqKJlfIDl+lc9kCmAA1Lu Or/FSrc0GMuYfqh+2Gib/pSNsVffX9jmXtcxojKlyoQQ61jTRPcHpbiqwZWdW9/w GDjlSpmbxUo4fuHj/Pz9w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141534; x=1709227934; bh=sS8Bxd4BpFZwr qUGFkUpbIs8tSiTQsJhw0lkwMLUD3Y=; b=rw+8uNkkeroiNbdGByfldEm1uKmx9 bG/YSx6ICI2kYVubJ5V0PeuvSztiriJgeZxc8Nsggd18GsnwuyGa25yGJA7FfI0+ BR/Ie1Sab4ouVzkyXl7qpboRwzmSwA4nHyy6sgfeVDZVCx8HQgR5CLZKznpbe6YS Q+uma5x5qC+hyrJdvELzB0mrtuXY0GOdd1o+xSvk0tzPEE+0UIaPpEui+XmCH6Fl FtjogacGKVZY82TiWf9P4QriDI/nCAGvaYpg0ENQWIb2oqlDPnNFD2yPqCqQsZCk dFtni3TyzRkl2FEDkyOLj15CU7R0k5ZN3qCJgmO3833Hufejs5zo1NT4w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:13 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 04/13] gnu: spirv-cross: Update to vulkan-sdk-1.3.275.0. Date: Thu, 29 Feb 2024 01:31:37 +0800 Message-ID: <363af38c9a04e02d0ee1485732e7342ff551896d.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (spirv-cross): Update to vulkan-sdk-1.3.275.0. Change-Id: I936c999d8c97ab4024e505c1afdeba7baddeecfa --- gnu/packages/vulkan.scm | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 3b485901d8..12baf52f92 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -124,28 +124,26 @@ (define-public spirv-cross (url "https://github.com/KhronosGroup/SPIRV-Cross") (commit version))) (sha256 - (base32 "1ypbc1krkr0yywa1m976g3sjyb80l7hxwrnh6gp70w6va1dlnnn9")) + (base32 "0zdpgj0lv8kqzcna7y44qdjvxjifaxmmmcar835y4cdr35izf6ij")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list "-DSPIRV_CROSS_SHARED=YES") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests-to-find-deps - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{CMAKE_(.*)_DIR\\}/external/glslang(.*)/bin") - (string-append (assoc-ref inputs "glslang") "/bin"))) - (substitute* "CMakeLists.txt" - (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") - (string-append (assoc-ref inputs "spirv-tools") "/bin"))))) - (add-before 'check 'update-reference-shaders - (lambda _ - (with-directory-excursion "../source" - (invoke "./update_test_shaders.sh"))))))) - (inputs - (list glslang spirv-headers spirv-tools)) + `(#:configure-flags (list "-DSPIRV_CROSS_SHARED=YES") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-tests-to-find-deps + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_(.*)_DIR\\}/external/glslang(.*)/bin") + (string-append (assoc-ref inputs "glslang") "/bin"))) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") + (string-append (assoc-ref inputs "spirv-tools") + "/bin"))))) + (add-before 'check 'update-reference-shaders + (lambda _ + (with-directory-excursion "../source" + (invoke "./update_test_shaders.sh"))))))) + (inputs (list glslang spirv-headers spirv-tools)) (native-inputs (list python)) (home-page "https://github.com/KhronosGroup/SPIRV-Cross") (synopsis "Parser for and converter of SPIR-V to other shader languages") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 28 13:12:02 2024 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 18:12:02 +0000 Received: from localhost ([127.0.0.1]:59289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfOPR-0003Us-NX for submit@debbugs.gnu.org; Wed, 28 Feb 2024 13:12:02 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:33913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfOPP-0003UR-9K for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 13:12:01 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id DCA853200AC5 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 28 Feb 2024 12:32:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141529; x= 1709227929; bh=oLstWkLmwgQ7WVDooldvxfjJPlV6ioZYi5U4C4/G4CE=; b=s +epHOFduhs6ctbzKziSjJwTL8pGmaBV+sqzLaoPmxGVSC0YWz2s1WYyx+jXO9mXJ Px6tze8/IZ4J/4DwqoU5hcK3+CExXtsBSR15m1viWiYt1XG4BT7jNczJcY/br7ko 5oOSAEpITMWbJgImI+n7hZJYYSqgHgJGNZrBA+1XTkr0Gx8DDKHuMPX16gByrkyh AaymFTTkX5a9yIl6QtWlK8nZQa1XWo8i1HPO4pTaCGQBjhj65lgTTENDWhgtaBrc V+TJiATltDKt2bOjyH8KwaHkwXlzMaLmX/hDlFGx22vV1dlsoorMzCYtARzs2vdl Ar8ofgm6EVXH7QYq3Crtw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141529; x=1709227929; bh=oLstWkLmwgQ7W VDooldvxfjJPlV6ioZYi5U4C4/G4CE=; b=rZ7ddfN372Y/gr9L5wd+j4hPiGjE+ R/GZbKSvSYhpXcVxBEB/Wa32qoSiI0sCndbb9qIpGQh3B0NKVKUjymV72RVd086X THGPc7syFPmZa4iUa9S3UbzjTONESvOVpA9CIxfFHcnkTjYe5CIipltbaZbP9eZA j15j6Rxi60oPk38H/pIbQT6C8Dl7q394bYR0XZpU5f8tcgYSeOyTHZ96j82EY5vB 7vYf3TeNPGBzITqTltmcUmaw6OfdD3R8QcLvD/HwCiKTuUnH5CIgyKnUCdPsNEOQ BBkpzE+VqvAo6mtMOc7QPt/X7W73NfOVMst/xtE5+tf/ynxhyQvsxWlmQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:07 -0500 (EST) From: dan To: 69461@debbugs.gnu.org Subject: [mesa-updates 02/13] gnu: spirv-tools: Update to vulkan-sdk-1.3.275.0. Date: Thu, 29 Feb 2024 01:31:35 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (spirv-tools): Update to vulkan-sdk-1.3.275.0. Change-Id: Ibd28a26b60a14e6e8faabfe8ed09d93f6e5cafd5 --- gnu/packages/vulkan.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 2fb1884795..d29810f4c6 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -87,22 +87,22 @@ (define-public spirv-tools (version %vulkan-sdk-version) (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/KhronosGroup/SPIRV-Tools") - (commit version))) - (sha256 - (base32 "03d489ind2az7w7q1slj3mdc04372r3qqbnd7m9akxbg7yix1a5j")) - (file-name (git-file-name name version)))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/SPIRV-Tools") + (commit version))) + (sha256 + (base32 "1hmfhvswg66x7x2ww5gj3mhgh59kgp7pwv36xagwyhbm7fhayca7")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" ;; Some packages like mpv fail to link ;; when the static libraries are built. "-DSPIRV_TOOLS_BUILD_STATIC=OFF" - (string-append - "-DSPIRV-Headers_SOURCE_DIR=" - (assoc-ref %build-inputs "spirv-headers"))))) + (string-append "-DSPIRV-Headers_SOURCE_DIR=" + (assoc-ref %build-inputs + "spirv-headers"))))) (inputs (list spirv-headers)) (native-inputs (list pkg-config python)) (home-page "https://github.com/KhronosGroup/SPIRV-Tools") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 02 05:08:49 2024 Received: (at control) by debbugs.gnu.org; 2 Mar 2024 10:08:49 +0000 Received: from localhost ([127.0.0.1]:38081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgMIT-0005ux-73 for submit@debbugs.gnu.org; Sat, 02 Mar 2024 05:08:49 -0500 Received: from fhigh8-smtp.messagingengine.com ([103.168.172.159]:49957) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgMIO-0005uZ-My for control@debbugs.gnu.org; Sat, 02 Mar 2024 05:08:48 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfhigh.nyi.internal (Postfix) with ESMTP id A91911140114 for ; Sat, 2 Mar 2024 05:08:10 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 02 Mar 2024 05:08:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s=fm2; t=1709374090; x=1709460490; bh=5P5968zdSudIVlgfe5Iuy1Mr5n8S/M7h Ict42ttimoI=; b=o6bgE40Dz3o5uVOZSjOBHoTHCie3/gBV51visc4SVDMRxq9j ja53f7QOdlp+UhGomIq4ysehE/CvofwOWDHAuDg44fWOQ23lQFp1fu3D7dPMwGqi eSvdVnYbXlzVWIjyCUntYWORXfkO3o9Md9WZKRgkKron3ABDPlR9mz9OZDdbwba3 kWO5zRnqboMWUnltPNuCc1A574KSTCdYUxG9UEY9sHqzdht+vjJXHLMhlOBmIgYn pHpuhEJtdZSGzb3d2TVEJ6XC9BnhawlOIRThvsy8kZ9TWSVCt1v8Oe4uH4T19TUA V3gjgUHPZsZa4RLhcHdryDmm43cTWJE9Rf8zqw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1709374090; x=1709460490; bh=5P5968zdSudIVlgfe5Iuy1Mr5n8S/M7hIct 42ttimoI=; b=fZQFbx1SophI9Ndd91y3v5NrQmg6IOkqqtTTxhIsDLyPD0p9ynA JRwSwSUWX+1GoXczFmbW/pKy+5tQQtbOc8BdPuIl4m8PoIr8+cyUJ2gxGIgdvUYi UsMVGQD5Px+tMbSoBfhCc+J7Ud5Vu8fJKZkOap0zUjNdTx4FOJ457WAEaI5DVTqq LtUx9U6Juo79QFvhz5BBxG1CWupbJWfouWHmDQ4rf7PV8Fh6Dfcs/9TaQVFIOvSt KMMthyM/kqWlFeqfaClv6zuvGOaWzCjw7IFVArxy++iUcQFKVhSv9P+7gHEG5NZU dZfN3/DVzTRlYCvxGZCUAsLLRkxP449xJ1Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrheefgdduvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfgfhvffufffkgggtsehttdertddtre dtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghr nhepjeekfeejveevleelvdeuveekueehgeetteejffffgffghfelgfefjeelvddthfevne cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggr nhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 2 Mar 2024 05:08:10 -0500 (EST) User-agent: mu4e 1.10.8; emacs 29.1 From: dan To: control@debbugs.gnu.org Subject: retitle 69461 [PATCH mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler. Date: Sat, 02 Mar 2024 18:02:16 +0800 Message-ID: <87cysddjzs.fsf@dan.games> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) retitle 69461 [PATCH mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler. -- dan From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 04 16:39:38 2024 Received: (at 69461) by debbugs.gnu.org; 4 Mar 2024 21:39:38 +0000 Received: from localhost ([127.0.0.1]:45064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhG25-00032p-O4 for submit@debbugs.gnu.org; Mon, 04 Mar 2024 16:39:38 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:40349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhG23-00032a-45 for 69461@debbugs.gnu.org; Mon, 04 Mar 2024 16:39:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1709588338; x=1709847538; bh=gePYXxUqmK/Qmi7UeBVlltmXEIZ4U042Vs5KXpYfzio=; 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=GJGgjp6whzaMQdW6SLv/M6Pb7Xy7ys5Y0Ic/+S4p/usS34gfx4rOBc4MEAa+6WLnj enBCSu98gYvyuRtGIRI1XOQFURLk+nMDPyMzYasNRO1plJqDe2AxalU4sUZrSJq8Bx YNFCpiPqWRtOGtQTXzelp/7hpP0II1ccYPHVs89zJgqWXEWG50NVKiklt67xMSBHFf DWNgmHrHPqkGEiqtWGFt31+qXj5q0oeQhNTmplMYIloPen/RZRfKj0L+WoQ94zdcgL PMnG3OhvMPUbRf+ZrTwj6yYotl7S1jgbAjhXXI+3NXBdNtLAFc0Pbe/GmrsPmZbSKI s7ZU21LBDzIIQ== Date: Mon, 04 Mar 2024 21:38:36 +0000 To: Ricardo Wurmus From: John Kehayias Subject: Re: Should commits rather be buildable or small Message-ID: <87jzmhad9s.fsf@protonmail.com> In-Reply-To: <87fs09ar56.fsf@elephly.net> References: <6bcc9412f092c20fbd7f8326dbf91e90cef0eed1.camel@gmail.com> <875y16c54b.fsf@elephly.net> <87fs09ar56.fsf@elephly.net> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69461 Cc: dan , Philip McGrath , Saku Laesvuori , Liliana Marie Prikler , 69461@debbugs.gnu.org, guix-devel@gnu.org, Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi everyone, And sorry for reviving an old thread, but I am faced with a similar issue f= or updating vulkan, with the patch series submitted by dan (cc'ed): . I thought I would get some opinions here, ple= ase see below: On Mon, Dec 11, 2023 at 12:51 PM, Ricardo Wurmus wrote: > Attila Lendvai writes: > >> i myself also had headaches multiple times when i fixed something that >> needed to touch several different packages, and they would only work >> when applied in one transaction: >> In this case all the vulkan packages share a version through a variable nam= e. I would assume packages wouldn't like mixed versions, but maybe some wou= ld work (I haven't tried). I'll be taking this series on mesa-updates with = related changes, so the plan is that when it hits master there are no/few b= roken packages and full substitute coverage. So perhaps this makes this mor= e of a style and convention question. Some options: 1. Essentially squash to one commit where all of vulkan is updated in one c= ommit. The main upside is that nothing should break (within vulkan, depende= nts to be fixed as needed) and it shows as "one" change; the main downside = is that the proposed changes are not just trivial version bumps. Harder to = then disentangle as needed. 2. Make each commit updating a package, but don't use the variable %vulkan-= sdk-version, updating each package with a version as it is done. Then do a = commit where all the versions are replaced by the variable. This seems like= unnecessary work to me and while it stops the obvious breaking (source has= hes don't match once variable is updated but package hasn't yet) versions a= re still mixed which is likely a problem. 3. Go with the series as proposed: this means after the first commit for su= re all other vulkan packages and dependents don't build, as the source hash= es won't match until the commit that updates that package. Along with versi= on mixing, this perhaps doesn't give you a helpful git bisect either? None are perfect. What do people think? My instinct is to go with the series as proposed (after review) accepting t= hat there will be for sure builds failing if time traveling to the middle o= f the series. I don't think we can really avoid that anyway, as sometimes w= e only see an issue after a commit and it is fixed some time later. We coul= d have a note in the first commit that this requires the next n commits to = update vulkan packages. That might help if someone is on an intermediate co= mmit and can see quickly in git log this note. Or perhaps we can note something is part of a dependent series when we make= commits so this is easier for someone to tell in general? Thanks! John From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 04 23:33:30 2024 Received: (at 69461) by debbugs.gnu.org; 5 Mar 2024 04:33:30 +0000 Received: from localhost ([127.0.0.1]:45627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhMUb-0005Dc-EU for submit@debbugs.gnu.org; Mon, 04 Mar 2024 23:33:29 -0500 Received: from wfout4-smtp.messagingengine.com ([64.147.123.147]:55549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhMUW-0005DB-QZ for 69461@debbugs.gnu.org; Mon, 04 Mar 2024 23:33:28 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.west.internal (Postfix) with ESMTP id 63BA61C00088; Mon, 4 Mar 2024 23:32:48 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 04 Mar 2024 23:32:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1709613167; x=1709699567; bh=PA1xz/KhEtqxXzIaQmQ3It+9wqmGZnKI16apL5cOyjM=; b= nmCjwpoKcIKt1sAaD76NCCqNr1zq/onn5bXmn/sKgyAyAOg5QZlm5l+KW3ggcaTO EOx97ZiCSE/6BPiWE9CQVxIUzwI8Nwx5QM12i5UkYLRlzcZ8d8H9U8giE1RUk3E8 0F5mgn3lDiZ6cRebg0T45om/HwOVyTia4V95F2pcy0cBVZnl8+V2oTvH6SB97+/5 804o5Nn8//bsGG17FdRiCA9b9Z+FST3zNy3vQbh0X5rtXkxG3+lrgd9TtHi44JV7 ETKkqJk+ykV9BAdoqAZ0QQHb36mLKrRQn0zY3dr/exZ0869PFYAHKwt2PMgll5WS roFylgiUBBEwf6bbPSAyAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1709613167; x= 1709699567; bh=PA1xz/KhEtqxXzIaQmQ3It+9wqmGZnKI16apL5cOyjM=; b=K a6rtdgAeb6RsdAIo7AL1PIlMTax47jwoXCVdAHIscXhQ6iCZb3CiZw/74gO0CRm+ w2TQbo1jD2EkWLumfoF+Mntu0r8S8WWLXlgwrjWeiG0l/SxoExc2hW2xTukHGS2S NfRsJSHXiG8AKSNe8GAJygCoFbHzDIl1gYdAJMThiLNbrMlYPS6hdOpq53mZ/Kdt d37jtz1NqDDUjHBEc5FxvkyUKUlLrSjTm4QjZUMyu2cF1kOHNye5sKY1x9ZT0gGp S0k8lqJQ4c9YBrFhUs6XYuHoMGiwNXGbDm6+EmD3iuo9Fw1FUCGb4iTejxdUMYq0 DUooroedjS7obk2EsX55A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrheekgdejtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepuggrnhcu oehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpeekveduudehhfdtgfffff ehhefgvefgjeegveetveefhefhledthfefheevtdeivdenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 4 Mar 2024 23:32:43 -0500 (EST) Message-ID: <4baeb31e-d8e7-4cef-944b-7214627d7905@dan.games> Date: Tue, 5 Mar 2024 12:32:39 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Should commits rather be buildable or small Content-Language: en-US To: John Kehayias , Ricardo Wurmus References: <6bcc9412f092c20fbd7f8326dbf91e90cef0eed1.camel@gmail.com> <875y16c54b.fsf@elephly.net> <87fs09ar56.fsf@elephly.net> <87jzmhad9s.fsf@protonmail.com> From: dan In-Reply-To: <87jzmhad9s.fsf@protonmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: Philip McGrath , Saku Laesvuori , 69461@debbugs.gnu.org, Liliana Marie Prikler , guix-devel@gnu.org, Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi John, On 3/5/2024 5:38 AM, John Kehayias wrote: > In this case all the vulkan packages share a version through a variable name. I would assume packages wouldn't like mixed versions, but maybe some would work (I haven't tried). I'll be taking this series on mesa-updates with related changes, so the plan is that when it hits master there are no/few broken packages and full substitute coverage. So perhaps this makes this more of a style and convention question. > > Some options: > > 1. Essentially squash to one commit where all of vulkan is updated in one commit. The main upside is that nothing should break (within vulkan, dependents to be fixed as needed) and it shows as "one" change; the main downside is that the proposed changes are not just trivial version bumps. Harder to then disentangle as needed. > > 2. Make each commit updating a package, but don't use the variable %vulkan-sdk-version, updating each package with a version as it is done. Then do a commit where all the versions are replaced by the variable. This seems like unnecessary work to me and while it stops the obvious breaking (source hashes don't match once variable is updated but package hasn't yet) versions are still mixed which is likely a problem. > > 3. Go with the series as proposed: this means after the first commit for sure all other vulkan packages and dependents don't build, as the source hashes won't match until the commit that updates that package. Along with version mixing, this perhaps doesn't give you a helpful git bisect either? > > None are perfect. What do people think? > > My instinct is to go with the series as proposed (after review) accepting that there will be for sure builds failing if time traveling to the middle of the series. I don't think we can really avoid that anyway, as sometimes we only see an issue after a commit and it is fixed some time later. We could have a note in the first commit that this requires the next n commits to update vulkan packages. That might help if someone is on an intermediate commit and can see quickly in git log this note. > > Or perhaps we can note something is part of a dependent series when we make commits so this is easier for someone to tell in general? I think to make each commit able to build, it's feasible to remove this %vulkan-sdk-version variable. However, this doesn't fundamentally solve the problem: when updating several packages in a patch series, some packages might be broken since their dependencies are updated. Another question is how should we treat vulkan packages. Some distros package them on a per package basis (I see in Arch Linux, vulkan-headers and vulkan-icd-loaders have version 1.3.276 while other packages like spirv-headers has 1.3.275). I had to admit that I'm not that familiar with vulkan packages, but I feel it's safer to keep their version matched since each vulkan-sdk release makes sure every vulkan packages are compatible with others. Thus, I prefer updating them in batch. I think maybe it's a good option that we mark these commits are a series. -- dan From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 05 00:21:15 2024 Received: (at 69461) by debbugs.gnu.org; 5 Mar 2024 05:21:15 +0000 Received: from localhost ([127.0.0.1]:45666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhNEo-00074z-GW for submit@debbugs.gnu.org; Tue, 05 Mar 2024 00:21:14 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:52537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhNEk-00074b-Jj for 69461@debbugs.gnu.org; Tue, 05 Mar 2024 00:21:13 -0500 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a4417fa396fso645472966b.1 for <69461@debbugs.gnu.org>; Mon, 04 Mar 2024 21:20:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709615975; x=1710220775; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=DWzVsyqHW/F5/ODpY2gLr3UYz0+yETsrYnp8v7maTM4=; b=GVA5hTj1n5KKr5DuOEbKPulLFoUMfAUOewgCn2RsKZbALKwoq18v2a/PLHBxsAnaVK LcatHKv0pUHr1ulsRar3/NU+O1z+kOA/6EVW+w91tFbau7aQQK8ogEVB61ogX+NPfMoH Zp7QrRdjlX3msEaSISdE+YgyuOm6uoF8pznk5NJFZPrc0LRb5Nby7UVO2jsN9iItvGm4 BnrBDZ1n9kxIjlJd3E7rmjGNwpseIm9yfULiT853Fvwwn5SP3ZiSIQJKL2O/YBI0W9J/ c71Kn1NLDYvGkJ++VhImAQOZfOBIHDHN2gbF5jiavvlnH+16pP+Y07oGItjMbZoD40fz wR0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709615975; x=1710220775; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=DWzVsyqHW/F5/ODpY2gLr3UYz0+yETsrYnp8v7maTM4=; b=hiIdRj1wMixS7ZOwIboqhJoala9IO289s9IjOBSsNU1C+zYjYrQiHrC0y0/FObRQJ4 sN9xxTNxJFRP76oxL8fFInvhFY8AFCgQtfnBpbwMYH+VjDAEozlCnzCN3trtKFAquxGm Hi/VV9iN/287PmQONgyTH1ZOF7l3iJDdjWDNl7MVABv2CUvZu0b5sCuSZknqOihkaPtg WzNmtUXR7OwWuK3sjFhWP9MAfNurkx0cKhkPBShpG1Fc83HCeUoF3kIK1XbpC1X9S5X7 jOS1Ojzkg2fCiRnx2L5RMLXhwjp/dScHQmu1wAYQyToA5SOorg7RrkYK4xeqCI+OwdiE o4Ig== X-Forwarded-Encrypted: i=1; AJvYcCVlkQy3MCWDvGHLtaoIzHO3kz+PIwxizyUF5Hr9NQhBbzLiDofTdTRHYcq5nJCoX+z2HcYXsgadpf1W1tGrxsHphiEP8OQ= X-Gm-Message-State: AOJu0YxFFDg0NixeUuxD8BsWWQQs9qavjuSdorQtcummVWoJIGLlgqOY 6Slpqyy05Pbed6tozVGIVYldsOx0n2ZAAQTUULuGUtHeAJ4XUrJ0 X-Google-Smtp-Source: AGHT+IFIWiuAAWDnwYPUHIpOY3Hun7b2cjnzfngVxYDi1EPOY8UFXvuG3e9ZPioO9Vgxh8oPNDzORw== X-Received: by 2002:a17:907:1186:b0:a3e:9def:5ed5 with SMTP id uz6-20020a170907118600b00a3e9def5ed5mr7298700ejb.33.1709615974357; Mon, 04 Mar 2024 21:19:34 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id oy29-20020a170907105d00b00a43fe57b2basm5600466ejb.61.2024.03.04.21.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 21:19:33 -0800 (PST) Message-ID: Subject: Re: Should commits rather be buildable or small From: Liliana Marie Prikler To: John Kehayias , Ricardo Wurmus Date: Tue, 05 Mar 2024 06:19:32 +0100 In-Reply-To: <87jzmhad9s.fsf@protonmail.com> References: <6bcc9412f092c20fbd7f8326dbf91e90cef0eed1.camel@gmail.com> <875y16c54b.fsf@elephly.net> <87fs09ar56.fsf@elephly.net> <87jzmhad9s.fsf@protonmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69461 Cc: dan , Philip McGrath , Saku Laesvuori , 69461@debbugs.gnu.org, guix-devel@gnu.org, Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Montag, dem 04.03.2024 um 21:38 +0000 schrieb John Kehayias: > [...] > 1. Essentially squash to one commit where all of vulkan is updated in > one commit. The main upside is that nothing should break (within > vulkan, dependents to be fixed as needed) and it shows as "one" > change; the main downside is that the proposed changes are not just > trivial version bumps. Harder to then disentangle as needed. >=20 > 2. Make each commit updating a package, but don't use the variable > %vulkan-sdk-version, updating each package with a version as it is > done. Then do a commit where all the versions are replaced by the > variable. This seems like unnecessary work to me and while it stops > the obvious breaking (source hashes don't match once variable is > updated but package hasn't yet) versions are still mixed which is > likely a problem. >=20 > 3. Go with the series as proposed: this means after the first commit > for sure all other vulkan packages and dependents don't build, as the > source hashes won't match until the commit that updates that package. > Along with version mixing, this perhaps doesn't give you a helpful > git bisect either? >=20 > None are perfect. What do people think? I think 1 would be workable if the changes to the packages are minimal. You should also check whether you can just do the version bumps and then the other changes =E2=80=93 or flip the order. I don't really see the benefit with 2. Normally, we'd have "-next" variants to catch nontrivial updates (among other things), but those don't seem a good approach here. If nothing else works, 3 is indeed an option to fall back to, albeit begrudgingly. As noted for 1, you could check whether bumping all the hashes and then only fixing whatever else for the builds is an option here. Alternative 4 would be to build those -next variants and then replace the base vulkan all at once. This has the advantage of not doing any version mixing in-between IIUC. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 16 12:10:08 2024 Received: (at 69461) by debbugs.gnu.org; 16 Mar 2024 16:10:08 +0000 Received: from localhost ([127.0.0.1]:56371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlWbo-00054W-4u for submit@debbugs.gnu.org; Sat, 16 Mar 2024 12:10:08 -0400 Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]:45963) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlWbm-00053w-10 for 69461@debbugs.gnu.org; Sat, 16 Mar 2024 12:10:07 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 84ADE11400E5 for <69461@debbugs.gnu.org>; Sat, 16 Mar 2024 12:09:23 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 16 Mar 2024 12:09:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm2; t=1710605363; x=1710691763; bh=Vt5Q6sPcfF6dNiBoft/sQ gYXKUbtQbO7ekUgOFMmtsU=; b=K30DMjJWyDh4cLq+wi+nrIsWnqIc3j331Kc5Z O8KDyca3VTA9j6i1eJQ+b1/vmcnr0itWbSZMFCHOL8DKQ/7Rpp+cQW8+tX9zwTND CCFGjn2Z95MD3Mweh03YqhiBjVq7YgtMCCMTNsNrzulLc03JA0AmihZ2qODQnxkm ZRlvx2O++4dPlrZzViIcaCSjCc+MjAAwtWt8vj1PP8BAHdF+lpjWmt6uB6wGuOVT iHn55/rQffwfhL9H+Ev79qPEeRrFgk9LNFKL32Jz5oir6WMI+g+xefnb5lRAOHwe zxClDe2qrkZNpVKZ1hmxY2KAIo7CnHtv1QEk6hmylkFkhT/gw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1710605363; x=1710691763; bh=Vt5Q6sPcfF6dNiBoft/sQgYXKUbt QbO7ekUgOFMmtsU=; b=pthVNu5CR2XYZGsvugWvj3375UmW0Kfs52wWwqF7UBaz VrzBhng8b2VNQ84GjElQBPFqGnRqN4pH5qqBXl6agNN6T0mPomI1nmqWIYoJzawM k2oqj8sNf+B5BRaYwuKLFXbXTa73vK9tjpGXaOe8nyW4vD7oCIil2E3ATEAignF+ Ujyc57RuuRUVxjK2qIklF6Yei9VZvvwxlJH8MFmBvQnjGtbz0ELohUA/qXVQkLFh N22qOG615vJyUfy+ZIm337gCRaQErklRiQTus7j3nDrPGIp8hKlwAak9IuZxE71y dVZtshnGhLv8qwGCmOWm64ypAfBWOho0z3BU5SSPvQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrkedvgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghr nhepkefgtddvfeehueeufeeiveffgedtkeefudfhudfffeehgfehtdejjeelkeffueekne cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggr nhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Sat, 16 Mar 2024 12:09:21 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v2 0/1] gnu: Add directx-shader-compiler. Date: Sun, 17 Mar 2024 00:09:02 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) *** BLURB HERE *** This v2 patch update direcx-shader-compiler to 1.8.2403, which is release several days ago. dan (1): gnu: Add directx-shader-compiler. gnu/packages/vulkan.scm | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) base-commit: 6f05c96f9635da7ca9f421d03a6359ff3b1d1a95 prerequisite-patch-id: d2c827a47292c22f4808b9ae31b9ea2379f09d2d prerequisite-patch-id: 7328244cc8c7178a6e122d7521d4ec42b1bf0888 prerequisite-patch-id: 108a388cd1e11057de47417a883f65bc53ded20a prerequisite-patch-id: 5379655afbce71b5681fc929bdef8045dce8c4cd prerequisite-patch-id: b2db37211901121736883a9c34c1052fa4ff8622 prerequisite-patch-id: 0043f79b15c6b80e29e45269538a24c548666428 prerequisite-patch-id: 46c858d89c2c67916c891623f905727e39112cad prerequisite-patch-id: ca531e97e17fd3a4a158fb5b1558c97e9c7deb50 prerequisite-patch-id: 49e3377f59b1367647f59f8f1f9a9e1fb814a21c prerequisite-patch-id: 5f3d93157507cd2f456ef089b32c98547c18d3d4 prerequisite-patch-id: d0c9e83a13a51199ad05a21e110201ba6b81440e prerequisite-patch-id: e200ec734bde0452a7b3b770a0bd46b747ad037f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 16 12:10:12 2024 Received: (at 69461) by debbugs.gnu.org; 16 Mar 2024 16:10:12 +0000 Received: from localhost ([127.0.0.1]:56373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlWbr-00054l-J9 for submit@debbugs.gnu.org; Sat, 16 Mar 2024 12:10:11 -0400 Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]:55979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlWbn-00054K-PH for 69461@debbugs.gnu.org; Sat, 16 Mar 2024 12:10:08 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 9F76711400CD for <69461@debbugs.gnu.org>; Sat, 16 Mar 2024 12:09:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 16 Mar 2024 12:09:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1710605365; x= 1710691765; bh=kR6/KpjGWfamjFirKMdEQPGusHU6zaNlnF9RS6zz/Y8=; b=r EM4ojGIqEdwnkX8pkPG+pwhkzaFbTSb9juhFhWSfBtOSUWjEiAEkjpq3MT4vgw/e hq4oKJn+wJP8EWDBmHiRaa73657+8+VqEqs+LJ4nJkkCk/mBf/DiKw4VqZVZGv7s hkKeYr/xhAVxj4pSfcA8LoZI3KzCQndZ9Oittp77VTak9GVrsN7+zcPjG5/rVG44 eNaD+VoivaQMTGZWYB4OgtAfuBd4BN54S/umhDAvfhaf6Wg3ksXZoGn/1f7TtbOf RiI2rrNL9rOZkwBN8PM1fxQrN/uVH6mPTSU4aFS/ByPQvQaI9V1FY/fD8U5Qm7CA Y0Ml6YAovrDqB9ltCqUXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1710605365; x=1710691765; bh=kR6/KpjGWfamj FirKMdEQPGusHU6zaNlnF9RS6zz/Y8=; b=CiQS7FmewEay/MNBPfKBBndu5VAMw rxdIS/7RzXnTeuHet7dTE03jAADnj7faeh8hHt7BcMZpjdNuYMblQncHjrIRiBKa 3VnvrIJgwdXptirAwiPsEqczn8xclImhlev5FdcqYMssYpqHwjnDY95oLvmuJmNo 2stzxlHND/MQexYiNFEO+GUVHFo9gqPD18QCOfn6dKYszdpQGIWvDac78DScHjou 2aIVd3g7G0x6GjAHS9YsCF/U1d8FMHMvsO9YXXMv9D8cQBnyPNDiftkNVRSghR7P mZJy52oo84U7XkmmuiN1jpq4sPhlKObYj9ir+1+CPiluoHp8hHBbel5NQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrkedvgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Sat, 16 Mar 2024 12:09:24 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v2 1/1] gnu: Add directx-shader-compiler. Date: Sun, 17 Mar 2024 00:09:03 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (directx-headers-for-dxc): New variable. * gnu/packages/vulkan.scm (directx-shader-compiler): New variable. Change-Id: I6e81f59ebd7122c007cce2df820359c055df5fd9 --- gnu/packages/vulkan.scm | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 599b0a47d3..517f26c173 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -44,7 +44,9 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages version-control) #:use-module (gnu packages wine) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define %vulkan-sdk-version "vulkan-sdk-1.3.275.0") @@ -582,3 +584,68 @@ (define-public vulkan-utility-libraries (synopsis "Utility libraries for Vulkan developers") (description "Utility libraries for Vulkan developers.") (license license:asl2.0))) + +;; directx-shader-compiler depends on an old version of directx-headers. +(define directx-headers-for-dxc + (let ((commit "980971e835876dc0cde415e8f9bc646e64667bf7") + (revision "115")) + (origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/microsoft/DirectX-Headers.git") + (commit commit))) + (file-name (git-file-name "directx-headers-for-dxc" + (git-version "0" revision commit))) + (sha256 (base32 "0c7l2xdsbr132ga2nyqjhz9xa42dxvhh9idjxnl673mz5kab1j6h"))))) + +(define-public directx-shader-compiler + (package + (name "directx-shader-compiler") + (version "1.8.2403") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/microsoft/DirectXShaderCompiler.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ckngd42ivz5cv5nqngkjwwlcxbcj9mcxps56zy7qnq4dmmqkiid")) + (modules '((guix build utils))) + (snippet '(substitute* "CMakeLists.txt" + (("add_subdirectory\\(external\\)") + "find_package(SPIRV-Tools REQUIRED) +find_package(SPIRV-Tools-opt CONFIG REQUIRED)"))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-G" + "Unix Makefiles" + "-C" + "../source/cmake/caches/PredefinedParams.cmake" + (string-append "-DSPIRV_HEADER_INCLUDE_DIR=" + #$(this-package-input + "spirv-headers") "/include") + (string-append "-DSPIRV_TOOLS_INCLUDE_DIR=" + #$(this-package-input + "spirv-tools") "/include") + (string-append "-DDIRECTX_HEADER_INCLUDE_DIR=" + #$directx-headers-for-dxc + "/include")) + #:phases #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install-distribution" + make-flags)))))) + (inputs (list libxml2 spirv-headers spirv-tools)) + (native-inputs (list git python)) + (home-page "https://github.com/microsoft/DirectXShaderCompiler") + (synopsis + "Compiler and related tools used to compile High-Level Shader Language (HLSL)") + (description + "The DirectX Shader Compiler project includes a compiler and related +tools used to compile High-Level Shader Language (HLSL) programs into DirectX +Intermediate Language (DXIL) representation. Applications that make use of +DirectX for graphics, games, and computation can use it to generate shader +programs.") + (license license:ncsa))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 21 05:08:03 2024 Received: (at control) by debbugs.gnu.org; 21 Mar 2024 09:08:03 +0000 Received: from localhost ([127.0.0.1]:34339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnEP4-0004JI-S7 for submit@debbugs.gnu.org; Thu, 21 Mar 2024 05:08:03 -0400 Received: from wfout5-smtp.messagingengine.com ([64.147.123.148]:32983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnEP1-0004In-RV for control@debbugs.gnu.org; Thu, 21 Mar 2024 05:08:01 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.west.internal (Postfix) with ESMTP id D22951C000AA for ; Thu, 21 Mar 2024 05:07:13 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 21 Mar 2024 05:07:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1711012033; x=1711098433; bh=WucOwllx7L 51jZeMiIhXh03sCrAbWEVPI9Nny9Bw36o=; b=k06orS+XhjVy/6bTNzD5NIvd+r 3LXn3iTGpigq5yuWpFBIbXf6li8Atp4bTwbfhb9JfXCHw4E4Y3oPykDNGhejcNWg sggOQ6lIGiySqvPbWmPyF4j5nSAAG1k0N37CQJ0wJtzwEe46Y/XVnm3qIYTjA4LS YBgupb616Cei4t9U9TdV2UallPkLzmTL6FcwGjZrmevzKQV3ZzDkD3dAneaEp9yZ 6lYELe/L08XwKCLLqYz3mCvZaCZcTUQII3XNQ0IL2WJz8LLA83Jsw4MUuNMOvOeh uhEOBXXl59KY5OR9PCmA5aEd9CKCA4bgPlRBHV/bEj6ClnvJbjlThHGdFpPg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1711012033; x=1711098433; bh=WucOwllx7L51jZeMiIhXh03sCrAb WEVPI9Nny9Bw36o=; b=Za2TEIfAkzP/G5EzGhrz/BCmJq61abF5k7/Jy7Lktnhw 4vhiAkDbRPVGdM+sp+6kxnnvtK3g6r2BRn6bZLQCXISHW09KB/ZvYCvOCdnEvyqu h7BRjnz6K/4sNpFG1biQUKPa9OY1nk8LftdahIUMU1pH/8CbdF8ruda5P/s8qb4v cpQuprHZj4J04Fc0ufaZFULaAcbGiTPQnDG7Wcl8PpCbt4vypO0uITLnm8VANVjK wepOsd3E3xpbvNsQAXZ/ZDGQ/JdpqpINmUPQj/FbgJ3aWVyCX7Tjumcc/SCLBEw9 ceIGzGeriQGXQgGRBxbf8Q/azi1d9Tm2/ouh6Le7og== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrleehgdduvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefkffggfgfvhffutgfgsehtjeertd dtvdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepgedugeelvddvjeejvedvieefudeiueehfeffueeiheelffejhefgleekgfekje ejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihes uggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 21 Mar 2024 05:07:12 -0400 (EDT) Message-ID: <788e0f88-5c2c-4a38-a07e-9ba4376f6f66@dan.games> Date: Thu, 21 Mar 2024 17:07:09 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: control@debbugs.gnu.org From: dan Subject: tags 69461 patch Autocrypt: addr=i@dan.games; keydata= xsFNBF6egswBEAC54f2W1T5kjfvNPDrva/0A/GgQswLx3qaznObfUlFeiXByQpsKoUqyTLo+ Y+DVpUKB68ghrvBjjFXBr6j3dJKWe4fpN9mkcENm4z4oQ1fVektOlSxZHtdrYzx63XjopiDX CXe1EvRxQ1LloxZVWnzwvPFGOI+89LOPhXTuRfpUvaYfWol+owN2TBmW8m4UIyFIhlLJKSU7 X7vMH/ZJ/tUReQlesRU6x2BZZu3oZLe6MceHwoXVBQGUsGQ/uMxtT0mOmMtOPw+zqyrl1EPF 2QUkmTLbpOymQmXbJM/nRqPoKP8gPbLwPH3DrSFXJCqDLp16DJfSCjL7AmjKs1OX3tD1H1A+ go5JkbrpIsMBsFG6k8PdW9JzxIN2ao9133ssiHIQ2xg51XuKL8cskH7xauainyq32JQ5bzbd acby3yi5oz+NMXvc/7mNADT/wJ8aNU+TOMM0uWjqNo7SMlpCzj42sEYGBA+g1qrFn9cfOfwd nReOIZ4WdYLwmnPHoxK5gDrXYePoiMlOcOtL/3I5NgUQnSL3eLFzl79GIJEE7ydrkiFcVyYj x2QFJYwjjaoUQR3zvZOajoTYxczU26U9ihig/gzAnOddkUZJdMNbxXg7F0vQgD5yV/O08MKk a3K6D9BwoCSsWRvikSRvRpdxqN94Q7Q4Uvx9C1J6AD+lAjqDmQARAQABzRhaaGl4aWFuIEhl IDxpQGRhbi5nYW1lcz7CwY4EEwEIADgWIQQ3EyCYiE4NDnYmBs6xfnz63tjYHgUCYnM7nwIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCxfnz63tjYHhHbD/wMAUFkpZF26bPJurpS G+ecdv4yXTG3114wWH9I7cz1eI5FGzv4Fmo0CAxYIWzpPWSq7rwzuUhq8sps32J+f+MhkAo4 /YjPh+XVGmo1a8bn4jlH/Mis0H8Cn4/VEmqY4ifSHMveHhGv28FWh/MBnhtkM2nU02wz4jfj Xi6W6d2Ek6tnDtiA12d1ea+B83VHsQy3uDC0tOIrLLNHUqes5B/FoRpO2Q11RBeS8EINr0Km UqgjLuy2JWZSlJnNQ7EDJP38IXnsWRjlySXVU1DCTwsmrMimRjtv58W4pAG3IqTpy5aNythq c9iwiGnbjU2+AGWFvDZEnABXo2KS8iH6YT29gfgKawHi3qyeiOI7KqL+14Mv3ojWdU8vMfln zBnQH0Xag1xahKEwSJXtxQ6wdqDgyC9h3SIyX8anKtDbzXy7+pm61xq6YQcDsaqHIMlDFoq5 C5EQaANJuLzyASHGtMAkSHi5PCrTkSUuOXJ0B8YXI5sVDBoX0uGl1A/tBPvGPJf15dWiK+LF x/0AfZFL2RuMMJZhNlwVnuP6pLaFr94X33j8t6z9lTSI1HLq7+Xogg74jGf/UKZtdKngmPtW Bvf68a6zKEMQdicSie7LFLrkR+LcyPJGUMUEsjPGraD9dxlqVAAhyPag9Dher/6x01eo/XU1 CHK2Klm4/3UQ3D4Ohs7BTQRenoLMARAAnEbwDpFtrIwl+C+pyzgW1SycdyZ5B9HAxdrwVFha cZ9RDb/+rtjuC9n8ofNmDcRFhfmm7FRElzVN7DdVJxXUYyvd156fLXQqezzJOKDjPNdihQGn f+mLJtrfKAqVLPPXBJEP6mKiXwAVTa4yfz/jSZn6Y/Q2w4TSEvYo/jt0UtTx/6hoATu8QaJ/ Svc0172wLszeBl5VTxkJSXqg6EQyULyC3ZYxcKG6WzOnbsTiJVG7BcjokfCUWx+KJfn7WGA9 25Pvo393RaoOsXnu/E6NH1uYaF/SY53zMdmUXeUx4OKXuY1CjSVw4j56VlmZL2Z+BqArdmnX byCNDuKdjPPH03dOL33NYNIz1QeE9Eaxr+xr11AtQtKQtTo2o4lpl0kXXs3rdZBZ0Tf9/gvH QB7SVvQJFuW6M17ON5ritsI3yZdkEepbNRGeQv9eaGjXSv7CZKGJTSNNQw6XZSsd0xrWJQTl 3i3jFsdeHn3D3pMqN2/7A0sJJCUZbkm2BiaLB9cXfl7vVqt90UwFZn7P7LEo69PO9uRPhJEa VP4/vppxKkL6bj6UZvww8nJ16/eaMEiCo6eqvwD93exqAYAF/yaVu7RFF61W0HUh+Rr6d6Ss aIeZNrYxC8E+IgljHr1dhXF3ot9XL7c1rqZBQ4FOLAduP9DkPZq9kA+II/MQZVs4cusAEQEA AcLBfAQYAQgAJgIbDBYhBDcTIJiITg0OdiYGzrF+fPre2NgeBQJkqiDWBQkH7NGKAAoJELF+ fPre2NgeYEUP/2NAHDQG5rELc1TiZ9s5D57c1z3re346F77ulkyQoaQoOc/8be4RejP/+Y+e 9tTHuIoiLhdns9CzrDsTrgy7pb8u4Qq0AFA2rLb3FhjMDXWIoFR2WWAk5vvqa4qaVtCK4zGH hrxlAjhVmSbecg/BI6zDAyprvgQ4ivBYskZdrqfQ/K+M+wFguptyUqhsrdYmyMwT7Zu74z6E wvAPVW822S7qyQvaI/bFR7kccn/k/aHal+f4ZnoWEolqmunrOocERSyfLX+5HxVmCBmeQjJe S88AJmmqCLaJ8a/ImGCqNOD400U6AVCpYzjfKDPB75JJYzxmoqHFjh3YxT4ohPfrBX5jdsm+ wDr+5Juj9RXmeQlAq2uXBfF9cAj9fYMLSYbeMmhvXPm2Q0ONQSs/LU1ZMIevffQrLZmP4MnZ 7kwCQHQihtlTO2v9fMyjp/mxeKurM92wDS+RjEQQIyhiwjDD5CZfoGUlNMgVQo+0uj1GElHg TDODnQ4UcLnnACfjrCfuG7C72C2CYYLFEE7FjUyLbg/ifWY2tMZkMWQAm2l976piLISXeRwl 2Ls084DrAme8qNMtjGn3uyTv54VFzVd65u5/AmqN0Oh3G3E3U4/m0WrR7zOs5DmD2Qh0EdzD eVng84JMl3Cq0F2Uf1DhNjrOa08/ll0WBs0xWWCwwQVbsD/u Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) tags 69461 patch quit From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 21 05:13:37 2024 Received: (at control) by debbugs.gnu.org; 21 Mar 2024 09:13:37 +0000 Received: from localhost ([127.0.0.1]:34376 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnEUT-0004Sk-IW for submit@debbugs.gnu.org; Thu, 21 Mar 2024 05:13:37 -0400 Received: from wfhigh5-smtp.messagingengine.com ([64.147.123.156]:47611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnEUR-0004SW-Pg for control@debbugs.gnu.org; Thu, 21 Mar 2024 05:13:36 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id A1EC01800102 for ; Thu, 21 Mar 2024 05:12:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 21 Mar 2024 05:12:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1711012369; x=1711098769; bh=O5bVXdw7GC ySjChs9VVX0SnEcYZEw1z4vo3kjfCYlrg=; b=h/0OtWmhoODHgrCTfDbIgwhNDm BKKmh36pYdvJRq7l8M6IqBVgakEHxtNvTpqlXyMfmwWBAWlNSkkZVHzf/9hXUkWu Xxn009ZkS0w6McfqNBpmI05R3BPzJNPYwOzvbhN41eKRy9/PCXiRncqK2xGz/Mo2 P9xtUAVm6l+M5pDNs4RNJ4EgAqxqXLRdLVM84Lwwhqh7w2XAffCSJcH7vtbkfBeL y02gjsCmoEA7Tb+SUFmHqPFjn8OnriigxrYAM5h0NBiubvgSzdrfVTLf4a1zgKgV dQ4AATSEbNTK1RCsT2R46iYtZQnYzNVE4KAmRLRGgpOfjpaok/HzeCLOPBlg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1711012369; x=1711098769; bh=O5bVXdw7GCySjChs9VVX0SnEcYZE w1z4vo3kjfCYlrg=; b=t+AhC8CtvQgbm1DtymcP8yTNmWS7cD7HF75Dpfmzehay Y6oEn+AV+mz+s07wGcvY6VF5MBp7kxtwZ2+SD8YkS4eGgBdbSH4Of28W9+lvSAtH 7e6kXubwbtHEZ2m+3iotH2MlBeuKey7Re2fT1geYOUkf+/QA0ycsCHyR6ChY7HaL 1+cILKuod6dx3dMXDs2L+Qc5GkHxoQzsGVf+zYaPdT/or+5fQdydNwrpI0BqaRi3 9dbOWMpseo46DXB5NM2lwIDrfen1yir9FyZryeBrgHSs582GOvshcTgV9oAEG/qL HVwWczxrC0DNyZuWwada1qdR7KMdCfuFogWR52P5Uw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrleeigddtudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepkfffgggfvffhufgtgfesthejredttd dvjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeegudegledvvdejjeevvdeifeduieeuheefffeuieehleffjeehgfelkefgkeejje enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegu rghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 21 Mar 2024 05:12:48 -0400 (EDT) Message-ID: <4c871599-e730-4dcb-a73a-e675ecb5976e@dan.games> Date: Thu, 21 Mar 2024 17:12:46 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: control@debbugs.gnu.org From: dan Subject: retitle 69461 Autocrypt: addr=i@dan.games; keydata= xsFNBF6egswBEAC54f2W1T5kjfvNPDrva/0A/GgQswLx3qaznObfUlFeiXByQpsKoUqyTLo+ Y+DVpUKB68ghrvBjjFXBr6j3dJKWe4fpN9mkcENm4z4oQ1fVektOlSxZHtdrYzx63XjopiDX CXe1EvRxQ1LloxZVWnzwvPFGOI+89LOPhXTuRfpUvaYfWol+owN2TBmW8m4UIyFIhlLJKSU7 X7vMH/ZJ/tUReQlesRU6x2BZZu3oZLe6MceHwoXVBQGUsGQ/uMxtT0mOmMtOPw+zqyrl1EPF 2QUkmTLbpOymQmXbJM/nRqPoKP8gPbLwPH3DrSFXJCqDLp16DJfSCjL7AmjKs1OX3tD1H1A+ go5JkbrpIsMBsFG6k8PdW9JzxIN2ao9133ssiHIQ2xg51XuKL8cskH7xauainyq32JQ5bzbd acby3yi5oz+NMXvc/7mNADT/wJ8aNU+TOMM0uWjqNo7SMlpCzj42sEYGBA+g1qrFn9cfOfwd nReOIZ4WdYLwmnPHoxK5gDrXYePoiMlOcOtL/3I5NgUQnSL3eLFzl79GIJEE7ydrkiFcVyYj x2QFJYwjjaoUQR3zvZOajoTYxczU26U9ihig/gzAnOddkUZJdMNbxXg7F0vQgD5yV/O08MKk a3K6D9BwoCSsWRvikSRvRpdxqN94Q7Q4Uvx9C1J6AD+lAjqDmQARAQABzRhaaGl4aWFuIEhl IDxpQGRhbi5nYW1lcz7CwY4EEwEIADgWIQQ3EyCYiE4NDnYmBs6xfnz63tjYHgUCYnM7nwIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCxfnz63tjYHhHbD/wMAUFkpZF26bPJurpS G+ecdv4yXTG3114wWH9I7cz1eI5FGzv4Fmo0CAxYIWzpPWSq7rwzuUhq8sps32J+f+MhkAo4 /YjPh+XVGmo1a8bn4jlH/Mis0H8Cn4/VEmqY4ifSHMveHhGv28FWh/MBnhtkM2nU02wz4jfj Xi6W6d2Ek6tnDtiA12d1ea+B83VHsQy3uDC0tOIrLLNHUqes5B/FoRpO2Q11RBeS8EINr0Km UqgjLuy2JWZSlJnNQ7EDJP38IXnsWRjlySXVU1DCTwsmrMimRjtv58W4pAG3IqTpy5aNythq c9iwiGnbjU2+AGWFvDZEnABXo2KS8iH6YT29gfgKawHi3qyeiOI7KqL+14Mv3ojWdU8vMfln zBnQH0Xag1xahKEwSJXtxQ6wdqDgyC9h3SIyX8anKtDbzXy7+pm61xq6YQcDsaqHIMlDFoq5 C5EQaANJuLzyASHGtMAkSHi5PCrTkSUuOXJ0B8YXI5sVDBoX0uGl1A/tBPvGPJf15dWiK+LF x/0AfZFL2RuMMJZhNlwVnuP6pLaFr94X33j8t6z9lTSI1HLq7+Xogg74jGf/UKZtdKngmPtW Bvf68a6zKEMQdicSie7LFLrkR+LcyPJGUMUEsjPGraD9dxlqVAAhyPag9Dher/6x01eo/XU1 CHK2Klm4/3UQ3D4Ohs7BTQRenoLMARAAnEbwDpFtrIwl+C+pyzgW1SycdyZ5B9HAxdrwVFha cZ9RDb/+rtjuC9n8ofNmDcRFhfmm7FRElzVN7DdVJxXUYyvd156fLXQqezzJOKDjPNdihQGn f+mLJtrfKAqVLPPXBJEP6mKiXwAVTa4yfz/jSZn6Y/Q2w4TSEvYo/jt0UtTx/6hoATu8QaJ/ Svc0172wLszeBl5VTxkJSXqg6EQyULyC3ZYxcKG6WzOnbsTiJVG7BcjokfCUWx+KJfn7WGA9 25Pvo393RaoOsXnu/E6NH1uYaF/SY53zMdmUXeUx4OKXuY1CjSVw4j56VlmZL2Z+BqArdmnX byCNDuKdjPPH03dOL33NYNIz1QeE9Eaxr+xr11AtQtKQtTo2o4lpl0kXXs3rdZBZ0Tf9/gvH QB7SVvQJFuW6M17ON5ritsI3yZdkEepbNRGeQv9eaGjXSv7CZKGJTSNNQw6XZSsd0xrWJQTl 3i3jFsdeHn3D3pMqN2/7A0sJJCUZbkm2BiaLB9cXfl7vVqt90UwFZn7P7LEo69PO9uRPhJEa VP4/vppxKkL6bj6UZvww8nJ16/eaMEiCo6eqvwD93exqAYAF/yaVu7RFF61W0HUh+Rr6d6Ss aIeZNrYxC8E+IgljHr1dhXF3ot9XL7c1rqZBQ4FOLAduP9DkPZq9kA+II/MQZVs4cusAEQEA AcLBfAQYAQgAJgIbDBYhBDcTIJiITg0OdiYGzrF+fPre2NgeBQJkqiDWBQkH7NGKAAoJELF+ fPre2NgeYEUP/2NAHDQG5rELc1TiZ9s5D57c1z3re346F77ulkyQoaQoOc/8be4RejP/+Y+e 9tTHuIoiLhdns9CzrDsTrgy7pb8u4Qq0AFA2rLb3FhjMDXWIoFR2WWAk5vvqa4qaVtCK4zGH hrxlAjhVmSbecg/BI6zDAyprvgQ4ivBYskZdrqfQ/K+M+wFguptyUqhsrdYmyMwT7Zu74z6E wvAPVW822S7qyQvaI/bFR7kccn/k/aHal+f4ZnoWEolqmunrOocERSyfLX+5HxVmCBmeQjJe S88AJmmqCLaJ8a/ImGCqNOD400U6AVCpYzjfKDPB75JJYzxmoqHFjh3YxT4ohPfrBX5jdsm+ wDr+5Juj9RXmeQlAq2uXBfF9cAj9fYMLSYbeMmhvXPm2Q0ONQSs/LU1ZMIevffQrLZmP4MnZ 7kwCQHQihtlTO2v9fMyjp/mxeKurM92wDS+RjEQQIyhiwjDD5CZfoGUlNMgVQo+0uj1GElHg TDODnQ4UcLnnACfjrCfuG7C72C2CYYLFEE7FjUyLbg/ifWY2tMZkMWQAm2l976piLISXeRwl 2Ls084DrAme8qNMtjGn3uyTv54VFzVd65u5/AmqN0Oh3G3E3U4/m0WrR7zOs5DmD2Qh0EdzD eVng84JMl3Cq0F2Uf1DhNjrOa08/ll0WBs0xWWCwwQVbsD/u Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) retitle 69461 [PATCH mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler. quit From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 21 05:15:55 2024 Received: (at control) by debbugs.gnu.org; 21 Mar 2024 09:15:55 +0000 Received: from localhost ([127.0.0.1]:34395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnEWh-0006qD-1j for submit@debbugs.gnu.org; Thu, 21 Mar 2024 05:15:55 -0400 Received: from wfhigh5-smtp.messagingengine.com ([64.147.123.156]:46359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnEWe-0006bD-Hw for control@debbugs.gnu.org; Thu, 21 Mar 2024 05:15:53 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.west.internal (Postfix) with ESMTP id C7EEF18000A0 for ; Thu, 21 Mar 2024 05:15:06 -0400 (EDT) Received: from imap51 ([10.202.2.101]) by compute4.internal (MEProxy); Thu, 21 Mar 2024 05:15:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s=fm3; t=1711012506; x=1711098906; bh=xmCZbHQNXWkeXqHn/UIBAFu1SpEzeDw4 bDJwbqrTM0M=; b=ufZJH0dJdBR6Sqye+TyBFOt+ymPZgk8Y/DL8WVWk2sXkUXvB qklJCmKZLO8xztZVSEzvf64+7w8rYb0UE0ym1I5t+A2m/lojFIZXVRbw+4WamzIk eZ5xSoYuKSR62iLHc0V+1ePoo5I7xksM7zA1eY2tTL0kaTrS9llhfme/7UR+60gE LJxbCwp69EKVvE75P7ipxbDKfKodwjwbX3StSm0V0cdDc348ynXxdoDh1Odsnavw FU3nXcR0zpQooxM4oLJ3aiqcuWu7QSJzxam/MVXceaMiEDoTuMCdaTa0kFQ2llap 3sGIfA0vtedQmkhNgt1jNtd9YWazfRV5yH0PsA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1711012506; x=1711098906; bh=xmCZbHQNXWkeXqHn/UIBAFu1SpEzeDw4bDJ wbqrTM0M=; b=kxO2ZAwXrCzxbSp1fNGlMDPRLvPXYtElPvnf2PlCuRI5d1dDeGt qF3qTOExw9ke4biLAI2kMroOofFBbWS7a17c2kf6C2QRdx4FfTqlHA3T4VVCNfvK KNcGNnHoA38y2rLfY1dYi7ffGYZFIYIBp3B1TptkxWPh5ZxEdU9pawKvi9BRycQd b5oOwkwLIWAr8DfDaLa8NxT3johDguQsa1CTLFMHUq0Jg6zY5XH80IjcGGdfqDiH thkvtSzDjIo1d9yOGE+u5bE9QQsclCNznGJvih+bIO+dGThLy8iTx8zrVPX5LJIj gp6OmKtLNc91dx6psWTueFuC3Yv/xJw0eFw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrleeigddtvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkfffhvffutgesthdtredtre ertdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeeftdffieejheelgeeuleejveduveeftdduiedtieegheefudelgfeihfeiieehhf enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegu rghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 03E43B6008D; Thu, 21 Mar 2024 05:15:05 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-332-gdeb4194079-fm-20240319.002-gdeb41940 MIME-Version: 1.0 Message-Id: Date: Thu, 21 Mar 2024 17:14:44 +0800 From: dan To: control@debbugs.gnu.org Subject: retitle 69461 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) retitle 69461 [PATCH mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler. quit From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 24 21:16:42 2024 Received: (at 69461) by debbugs.gnu.org; 25 Mar 2024 01:16:42 +0000 Received: from localhost ([127.0.0.1]:47640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roYx7-00052g-UT for submit@debbugs.gnu.org; Sun, 24 Mar 2024 21:16:42 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:28291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roYx3-00052M-Rb for 69461@debbugs.gnu.org; Sun, 24 Mar 2024 21:16:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1711329349; x=1711588549; bh=479Ljh3dyhwM6psoA/Y/PQ21Bl9N2N2blEWm1JD1HAw=; 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=RZ7FYSPrpaoW+NK5D1Vt+v+rzHlBERa9CXbJd35G5Y70k85sCOuUwzyTR0Xi6C80j Rh2s37sjiBciZ9/gp07hpuxt4IFg4PDy1EXNR0jPkl3OFTsMaT0JXdaf2kXsyJ2ZHn wwyWoqAEXwlCLhXIsa60xyIfgfCI1bTLmqMonuBN2g8vl37+j7qWUmfslSjulTuYOc d7JyzPucbBUWEwU5/77zJWo4BGPKS44ysGQx1wrUfpOxvGl7cHoXycjUZMIPnoYcm4 pmKyFuytAW9OlUQsbIz8jCi6uUMEXf2OXSdyVmxDns4iRgWBusgcihpzxk8irVj0hS TSLtoW2eZgrcA== Date: Mon, 25 Mar 2024 01:15:42 +0000 To: Liliana Marie Prikler , dan From: John Kehayias Subject: Re: Should commits rather be buildable or small Message-ID: <87y1a7nmbx.fsf@protonmail.com> In-Reply-To: References: <875y16c54b.fsf@elephly.net> <87fs09ar56.fsf@elephly.net> <87jzmhad9s.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69461 Cc: Philip McGrath , Saku Laesvuori , 69461@debbugs.gnu.org, Ricardo Wurmus , guix-devel@gnu.org, Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Apologies for the delay. I would like to get things rolling on mesa-updates and building, including the vulkan updates, so a choice will have to be made :) Thanks for the input so far! On Tue, Mar 05, 2024 at 06:19 AM, Liliana Marie Prikler wrote: > Hi, > > Am Montag, dem 04.03.2024 um 21:38 +0000 schrieb John Kehayias: >> [...] >> 1. Essentially squash to one commit where all of vulkan is updated in >> one commit. The main upside is that nothing should break (within >> vulkan, dependents to be fixed as needed) and it shows as "one" >> change; the main downside is that the proposed changes are not just >> trivial version bumps. Harder to then disentangle as needed. >> >> 2. Make each commit updating a package, but don't use the variable >> %vulkan-sdk-version, updating each package with a version as it is >> done. Then do a commit where all the versions are replaced by the >> variable. This seems like unnecessary work to me and while it stops >> the obvious breaking (source hashes don't match once variable is >> updated but package hasn't yet) versions are still mixed which is >> likely a problem. >> >> 3. Go with the series as proposed: this means after the first commit >> for sure all other vulkan packages and dependents don't build, as the >> source hashes won't match until the commit that updates that package. >> Along with version mixing, this perhaps doesn't give you a helpful >> git bisect either? >> >> None are perfect. What do people think? > I think 1 would be workable if the changes to the packages are minimal. > You should also check whether you can just do the version bumps and > then the other changes =E2=80=93 or flip the order. > As currently proposed, the changes are not minimal. dan: Do you know if just a version/hash bump is at least buildable? Or are the changes necessary for the packages to build/function at all? Or I guess if the non-version changes are applicable to the current version first? > I don't really see the benefit with 2. Normally, we'd have "-next" > variants to catch nontrivial updates (among other things), but those > don't seem a good approach here. > > If nothing else works, 3 is indeed an option to fall back to, albeit > begrudgingly. As noted for 1, you could check whether bumping all the > hashes and then only fixing whatever else for the builds is an option > here. > That's what I'll have to do I think, unless indeed the versions changes can be made separately and still build. I can mark each patch in the commit log that it is part of a series updating all the vulkan packages. That might be something worth doing in general for cases like this, to help out future time travelers and when e.g. searching the log and finding a commit. > Alternative 4 would be to build those -next variants and then replace > the base vulkan all at once. This has the advantage of not doing any > version mixing in-between IIUC. > That's also an idea. Add a %vulkan-version-next or something like that, and -next variants of all the packages using that version instead. A bit clumsy and perhaps convoluted with the extra work for maybe minimal gain. I'll wait to see if dan has any information of what changes can be made independently, but I guess I'll just have to make a decision on mesa-updates. Thanks! John From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 24 23:24:57 2024 Received: (at 69461) by debbugs.gnu.org; 25 Mar 2024 03:24:57 +0000 Received: from localhost ([127.0.0.1]:47690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roaxE-0000FJ-Pq for submit@debbugs.gnu.org; Sun, 24 Mar 2024 23:24:57 -0400 Received: from wfhigh5-smtp.messagingengine.com ([64.147.123.156]:35565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roax9-0000F0-QA for 69461@debbugs.gnu.org; Sun, 24 Mar 2024 23:24:55 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.west.internal (Postfix) with ESMTP id 2D2D0180007B; Sun, 24 Mar 2024 23:24:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 24 Mar 2024 23:24:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1711337041; x=1711423441; bh=Jk7hQ8oATFSCCTgmkivHV4FNDUO+u6v8xRgQYgnlxiM=; b= i0Myx2zJCxB+SexsZy4RLCSFP3v8ClxbOqEpQci16bki8wI9ikFPDGyraknNmzHn buUtFmG6BKGTnz9Frvy4To3AgDaDwAhZeoeE5RkepIZsrQfX02/Hj7N5OVL/GCGc Ad3jBbHX5OobMxj/lUzB5yUx3EnUKqYYSs4OzqqclGiygQ2gFzRT2RjrmJyXX8d3 a8t1HJXGXil6ohYYMzJw54SjIExTCtTn2LXYagfPjCfmoc/uDeiTQs7/gdfSWkqp 6WZbJQ65kZq+qQ5Rkvgb7fHfXQ1T3YnKyUg1ltI36DWBmYk1PrO2iyIM5bYyplzE hWDhSUEzr9krH0ArBAmZ1A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711337041; x= 1711423441; bh=Jk7hQ8oATFSCCTgmkivHV4FNDUO+u6v8xRgQYgnlxiM=; b=V Ue8SqoX7uLu4Acn47r6t9t7nD/PVbZlG2E3ahP5N56RjpvTanLtmX1YIlAWSCPOJ T5UaepO9AIkuNBFdZKf/dPNAkFrhExakhWJckl3pmkWLJ36odyUPr3Bbj0Q7Rj5c 5eHCgMsgQuMpGrgDId7NIF+6Q/guGnOUU+BHuoqkDP65AFVf+K6eD8VSF5szEfn0 miDwvCRw5y81MdzQ1AAnTdZJgQD0ilR3s3dhXMXVqU0dyfkQ6YBPqGN6Rb6bhSDp QibUOnyZPun7GN5+UZS3X5cXkRkxfsTpkuE7wYWvcJcljY5i8K/Il2lYkJpg8KD/ s5deTYPjGSPkPAA+qjvqA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddtkedgheelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpegurghn uceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghrnhepkeevudduhefhtdfgff ffheehgfevgfejgeevteevfeehhfeltdfhfeehvedtiedvnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 24 Mar 2024 23:23:58 -0400 (EDT) Message-ID: Date: Mon, 25 Mar 2024 11:23:55 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Should commits rather be buildable or small To: John Kehayias , Liliana Marie Prikler References: <875y16c54b.fsf@elephly.net> <87fs09ar56.fsf@elephly.net> <87jzmhad9s.fsf@protonmail.com> <87y1a7nmbx.fsf@protonmail.com> Content-Language: en-US From: dan Autocrypt: addr=i@dan.games; keydata= xsFNBF6egswBEAC54f2W1T5kjfvNPDrva/0A/GgQswLx3qaznObfUlFeiXByQpsKoUqyTLo+ Y+DVpUKB68ghrvBjjFXBr6j3dJKWe4fpN9mkcENm4z4oQ1fVektOlSxZHtdrYzx63XjopiDX CXe1EvRxQ1LloxZVWnzwvPFGOI+89LOPhXTuRfpUvaYfWol+owN2TBmW8m4UIyFIhlLJKSU7 X7vMH/ZJ/tUReQlesRU6x2BZZu3oZLe6MceHwoXVBQGUsGQ/uMxtT0mOmMtOPw+zqyrl1EPF 2QUkmTLbpOymQmXbJM/nRqPoKP8gPbLwPH3DrSFXJCqDLp16DJfSCjL7AmjKs1OX3tD1H1A+ go5JkbrpIsMBsFG6k8PdW9JzxIN2ao9133ssiHIQ2xg51XuKL8cskH7xauainyq32JQ5bzbd acby3yi5oz+NMXvc/7mNADT/wJ8aNU+TOMM0uWjqNo7SMlpCzj42sEYGBA+g1qrFn9cfOfwd nReOIZ4WdYLwmnPHoxK5gDrXYePoiMlOcOtL/3I5NgUQnSL3eLFzl79GIJEE7ydrkiFcVyYj x2QFJYwjjaoUQR3zvZOajoTYxczU26U9ihig/gzAnOddkUZJdMNbxXg7F0vQgD5yV/O08MKk a3K6D9BwoCSsWRvikSRvRpdxqN94Q7Q4Uvx9C1J6AD+lAjqDmQARAQABzRhaaGl4aWFuIEhl IDxpQGRhbi5nYW1lcz7CwY4EEwEIADgWIQQ3EyCYiE4NDnYmBs6xfnz63tjYHgUCYnM7nwIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCxfnz63tjYHhHbD/wMAUFkpZF26bPJurpS G+ecdv4yXTG3114wWH9I7cz1eI5FGzv4Fmo0CAxYIWzpPWSq7rwzuUhq8sps32J+f+MhkAo4 /YjPh+XVGmo1a8bn4jlH/Mis0H8Cn4/VEmqY4ifSHMveHhGv28FWh/MBnhtkM2nU02wz4jfj Xi6W6d2Ek6tnDtiA12d1ea+B83VHsQy3uDC0tOIrLLNHUqes5B/FoRpO2Q11RBeS8EINr0Km UqgjLuy2JWZSlJnNQ7EDJP38IXnsWRjlySXVU1DCTwsmrMimRjtv58W4pAG3IqTpy5aNythq c9iwiGnbjU2+AGWFvDZEnABXo2KS8iH6YT29gfgKawHi3qyeiOI7KqL+14Mv3ojWdU8vMfln zBnQH0Xag1xahKEwSJXtxQ6wdqDgyC9h3SIyX8anKtDbzXy7+pm61xq6YQcDsaqHIMlDFoq5 C5EQaANJuLzyASHGtMAkSHi5PCrTkSUuOXJ0B8YXI5sVDBoX0uGl1A/tBPvGPJf15dWiK+LF x/0AfZFL2RuMMJZhNlwVnuP6pLaFr94X33j8t6z9lTSI1HLq7+Xogg74jGf/UKZtdKngmPtW Bvf68a6zKEMQdicSie7LFLrkR+LcyPJGUMUEsjPGraD9dxlqVAAhyPag9Dher/6x01eo/XU1 CHK2Klm4/3UQ3D4Ohs7BTQRenoLMARAAnEbwDpFtrIwl+C+pyzgW1SycdyZ5B9HAxdrwVFha cZ9RDb/+rtjuC9n8ofNmDcRFhfmm7FRElzVN7DdVJxXUYyvd156fLXQqezzJOKDjPNdihQGn f+mLJtrfKAqVLPPXBJEP6mKiXwAVTa4yfz/jSZn6Y/Q2w4TSEvYo/jt0UtTx/6hoATu8QaJ/ Svc0172wLszeBl5VTxkJSXqg6EQyULyC3ZYxcKG6WzOnbsTiJVG7BcjokfCUWx+KJfn7WGA9 25Pvo393RaoOsXnu/E6NH1uYaF/SY53zMdmUXeUx4OKXuY1CjSVw4j56VlmZL2Z+BqArdmnX byCNDuKdjPPH03dOL33NYNIz1QeE9Eaxr+xr11AtQtKQtTo2o4lpl0kXXs3rdZBZ0Tf9/gvH QB7SVvQJFuW6M17ON5ritsI3yZdkEepbNRGeQv9eaGjXSv7CZKGJTSNNQw6XZSsd0xrWJQTl 3i3jFsdeHn3D3pMqN2/7A0sJJCUZbkm2BiaLB9cXfl7vVqt90UwFZn7P7LEo69PO9uRPhJEa VP4/vppxKkL6bj6UZvww8nJ16/eaMEiCo6eqvwD93exqAYAF/yaVu7RFF61W0HUh+Rr6d6Ss aIeZNrYxC8E+IgljHr1dhXF3ot9XL7c1rqZBQ4FOLAduP9DkPZq9kA+II/MQZVs4cusAEQEA AcLBfAQYAQgAJgIbDBYhBDcTIJiITg0OdiYGzrF+fPre2NgeBQJkqiDWBQkH7NGKAAoJELF+ fPre2NgeYEUP/2NAHDQG5rELc1TiZ9s5D57c1z3re346F77ulkyQoaQoOc/8be4RejP/+Y+e 9tTHuIoiLhdns9CzrDsTrgy7pb8u4Qq0AFA2rLb3FhjMDXWIoFR2WWAk5vvqa4qaVtCK4zGH hrxlAjhVmSbecg/BI6zDAyprvgQ4ivBYskZdrqfQ/K+M+wFguptyUqhsrdYmyMwT7Zu74z6E wvAPVW822S7qyQvaI/bFR7kccn/k/aHal+f4ZnoWEolqmunrOocERSyfLX+5HxVmCBmeQjJe S88AJmmqCLaJ8a/ImGCqNOD400U6AVCpYzjfKDPB75JJYzxmoqHFjh3YxT4ohPfrBX5jdsm+ wDr+5Juj9RXmeQlAq2uXBfF9cAj9fYMLSYbeMmhvXPm2Q0ONQSs/LU1ZMIevffQrLZmP4MnZ 7kwCQHQihtlTO2v9fMyjp/mxeKurM92wDS+RjEQQIyhiwjDD5CZfoGUlNMgVQo+0uj1GElHg TDODnQ4UcLnnACfjrCfuG7C72C2CYYLFEE7FjUyLbg/ifWY2tMZkMWQAm2l976piLISXeRwl 2Ls084DrAme8qNMtjGn3uyTv54VFzVd65u5/AmqN0Oh3G3E3U4/m0WrR7zOs5DmD2Qh0EdzD eVng84JMl3Cq0F2Uf1DhNjrOa08/ll0WBs0xWWCwwQVbsD/u In-Reply-To: <87y1a7nmbx.fsf@protonmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: Philip McGrath , Saku Laesvuori , 69461@debbugs.gnu.org, Ricardo Wurmus , guix-devel@gnu.org, Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi John, On 3/25/2024 9:15 AM, John Kehayias wrote: > dan: Do you know if just a version/hash bump is at least buildable? Or > are the changes necessary for the packages to build/function at all? > Or I guess if the non-version changes are applicable to the current > version first? I'll give it a try tomorrow. I think if packages are updated in certain sequence, it should be at least buildable. I'll give update or send a new patch series if I have any progress on this. -- dan From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:02 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:02 +0000 Received: from localhost ([127.0.0.1]:38672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgru-00018Z-9S for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:02 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:49591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgrq-00017h-Gb for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:55:56 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.west.internal (Postfix) with ESMTP id 3CE191C000C8; Wed, 27 Mar 2024 23:55:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 27 Mar 2024 23:55:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1711598146; x=1711684546; bh=ThrXckeSK5yKIqrr4ykM4 mK8eCD+VphbDJbDm0iH2Y8=; b=Bz4nIoWhrQJ4f6wBOXwsNFO5JYgUholDw/OZI Yf3CZ9EIapg8yq/X4AAFq1LRHeB/1VX22C6hQWFH7/Wia3w+Elp6pjVydv93UYmH 26Fy5trb7DwIvglur76pCjW379SyyB6bV6ID104h45bu0m1MpL2H8hVudQNbZBLy eFvqmF1RD3ycMT6swxQFVBqxj8xhTObPWt5apLluQtu1WU3fnMFYyM5C477lUKhA u5CmBmI1ONVpxFrYvRgBEB5+NKynfpuhqMPg3j4T8HeK+22tllI6ANiLSLPCDB13 FQ94leiyYF14/yr0IZVvuCVt/PrY0quuttyDC8MoM0Jod/NnA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1711598146; x=1711684546; bh=ThrXckeSK5yKIqrr4ykM4mK8eCD+ VphbDJbDm0iH2Y8=; b=dKu5RwBTU9ILoIocjA3DFhwZ24FJN6rhGaXzQ3KENw2z zoxK25FfIIZay8XDhMbpBLJuKkiCAWVnuLxwXZc0+v7+wP2/vZwIXUjDGkT+k0eO TUP3sWDK/FezJpHLTi7tL39kFG1Zvsz4Bt4YvGXV9XuG5oWDOZkfjyBX63JtR1jP u2GuNLC+7FdCJm71lK95NhvVPrdNByedWqVUWkMX0CWe/XC2tQKcr/nI/If/L/2U dsNMWsBaxGz54wCk6k9LhztaTxDee3Xlm0kcsAhI4G/6TM7jVWXQHJXwaHRMVuqj 5CvgOUCtKQOGVZT5p4IY+xItvzTCMbnYcqqFpoIxeQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepveffgfdvjeekhfekjedvledtuefgieevjeegheduffdtveegueejhfeufeegve evnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihes uggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:44 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 00/13] Update vulkan-sdk to 1.3.280.0 and add directx-shader-compiler. Date: Thu, 28 Mar 2024 11:54:42 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This updated patch series update vulkan packages to 1.3.280.0, which is released a few weeks ago. This patch series also drops the unified version number, and each vulkan-sdk package now use their own version number. What's more, the version number is reverted to the old numbering style, dropping the prefix from the version number. I tried to enable tests for vulkan-validationlayers, but it seems the test crashed. I kept the test-enabling code either way. dan (13): gnu: spirv-headers: Update to 1.3.280.0. gnu: spirv-tools: Update to 1.3.280.0. gnu: glslang: Update to 1.3.280.0. gnu: spirv-cross: Update to 1.3.280.0. gnu: shaderc: Update to 2024.0. gnu: vulkan-headers: Update to 1.3.280.0. gnu: vulkan-loader: Update to 1.3.280.0. gnu: volk: Update to 1.3.280.0. gnu: vulkan-tools: Update to 1.3.280.0. gnu: magic-enum: Update to 0.9.5. gnu: Add vulkan-utility-libraries. gnu: vulkan-validationlayers: Update to 1.3.280.0. gnu: Add directx-shader-compiler. gnu/local.mk | 1 - gnu/packages/cpp.scm | 5 +- .../patches/glslang-install-static-libs.patch | 61 ---- gnu/packages/vulkan.scm | 262 ++++++++++++------ 4 files changed, 181 insertions(+), 148 deletions(-) delete mode 100644 gnu/packages/patches/glslang-install-static-libs.patch base-commit: a223b1e52ba1db89b11a670915e8c9af3c3ac4af -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:06 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:07 +0000 Received: from localhost ([127.0.0.1]:38680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs2-0001A9-Ad for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:06 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:58419) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgrs-00017v-FL for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:03 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfhigh.west.internal (Postfix) with ESMTP id 2AD8618000C2; Wed, 27 Mar 2024 23:55:50 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 27 Mar 2024 23:55:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1711598149; x=1711684549; bh=wObrB6u1Vd9Pn42Bfg6x8eT0UuJZTDB332qyObHNcIs=; b= xgUrMVwqqIcAsZ9y9AkZqMAVie20DC8iuPGOmLqZL3Dnv3VD9LTrta/EOWJ+hOi5 pXQvxFqD79HXpTYKdwxga7H1bv74iJPNBKFx6HIAtZKZbNPqxbIHCQMX+JeLmrHc Lkw/MMNx3q08Zq13UPL3iJE6N3sz+RrCX7PXv1oQKq7Ntc323K5T7pW51NATP1FU n8yfNKUdKtB2dRfS478s4pZfxB00gvdAfUkziuFz+TLfAbgMRTi/s9d6PXap0Kzr uKLhzUIKXa9RehrjR35trtC2F3j7+tjnzQdVxT8iEz8Gy1JG6JvQyIYWLzv6UrMb FZmfgHOVbl0gg4gIDnPuTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598149; x= 1711684549; bh=wObrB6u1Vd9Pn42Bfg6x8eT0UuJZTDB332qyObHNcIs=; b=B JQN1MlTypat0HIL+gkhJn59PVxtlrGOidO2xUhpEa8uIc1xKmnihz2okwwUBmi++ EAgbbdRaw9Q6b/zzgi6EMWBgDn8quz+2itoBG0hrLuPSDboPcVgEHTOYtjZwRzRu 8fvcmKqc9W9zvOSiO29BllyCyAj3P32Ks5CyRt2uR083Qm+KG1Wt6un4C9j07sAw AnsF6ubLPURKfOJjVgt90fynTxe83NIEqB6ybp8GgS2eu69lyWH9uXZzFtNpNaD2 ZLMpfYRjElCC2Mn/ocv8HG3mtK4jQBcPrKCShBe2uF5NnrjY/G+l4NGCG9Cq3wTw 1AuPfSlT5GpEwHBMi+fGw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffr rghtthgvrhhnpeehhefhieetveeuledtudetheehgfelueeigeekjeduieevveeuteeuhe fftdevjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:47 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 01/13] gnu: spirv-headers: Update to 1.3.280.0. Date: Thu, 28 Mar 2024 11:54:43 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (spirv-headers): Update to 1.3.280.0. Change-Id: I7a00d3c432a9f6901b3b91b7df2ded887b6101d1 --- gnu/packages/vulkan.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 285d6be7f5..b4dfd191a9 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2020, 2023 Marius Bakke ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata -;;; Copyright © 2022 dan +;;; Copyright © 2022, 2024 dan ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -52,16 +52,16 @@ (define %vulkan-sdk-version "sdk-1.3.231.1") (define-public spirv-headers (package (name "spirv-headers") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/SPIRV-Headers") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (sha256 (base32 - "0z8b485hryya2g0jxv7amwg3fjj7pchbgnsa5ldf5fwgh5js0icm")) + "17jw5gwj2vmicyd6522b1zp7x551krfj826j0fg5kl0ixv0q08wk")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:07 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:07 +0000 Received: from localhost ([127.0.0.1]:38682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs2-0001AC-TC for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:07 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:49971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgrv-00018O-7f for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:03 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id D9AC13200A12; Wed, 27 Mar 2024 23:55:52 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 27 Mar 2024 23:55:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598152; x= 1711684552; bh=Hn2BScfXHIejEDopgOtWoHHzdAVpoccHz4yVn0zFzec=; b=S BkW+RkURrsnodD3zkinYufvUOzMpHSr691tOkxANBfTdiJLoJkRLCwN3ohBo7yaD 10NsTJFSI9TGn96xhMLZwVYrCnNudUQIQhiF1BEjd/dVLkg1ZY1epgj9gvOw4YgP GiBvJN59raVQtFJPNiTViGiQy1DhkLnJDIttbzSVQs59TX47AxxGEh8RtaOxkbbW EGwnJhukfk3YPzJ/nDyXFCVdFrJg9ctZ/aXxC/3O0URST9z4rgx27XMvZ/TgW3lx LciddA5JtaHW5BWcGl+T7gnAQAcpcWpkNSCPFnD3y/pD9l6ZgSEuchMrkC9ExJMK YPKsGPw1Rl1LM2/Wid7OQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598152; x= 1711684552; bh=Hn2BScfXHIejEDopgOtWoHHzdAVpoccHz4yVn0zFzec=; b=B XCAcHzX8ZD01G9jl1dU5Fqknz/Rmwi/OeDzPgMc2NPI1XW0sNs8tYqbG+NcEvaS7 EZWAJVWgrqyvXJ7PEmAbhCCXa22A/zotKaipYdAt0wGaM2pReXdzWNzoXIW+Ytdg DbS72He3nrF4veKqjB7EHVNIHy9215LpGXfKcHi2oMayGQSp686QQUAMFwTpuDEx XzVRYCRfmH2ahN0J+HV1RX2O4gKbevWRhXPFc0UxCcKxHbRzJfSTDpLgKagnAOsN +TYbZrghoUL71jEy6bgPHSAcpEtTLlRJYZ3C8ZOfJIwImBBIwhpO0DZkkudPAeTF ME+tVTxujBnT0r+AlX4gQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:50 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 02/13] gnu: spirv-tools: Update to 1.3.280.0. Date: Thu, 28 Mar 2024 11:54:44 +0800 Message-ID: <3902533ea4109ed9b772c767092456a5a6b6ffb5.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (spirv-tools): Update to 1.3.280.0. Change-Id: Ie6e438849f8f59a4b7616ab05e81c4a76d64dd9e --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index b4dfd191a9..ade0f65665 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -84,15 +84,15 @@ (define-public spirv-headers (define-public spirv-tools (package (name "spirv-tools") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/SPIRV-Tools") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (sha256 - (base32 "03d489ind2az7w7q1slj3mdc04372r3qqbnd7m9akxbg7yix1a5j")) + (base32 "1sj84ngwcgmydlj88nx1a9jfmhmxlij7wc92khp8wf1vsfplayas")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:07 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:08 +0000 Received: from localhost ([127.0.0.1]:38684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs3-0001AI-AO for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:07 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:46051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgry-00018X-2x for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:05 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id D022D1C000C1; Wed, 27 Mar 2024 23:55:55 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:55:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598155; x= 1711684555; bh=GM6bDe3b+qe/hsZiJtgWlz1niucQ9neDLQOhDmMFW7w=; b=r 04YvAetyK8ST5j97jWwmrEGaTeNeUFMkumq+Bj9rO99Vv7U0S2+vtLIwpa912yxK Tt+ZJmIiHOWAPzxaiQ5ViYKIJaysMbKa5cgBBbxrozKSMmu3WWPWmB6QF92dcsYm QIrNVYadeM/64S1HrB6FUKn22IHjGcrTqHTcp/CoRNRyF9t65/peW4hBxOxUzIL8 tcRgyu5wgwiVsVe6G8D9jWJrQTQudA10hcIkCaxQf5ZKyeLmYqa7TUUCnCVvgO66 i9El51QT03N9KVS8RAvZtAu5r2JbY/qvkP6417e7h/Ufw3eBzpQ+l/HknOsu90YW Sz0R7pmYr4gS/Bd7OJx3A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598155; x= 1711684555; bh=GM6bDe3b+qe/hsZiJtgWlz1niucQ9neDLQOhDmMFW7w=; b=G LGgd27TYdPpb+nWqaisMRS40xOzeyeTTxl7ju5BYHxeOIUbS4WZyy75TCsMpp39K cyWBQTU6s3YM58T0yjv+bPcAzwYHDNJPgttksBqjeE7YfvzsJ07k16FHlYMJSe7Z e731TIcVIfWYwYHt8amYhBLDyB+LsuUIGaHm0bg2CfuAfDd7ivulgTPgK8XqmAP8 vCByL6+YpxlWvjuxJmbkI5MvdOFyhMe0ULQOksualEPzvKKK5Tk3X8hwh2h/jZbl UpNphCButAP+9aICaXS0Kha5HW8XLcgibj+0Qs2oghdo5vfCyp8jjIk9yRHvaDB/ GakNI74adfaCEPoIbYDmA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnheptdelhfegtdehudekleduheegfeeiueffkeelveefieejhfeivdfhfefgud dtvddunecuffhomhgrihhnpehgvghnthhoohdrohhrghdpghhithhhuhgsrdgtohhmnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnh drghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:53 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 03/13] gnu: glslang: Update to 1.3.280.0. Date: Thu, 28 Mar 2024 11:54:45 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (glslang): Update to 1.3.280.0. [source]: Remove patch. [arguments]: Run tests. [inputs]: Add spirv-tools. * gnu/packages/patches/glslang-install-static-libs.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Ungerister it. Change-Id: I39ef23565e575179b292a1ab76d2d70c98f84767 --- gnu/local.mk | 1 - .../patches/glslang-install-static-libs.patch | 61 ------------------- gnu/packages/vulkan.scm | 17 ++++-- 3 files changed, 11 insertions(+), 68 deletions(-) delete mode 100644 gnu/packages/patches/glslang-install-static-libs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5429dc498c..beec92e9fc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1355,7 +1355,6 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.29-git-updates.patch \ %D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-supported-locales.patch \ - %D%/packages/patches/glslang-install-static-libs.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ diff --git a/gnu/packages/patches/glslang-install-static-libs.patch b/gnu/packages/patches/glslang-install-static-libs.patch deleted file mode 100644 index a155dde30e..0000000000 --- a/gnu/packages/patches/glslang-install-static-libs.patch +++ /dev/null @@ -1,61 +0,0 @@ -Install OGLCompiler et.al. even when building shared libraries. Also fix -CMake file locations. - -Patch taken from Gentoo: - - https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch - -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -41,7 +41,7 @@ if(WIN32) - source_group("Source" FILES ${SOURCES}) - endif(WIN32) - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OGLCompiler EXPORT glslang-targets) - - # Backward compatibility -@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OGLCompiler) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OGLCompiler ALIAS glslang::OGLCompiler) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -203,7 +203,7 @@ endif() - ################################################################################ - if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang EXPORT glslang-targets) -- if(NOT BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS) - install(TARGETS MachineIndependent EXPORT glslang-targets) - install(TARGETS GenericCodeGen EXPORT glslang-targets) - -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -52,7 +52,7 @@ else() - target_link_libraries(OSDependent Threads::Threads) - endif() - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OSDependent EXPORT glslang-targets) - - # Backward compatibility -@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OSDependent) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OSDependent ALIAS glslang::OSDependent) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ade0f65665..499165f581 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -189,22 +189,27 @@ (define-public spirv-llvm-translator (define-public glslang (package (name "glslang") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/glslang") - (commit version))) - (patches (search-patches "glslang-install-static-libs.patch")) + (commit (string-append "vulkan-sdk-" version)))) (sha256 (base32 - "12a1zl8qxa28nbf6m67260c0lwdw3bqbj0jz1382wgm5px1fpqw6")) + "1vvgqvwhsimlz8wkk38b9cvp9abggq840iws8al0znzz3mnvkfdn")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;FIXME: requires bundled SPIRV-Tools - #:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" + "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON") + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest"))))))) + (inputs (list spirv-tools)) (native-inputs (list pkg-config python)) (home-page "https://github.com/KhronosGroup/glslang") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:08 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:09 +0000 Received: from localhost ([127.0.0.1]:38688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs3-0001AR-Uk for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:08 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:47987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs0-00018l-Qi for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:05 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 8E52018000E4; Wed, 27 Mar 2024 23:55:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:55:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598158; x= 1711684558; bh=GpIsTX5Yd0C7oBIbJrtOZjbbQUczJC+/LvcQbAIPtRs=; b=p 0iOzNPw9cdshyGTSWvs6GOK7J84enTe0dxyuCxLT2EsPEaGGDIBLP8QumOGJzijX Ca4JwpW0n6TzfB+WykJ3R2gjL8kQz6D9LObBFWHSbZL6b/qiWrbUrZXwHKU2Fbdv e64+UYy6sV0NikFM3ZPuX3KuQw8eT5DE3QaglcR621YWM3HLEGhi0Zfv8JO++thA 8pHomvmlPVTfJ0e1l8AuQcfmyQsU35nBmAa4Y0wKiDkYY7bVLZuAsVy7FArwPF3A ltoRFt5VLUEu7adegeLm/06T58goDlLH1cdlJv84LZJhy1L946LF1WPs8u1Uta1v jsptL1K3dEbhm8K3/q+Lg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598158; x= 1711684558; bh=GpIsTX5Yd0C7oBIbJrtOZjbbQUczJC+/LvcQbAIPtRs=; b=s p+yTfxiaacGB9PyVhdGmVptdMyXBYLvYz35xqrmCtVGvPlz/+rdY+3lNPjvVpQZd 4Ld6iQvqvtMpoSRsrJZdn3fNazJ23wG0PXg17jn4QbcN+mDYUCnoPya0hNc3c5Bh Q7qnIxhRT0qMq11VtyULOskPdIFRa7zynSITuDHODRwJkpZBmdzmR2X+qLCm++0D uVDPG2DHWu0jyupoN74IVbZPlfKW9dbQsMd789f7CPHDIdCKNIOk/LUShZkJ0kXP jwjFwmdJBM9aPvkFNR9FO2Q1+bo/ivTEKeRESpQUBR/0nZuiPq2hYB53tMZUV7/q SWinAZX1JuLk66sPQtLeQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:56 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 04/13] gnu: spirv-cross: Update to 1.3.280.0. Date: Thu, 28 Mar 2024 11:54:46 +0800 Message-ID: <5cc37c6a8577c587bdd3d4f61900caa38fd24b51.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (spirv-cross): Update to 1.3.280.0. Change-Id: Ie8e45c6892892c02e3d970a831044ff9f70a9547 --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 499165f581..038a896803 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -116,15 +116,15 @@ (define-public spirv-tools (define-public spirv-cross (package (name "spirv-cross") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/SPIRV-Cross") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (sha256 - (base32 "1ypbc1krkr0yywa1m976g3sjyb80l7hxwrnh6gp70w6va1dlnnn9")) + (base32 "1k6fbkradknxis85akzzksz9ipm3v42xvrzaamwj2lrgfm8d6r4d")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:26 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:26 +0000 Received: from localhost ([127.0.0.1]:38702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsL-0001Cg-MY for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:26 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:38821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs3-00019Q-MH for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:08 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 6D59B18000DF; Wed, 27 Mar 2024 23:56:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598160; x= 1711684560; bh=O7U5NSmpvMwFes4TdrjCM4qvcQA7IAR8X+qvS9pAAqY=; b=s dlAE9frorPMC5VJjD0Qojvp1XefSRrUfDWgYfOgf4pWQhkCRUWu33aqo5NEAlUuE /6y36se6mdq/F9tEtclY8ijNb+X4zpjwTOq9+1flydsIM+j9o49LocindbuA5uTo pVxe7o5mn91gGcrlt6i5XYKndKOLeTpYBfHyL/5Z/qK//VVVSRDR/fdpQ4NCrYRr CGehwJH13AwKDNEWtoL9k8j4wA1ElX5Z1pYGOVGnKn4LXYuSUDyIt6yAqP41I0HV tSoVeyg1mle0PTIC8DFn8hqHXagDU0prtg3zpIBTbBpc9EyR3y/m0lF48toJTovw qrV2cQCQJqX6l4z+sPoug== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598160; x= 1711684560; bh=O7U5NSmpvMwFes4TdrjCM4qvcQA7IAR8X+qvS9pAAqY=; b=k Vh5BihPe0jCyqXys56L+Tt4TEG2MD4+eoD7ZA0FITg7C5RWbrzrawK3bxzp82vAY ZjjpRjYbwnJxac7oDm/kPuLM9GFXsBx5mZBhPeemBnSzW+FJOs57Aoh0+m6AhQ6T BZIVkajYWfWl8p5r+rP63zL0Hcb/OSp83QGw70pEtWGzn8N/8wbPm3AKEQmcH4jn h2y/PtwKnJu/mxIFR2wKgduJuXViJSKB/zrPlsfD6V5i8338B8bb9uxeEaDVG+cZ fHXcw3ai4dBDppgZgXPmOTQx2hhSsxSPUVANk5DGbpRIj0TT2HmEss5x6cEBFWXL wHwpZga+LkGdSQvy7lsOw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnheptdfffedvheduvefgueetveegveekteevleevleefjedttddvhfeikeegfe efhefhnecuffhomhgrihhnpehgihhthhhusgdrtghomhdplhhunhgrrhhgrdgtohhmnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnh drghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:59 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 05/13] gnu: shaderc: Update to 2024.0. Date: Thu, 28 Mar 2024 11:54:47 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (shaderc): Update to 2024.0. [arguments]<#:configure-flags>: Specify python executable. <#:phases>: Remove drop-additional-glslang-deps phase. [inputs]: Remove python. [native-inputs]: Add python. Change-Id: I3ca4b6560288f4b8ea9440a7fd0a7815b67471d8 --- gnu/packages/vulkan.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 038a896803..ef6e4b454f 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -359,7 +359,7 @@ (define-public shaderc (package (name "shaderc") ;; shaderc doesn't follow the versioning scheme of vulkan sdk - (version "2022.3") + (version "2024.0") (source (origin (method git-fetch) @@ -369,13 +369,18 @@ (define-public shaderc (file-name (git-file-name name version)) (sha256 (base32 - "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d")))) + "1m5jncn6y8c6g83f8nwh86hz33mvv03x7fyr5zq0ynwanrcpn2hb")))) (build-system cmake-build-system) (arguments `(;; FIXME: Skip most of the tests, because enabling system gtest breaks ;; the build: . #:configure-flags (list "-DSHADERC_SKIP_TESTS=ON" + ;; The two flags are copied from: + ;; https://sdk.lunarg.com/sdk/download/1.3.280.0/linux/config.json + "-DSHADERC_ENABLE_SHARED_CRT=ON" + "-DSHADERC_SKIP_COPYRIGHT_CHECK=ON" + "-DPYTHON_EXECUTABLE=python3" ;; Note: despite the name, this just specifies the headers. (string-append "-Dglslang_SOURCE_DIR=" (assoc-ref %build-inputs "glslang") "/include/glslang")) @@ -401,20 +406,11 @@ (define-public shaderc ,version ,(package-version spirv-tools) ,(package-version glslang)))) - #t)) - ;; see: https://github.com/google/shaderc/pull/1276 - (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps - (lambda _ - (substitute* "glslc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc_util/CMakeLists.txt" - (("OSDependent OGLCompiler") ""))))))) + #t))))) (inputs - (list glslang python spirv-headers spirv-tools)) + (list glslang spirv-headers spirv-tools)) (native-inputs - (list pkg-config)) + (list pkg-config python)) (home-page "https://github.com/google/shaderc") (synopsis "Tools for shader compilation") (description "Shaderc is a collection of tools, libraries, and tests for -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:29 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:30 +0000 Received: from localhost ([127.0.0.1]:38704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsM-0001Ci-3w for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:29 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:58731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs6-00019w-Fn for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:11 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 3F6373200A12; Wed, 27 Mar 2024 23:56:04 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598163; x= 1711684563; bh=cA7YN/jrh8v7bFcAqCJioskzHaXUhE7KzHPpcb7Ac1w=; b=K XgLZ/Q5l4urxX7dUlSaZ3SYWMhjLsmA2STy7h51vGUIqGvCMx6UxgW+Ps4NpCgIM ON8EG6cPUNdiNrkeZYwUCNEv9jOFXt/AbHDCj4K8k3oDpse0BX0zY7mdObmflcFa dmeeuzvlZbIE1TT/z2Y9YT7BK8KiMURkWsiZJKpplT/dzLDTk/abMqXcIjVnt8hp PCndzOnuIxUEJSPmBKK6kN1ViCQmeW4RTgwgsoR3kG0OJ2cckGzdruVQaTbrBihN 5ClEXE2sUJSZ84sDACy4XWZA8WBVL2l+xDFTjNzcE2IKmRe7Qz1MZlEBq3UInpok zl4P/Dj/apvkP6F0hk3TQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598163; x= 1711684563; bh=cA7YN/jrh8v7bFcAqCJioskzHaXUhE7KzHPpcb7Ac1w=; b=N mkAGfzH/vkWcd+0N+vOXYqml6IhsxZL3FqCjvzOrH4egYRGcf5jD8tN3srG64bCN 7uJhKqQZUDO+zww8elyt1S2S0mKbORI7PqiVlQGCBDhkXCdhp5XOv8Qv7NttYDLx THY8yhhgyAPTrTHjv51UuGXG0q+InnDyzZZlNuSl5bfrEGhkL7k8aOOI7SseUr+q jMqrc5QjVYp+7pPmAAgURl1H6tDpO/WhzddlnvQ2JJVHZLUxSH5h02oTbot2sj8t bv7XpBb/RUNboPj2Ca2R4+aZnkXUSrRZZu7Wx0Ihj828DiozM75+4t7dttWNkIZU BSi1yBaGKv6oDxgkkaoMg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:02 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 06/13] gnu: vulkan-headers: Update to 1.3.280.0. Date: Thu, 28 Mar 2024 11:54:48 +0800 Message-ID: <3537c17756cf185ef5b83d7fe0f1c7626ab0260f.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.3.280.0. Change-Id: Ie4c135fd53a9cacb36e766daba9524ce33fa5630 --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ef6e4b454f..3324e8bf45 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -227,17 +227,17 @@ (define-public glslang (define-public vulkan-headers (package (name "vulkan-headers") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Headers") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "167zdank6pn66mzjdwgrdlmhmsy4v2k0nhw0nwg649k863rgi00j")))) + "13mmv5621z73hlfnsrccbcb4z0d7kwj92a081701vbpss45a4whj")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:30 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:30 +0000 Received: from localhost ([127.0.0.1]:38708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsP-0001D9-U5 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:30 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:43945) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs9-0001Al-WD for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:14 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 7F16818000DC; Wed, 27 Mar 2024 23:56:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598167; x= 1711684567; bh=jDywyIHbhA2arnXlo+d8GWHtLaAU6N8wrOk8lVAr1mc=; b=h 3tqkvfeZiapzuRtIrDrzOsvoL35XF/3iaytDfMCwBItMBblociSAKRgL3SNgt8qn NUmUtEtTUsfS9omahMLICW4KUVaNj2NL5b9va6AEvOqzchT5/u3ZZMytlmaWPg5g /4w14MACXkap8fSb0VAl5NmAtWNyMQ0bAsav9iJ0XOHIglFFFpyDRA4eahRbdSiq wQoni7GrionJ5FAtDZ0cfQVJEbPmC+cyiaGqKu87XtlIdQhzb/h+ennXB1WTGz5W dLBRkOUNPTep4DgjqkLmM70oK+zZvIr74slm28uo4ZhQHh0yBtozKQymC+pc1Gn4 8AF9LFCD/pu71l/3rwSeA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598167; x= 1711684567; bh=jDywyIHbhA2arnXlo+d8GWHtLaAU6N8wrOk8lVAr1mc=; b=j wQGdwcXCncIj31+2A8Ct2jikeJOwpZe4wFxkOKT/wbwRPKvlqZnkI1QWczZ4wlUp 9OmKI5edT1OFbCCUIIxtc8/S7XJg1MIa7o4LQkquULE487c1e607Jbr8+Qa4tGZG ZoiKMffzs35OHiFWGBqaxc6N7qFpJaEl9PQPE20dlEfHGcrnF+Cc4DFx0D83Ys0q 7Rx9NA1fzeNDnST2lb1UJ5WdhJ5vak9MUn0zeEZX8DiV2VQh+PjQy5nENFgUbfQb VtzIaZPBhu/wW5O8EmutG3iZyNqqBcoadSl2E+K+kgzZ4WheolCY5siTg9cKsI6/ 7wgCnWjD1+I5MJO+hysXQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:05 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 07/13] gnu: vulkan-loader: Update to 1.3.280.0. Date: Thu, 28 Mar 2024 11:54:49 +0800 Message-ID: <18e4585ccf2c39b8905de5e679be296c7cc3bde1.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-loader): Update to 1.3.280.0. [arguments]<#:phases>: Change the place setting system googletest. [native-search-paths]: export XDG_DATA_DIRS. Change-Id: Ib270eeeea6500691a75c36612104c7ddb1c28dfb --- gnu/packages/vulkan.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 3324e8bf45..14e50c59c6 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -251,19 +251,17 @@ (define-public vulkan-headers (define-public vulkan-loader (package (name "vulkan-loader") - ;; XXX: Take a slightly newer commit to fix a test failure on i686: - ;; https://github.com/KhronosGroup/Vulkan-Loader/pull/1036 - (version "sdk-1.3.232") + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Loader") - (commit "v1.3.232"))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) + "0glix3clqkdbi9kqcp8abmglqpgjd2r2bjqvi11r8sair0z54hnf")))) (build-system cmake-build-system) (arguments (list @@ -291,11 +289,9 @@ (define-public vulkan-loader (string-append "includedir=" vulkan-headers "\n")))))) (add-after 'unpack 'use-system-googletest (lambda _ - ;; Inform the build system that googletest is already built. - (substitute* "CMakeLists.txt" - ((".*if\\(TARGET gtest\\)") - (string-append " find_package(GTest REQUIRED)\n" - " if(true)"))) + (substitute* "tests/CMakeLists.txt" + (("message\\(FATAL_ERROR \"Could not find googletest directory. See BUILD.md\"\\)") + "find_package(GTest REQUIRED)")) ;; Use the namespaced variable. (substitute* "tests/framework/CMakeLists.txt" (("PUBLIC gtest ") @@ -308,6 +304,10 @@ (define-public vulkan-loader wayland)) (inputs (list vulkan-headers libxrandr)) + (native-search-paths + (list (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))))) (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:35 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:35 +0000 Received: from localhost ([127.0.0.1]:38712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsV-0001DX-C7 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:35 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:59817) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsC-0001BK-Nz for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:17 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.west.internal (Postfix) with ESMTP id 7BC801C000BF; Wed, 27 Mar 2024 23:56:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 27 Mar 2024 23:56:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598170; x= 1711684570; bh=L7uKVO047E56JLo8qSq8gWqM0YUiQh+ct1JUxyigErU=; b=K +hehF503FN9HIqVPVj87Ik0sl3j64jtzLsLQJmdTUp1B72igUkahqZptNzfLqQ08 ITDPtyBZ+LONGIGALYeplfBbZrVY+Uq0l8VZARuLASUcVgalm8lZJiN6vr9/4uYN yV4QwHwYQt9PZRIDql0u1LvlhtYI2tnZRpqraFUS+46X39JT6DY2VXdUe/eZWxgK 0xK+EEa/8HDZjn4ZUlR+WEFKg07hIUc81QkUhxAS/MGGWvUzELwqT2V2s9gPzCFC VYnc2j2FdF8bw2UpKQR6hrP+OFDZrHbfVf0Kzvk0bXEi6/a4cUkYWbth7U+Hx2rl mn5x+hudLDARprWAH6xuA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598170; x= 1711684570; bh=L7uKVO047E56JLo8qSq8gWqM0YUiQh+ct1JUxyigErU=; b=r tgtkgL5TBuF7idJZRNB2o2MjxQhTHm9dyhyRrciFwX6mT/B6lAdv5yHeQN4J/c0+ M+fYjf0xqMmdD7R+wU+Sw/OzYlB20/fn7+P2hUirnMi1GJD9sILFdzhCzUVVtpgP SmcJY+9ks6/aviIhb87T+4KZoP5fT7ZUSnBNluAR+c2ubRbpH0Jg5CWOMlNYTEdi GneEXDLsq7fkSssznH2L5MGPfP2yGfIAEASvXXxPjytkOfx4EbagvtW074ubP28Q A8EydLWMZzy5Rz3s1aBLSzo3H3fXhjDERxqw1icUUzhoa9lgs4x+frEe2hiXFxo3 vsZI7g9uNerW/v/p1g/Yg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:08 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 08/13] gnu: volk: Update to 1.3.280.0. Date: Thu, 28 Mar 2024 11:54:50 +0800 Message-ID: <29de178f1dbebe1d817f8855d79542364c0ecd7d.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (volk): Update to 1.3.280.0. Change-Id: I4f72df2ba6784f3dae93cf60361e1bceaf61d3bb --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 14e50c59c6..c6d3d3d347 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -535,16 +535,16 @@ (define-public vulkan-validationlayers (define-public volk (package (name "volk") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/zeux/volk") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0xaw3kg754mknx8lfj1p74a9npjfvdvlpicvn0hla4495zpc10rq")))) + "0x4jhc8n9c4k8svmmcaxxs613xbsav7wam94gacddlm738cwp13v")))) (build-system cmake-build-system) (arguments '(#:tests? #f ;no test -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:36 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:36 +0000 Received: from localhost ([127.0.0.1]:38714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsV-0001Dd-T4 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:36 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:50583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsF-0001BV-Dg for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:20 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.west.internal (Postfix) with ESMTP id 2D48D1C000C1; Wed, 27 Mar 2024 23:56:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 27 Mar 2024 23:56:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598172; x= 1711684572; bh=oruVbQJVkJpKInYbi25CUlIpUsdHY/X9f7E89+n9P4I=; b=m pF7RyKIebd5L41dyGvsUi6D3F+7l0Rw7Ey37hTYhTKdfmAcxXUXVWvsB3qgiZVRJ /qsUUlNikh1qgZuabwEnGWX7kJRH9nxOJ2FstvfExQ19LkNCG+M8xL2Z1YE+rdDY l7UJAf3lT8NGU4qKduR/i2UD6qJjEBng2b61asJe9EIAvtygp6DokXHUVUDLMR7l o05L9NkCYwhrDLmJ4okYY8hsfYvxGXDPNH43qfAEVX7M0aC7iG2NXMSfHqmOdy2z +22e0Ziox97e+aggaImJX5v4TIuq4fapWAp07O+L09wW6uNPowdKGcLZiTRYfmK8 zeuqv2GjqGQ1IKl87vdlA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598172; x= 1711684572; bh=oruVbQJVkJpKInYbi25CUlIpUsdHY/X9f7E89+n9P4I=; b=Z k8xMDiLV2abuvc+rYYFvYwkIn2JhsCOFgB8nN0aTjUiU+qLEk6pntNMmSgxgsrI6 4koZVflm3wdeZ/1lR/zckn3e7o9CNggz5oo9+v9Mt1+C/Q1QtNO26G9W7G0MCIIE +iwcpixXLH6pPVHscX60KB6HpGBUfyJyjmAsleWJPe9V9MzBH9mF6Kyq3TXZtEV6 BUPBOAp7xxeYmhg+peafxiTtIIpc09COiL4bv3Gt1/SL3D+na41PLVmwqbOb1hEJ YAZw89o3OmKaI3F6c8Mnv9E3XcFQw3JzyvLc5Yl5IglQ05tLvyeiyEKYwHzYAXdq ALbfL4+eH6z3kb8WqEQPg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:11 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 09/13] gnu: vulkan-tools: Update to 1.3.280.0. Date: Thu, 28 Mar 2024 11:54:51 +0800 Message-ID: <28d6db476c6a195925f0b4d2866facacefdec770.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-tools): Update to 1.3.280.0. [arguments]: Turn on tests. [arguments]<:#configure-flags>: Remove GLSLANG_INSTALL_DIR. [native-inputs]: Add googletest. Change-Id: Iadf98fc95d0d70c3780159992ebc2fdff6a2d108 --- gnu/packages/vulkan.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index c6d3d3d347..dfd8f73d9b 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -326,26 +326,34 @@ (define-public vulkan-loader (define-public vulkan-tools (package (name "vulkan-tools") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Tools") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet #~(substitute* "tests/icd/mock_icd_tests.cpp" + ;; Disable driver info test since it relies on git branch info + (("ASSERT_EQ\\(std::string\\(driver_properties\\.driverInfo\\)") + "// ASSERT_EQ(std::string(driver_properties.driverInfo)"))) (sha256 (base32 - "0jzwjfx4c7y15wkwfhhc64rzljpi47bxrm5jw5blfsqjh8zsd27a")))) + "0w0m04vscr4a6vr682g3mn7mfni740cmai9ylzlgfdggb77y58xz")))) (build-system cmake-build-system) (inputs (list glslang libxrandr vulkan-loader wayland wayland-protocols)) (native-inputs - (list pkg-config python vulkan-headers)) + (list googletest pkg-config python volk vulkan-headers)) (arguments - `(#:tests? #f ;no tests - #:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR=" - (assoc-ref %build-inputs "glslang"))))) + `(#:configure-flags (list "-DBUILD_TESTS=ON") + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./tests/vulkan_tools_tests"))))))) (home-page "https://github.com/KhronosGroup/Vulkan-Tools") (synopsis "Tools and utilities for Vulkan") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:36 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:36 +0000 Received: from localhost ([127.0.0.1]:38716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsW-0001Dg-Ay for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:36 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:47887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsI-0001Bd-00 for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:22 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.west.internal (Postfix) with ESMTP id B9D3D1C000C8; Wed, 27 Mar 2024 23:56:15 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 27 Mar 2024 23:56:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1711598175; x=1711684575; bh=GKMH78PubeJxJTCUvr6rBcdVCsb3c/bjOKjhJe7Wr8g=; b= pppfhysHehnG6Rn2QhAmnLHXkGNzqN/3wkXaqy2T19tHpWeCNSKbeQOKShDnc39s tE03sU+qEEz1OmRkP4dqDtmp3JVyK+jOnYEZeUSKE9UUGwx79hao+AJBTQMs5IlZ 3Zs5B5jCf5jb2fvk9lap/+5Xsyr2lxfrYjCfg5Gk9eXXEECoB1I1pLIdJYX+8GJO f5OPuKg3NoSguaJqOMK8sTgf5NpeVyx3BQRH2RYSq9vmbMgNtFy20ASF/0/CH3ZH r6TC8+lclLX91r7bDTMNUKfze2nPQ9UK3smZM2zfNNLP3jaHPS5ufUzYLE+hciDf vJO6QTeg/fDLeR0nkRYpuQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598175; x= 1711684575; bh=GKMH78PubeJxJTCUvr6rBcdVCsb3c/bjOKjhJe7Wr8g=; b=Z Nx4FDhBT8IWt2xluSqkXSIDdk+1auyVaW+Ozz0bxPl9TFtd94IP5HyHXrWLiShP7 cJZP+pninvqLB/9ytAp2g41ESR5ot6BxNc6LlHGE94ViDWSFobge3JvZAcE3vLQe gu2yD2eutKq6934/WVoG4Jo/pyh6h0yfxS+/ax2o7xOgAIjKsFUa/CtOjsoKLCLk VALKlQn4LiWfcNoSHpS4bvOOb4UAnMpX7TtKdWEEjlAwD++jbPLH9hNXqxRDy+nu FVUqY2UUPccUQ/WNpRjjzSNkre2E30Rdjn3FiQCFVmJV/W5yBZ3BU4XPCctAJnER 18wsLdLjClwqgWjsW6Z5Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffr rghtthgvrhhnpeehhefhieetveeuledtudetheehgfelueeigeekjeduieevveeuteeuhe fftdevjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:13 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 10/13] gnu: magic-enum: Update to 0.9.5. Date: Thu, 28 Mar 2024 11:54:52 +0800 Message-ID: <016b1a765e31297919aa133a66a39871118a49c3.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/cpp.scm (magic-enum): Update to 0.9.5. Change-Id: I8306d7ef69276e33f7daada895165a88bfc938ad --- gnu/packages/cpp.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index acbe3e4836..cfff141dcc 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 Foundation Devices, Inc. ;;; Copyright © 2023 Paul A. Patience +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1795,7 +1796,7 @@ (define-public atomic-queue (define-public magic-enum (package (name "magic-enum") - (version "0.7.3") + (version "0.9.5") (home-page "https://github.com/Neargye/magic_enum") (source (origin (method git-fetch) @@ -1805,7 +1806,7 @@ (define-public magic-enum (file-name (git-file-name name version)) (sha256 (base32 - "1x47radgsifgz3vn2561mlvf4cq46ii33cpyqf01znm56iirwq89")))) + "14ys5sn2v1mai8bclvi81cp65g6jblqpdsi94639hphca5v8gka3")))) (build-system cmake-build-system) (synopsis "C++17 header only library for compile time reflection of enums") (description "Magic Enum offers static reflection of enums, with -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:37 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:37 +0000 Received: from localhost ([127.0.0.1]:38718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsW-0001Do-P2 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:37 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:41947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsK-0001C2-NV for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:25 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id 749781C000CF; Wed, 27 Mar 2024 23:56:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598177; x= 1711684577; bh=xPMcUE2MfnOjNrYKWKtaLDcbJUuiNnrknEMZK3qht4E=; b=k FRCYRB47SmsAHeNfrC5qeuNr/d5PDBHDZZA98Jsd99m3EjFybrWkqa3TNOYlzuFB aWGwqr414Buv2Hi3WYmi1kSNrK4bdGTnMm0iMsSXiHP3Ox06g2XlyHRjl8WqHDEp dxyWnlxgyT8dVEbGsxeZzEl0mR3/Ml+b3IBLd8WqHryX4ONT8kzVvbbq7bB7ITlJ xx593ScY7qa/r0l3K71ay5+O+iDtnZBZ0YpXnq7bdJVwlSpTHvXPwK9zp4oNWEN5 g2y91JEsxYkKI8Dyd5qcdgFAw0fE1LjWd4LLEVHEJQgKJ0bfVgehmhDI2XFtunNh btNspFKq6PiszbKP8PCpA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598177; x= 1711684577; bh=xPMcUE2MfnOjNrYKWKtaLDcbJUuiNnrknEMZK3qht4E=; b=o w0NK5Mtp4HbG8+6xomfVRLCl3sOObX+oLvPmHq9+/ut+wzWBCedFjUt+T55gxC0p 6gDuPons6njdFycPsyIo/f3UtERJVGSuqxI75onuap169h+Ipzew9qvefi0GE1te Zg9GAlav/7G4uAox1cGsY11Dia5PnRQZpnhUBNEwZxTIRQh0elwB3yoWuMhmhtob qSkvKhd6beNTMQGZB8R1FWukh7ThUW/ic86Fzp7BzjyLA2ZGYw9I7qqUgGYwDOqe lbkB1+t0J9o63vGAU1oMhqH1uEkGDuqqQI/TFvIILQ4NYBfWyQxzTyx56IWYZL1P D7FnhCWksX2y73PC6y2ag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv peefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:16 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 11/13] gnu: Add vulkan-utility-libraries. Date: Thu, 28 Mar 2024 11:54:53 +0800 Message-ID: <75fce4aad0cbf3e8f2c271afa00419ed33651de2.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-utility-libraries): New variable. Change-Id: I5a7c3fa51150e2181197316f6b97a54f12a24236 --- gnu/packages/vulkan.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index dfd8f73d9b..6239f7ea4d 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -37,6 +37,7 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages cmake) + #:use-module (gnu packages cpp) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -597,3 +598,27 @@ (define-public vulkan-memory-allocator (home-page "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator") (license license:expat))) + +(define-public vulkan-utility-libraries + (package + (name "vulkan-utility-libraries") + (version "1.3.280.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-Utility-Libraries") + (commit (string-append "vulkan-sdk-" version)))) + (sha256 + (base32 "17fmalilczs4x435f8kdx8bf0x5mnjhkmcp34xap8lanpbyzs84q")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DBUILD_TESTS=ON"))) + (inputs (list vulkan-headers)) + (native-inputs (list googletest magic-enum)) + (home-page "https://github.com/KhronosGroup/Vulkan-Utility-Libraries") + (synopsis "Utility libraries for Vulkan developers") + (description "Utility libraries for Vulkan developers.") + (license license:asl2.0))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:37 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:37 +0000 Received: from localhost ([127.0.0.1]:38720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsX-0001Dv-6y for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:37 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:50529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsN-0001CR-JI for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:28 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 580EC180006E; Wed, 27 Mar 2024 23:56:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598180; x= 1711684580; bh=XL3gg5y/HeEpA/3Y0Tg+TxSOxipFLlyExq+vnrczhVk=; b=N YhUsnHY0INC6/5prhC9p4LoBmKGyZHmCxZowdO0VJGi2GSqyOa6nLTvhbdwNDwaC 6m96MFlosBfTDZEYLEWQB2a1MaSrCdMkYOwL6Wd/C7evr+ijuY6xgJuUKWudP0p9 Ns37R14M+MezFJLR/XPahjmsS2HD9Vn0tj5c02BgvKUeowhlnJwPVoOacU7mBgcX 9fklOAFpA2JQLMlmZtT/53nR5kgaukPZosXfCIz0JG4Mk6gA8l/UkBjW58RT+Ve/ HEZjh72bN9aO7Qy/lzJhMSS6Z6E3cpaFql4r9fgq7N+Wp8bt8r0taD90kkus1NIU 50WG5VINwG3OvuNFLPTeA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598180; x= 1711684580; bh=XL3gg5y/HeEpA/3Y0Tg+TxSOxipFLlyExq+vnrczhVk=; b=x 96VTf59uSAR3pAiXoP84PC9D2ny2qHjLykVw3yjuhUC3aUjcsYLeSfW/ATJOlVu3 4N4rO2Vw/yFJrfmiFWdwpshkLUe1+/MYW2GwI4XclYw+VEIUpFOxa8t1sBhJxFtm 7JImfaAqmj7NlOSHC5mn96Ls9EIDWlSTx/MSiD/AUkBo5uIfHMH0HhU6JYVXlixU Lvd8JtJP5kFBRuuHugLlwW8HRMDH1x64+/d3GtytobOdF6mDhv2cJnV6SIgx51jF sRBfy6Q8sVguwYypCVIRYrZLNPmtJ6V2nOI5GqQQlqnNXGaPm8IslsFLk+gL7Awu Dmk9/MROAm6FlEw+jk8eg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv peegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:19 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 12/13] gnu: vulkan-validationlayers: Update to 1.3.280.0. Date: Thu, 28 Mar 2024 11:54:54 +0800 Message-ID: <435c72f590aa854b9072c5967eabfd1cbc6c8bcb.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (vulkan-validationlayers): Update to 1.3.280.0. [source]: Add snippet. [inputs]: Add robin-hood-hashing and vulkan-utility-libraries. [arguments]: Remove configure-flags, replace check step, and update reason why disabling tests. Change-Id: I80ca002d8dbe71cad57f859ee34ac8f10e175907 --- gnu/packages/vulkan.scm | 55 ++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6239f7ea4d..1016e9db36 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -47,9 +47,6 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages wine) #:use-module (gnu packages xorg)) -;; Note: Remember to change vulkan-loader version when bumping this. -(define %vulkan-sdk-version "sdk-1.3.231.1") - (define-public spirv-headers (package (name "spirv-headers") @@ -478,51 +475,37 @@ (define-public vkd3d (define-public vulkan-validationlayers (package (name "vulkan-validationlayers") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-ValidationLayers") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + ;; We don't build static libraries in SPIRV-Tools. + (snippet '(substitute* "tests/CMakeLists.txt" + (("-static") + ""))) (sha256 (base32 - "07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75")))) + "1w6fsaicrgnzkj5vz2v86a2gk1n7478q6n66ac2920avnin9a64c")))) (build-system cmake-build-system) (inputs (list glslang libxrandr mesa + robin-hood-hashing shaderc spirv-tools vulkan-loader + vulkan-utility-libraries wayland)) - (native-inputs (list pkg-config python spirv-headers vulkan-headers)) + (native-inputs (list googletest pkg-config python spirv-headers vulkan-headers)) (arguments - (list #:tests? #f ;no tests + (list #:tests? #f ; test crashed #:configure-flags - #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF" - (string-append "-DGLSLANG_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/glslang")))) - (string-append "-DSPIRV_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/spirv")))) - (string-append "-DSPIRV_TOOLS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/spirv-tools")))) - (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/vulkan")))) - "-Wno-dev") + #~(list "-DBUILD_TESTS=ON") #:phases #~(modify-phases %standard-phases (add-after 'install 'set-layer-path-in-manifest (lambda _ @@ -532,7 +515,17 @@ (define-public vulkan-validationlayers (substitute* manifest (("\"libVkLayer_khronos_validation.so\"") (string-append "\"" #$output - "/lib/libVkLayer_khronos_validation.so\""))))))))) + "/lib/libVkLayer_khronos_validation.so\"")))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "VK_LAYER_PATH" (string-append (getcwd) "/layers")) + (setenv "LD_LIBRARY_PATH" + (string-append #$(this-package-input "vulkan-loader") "/lib")) + (setenv "MESA_SHADER_CACHE_DIR" + (string-append (getcwd) "/shader-cache")) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (invoke "./tests/vk_layer_validation_tests"))))))) (home-page "https://github.com/KhronosGroup/Vulkan-ValidationLayers") (synopsis "Khronos official validation layers for Vulkan") (description -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 23:56:38 2024 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:38 +0000 Received: from localhost ([127.0.0.1]:38722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsX-0001E3-OS for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:38 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:54115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsQ-0001CZ-Ao for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:30 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 186DE3200A12; Wed, 27 Mar 2024 23:56:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 27 Mar 2024 23:56:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598183; x= 1711684583; bh=xZePi0aMmsnR+c2thG2i40BlLLcfURrzWMoJ/9O8rms=; b=I ZbvFdYVZMP+XRlAaWbBmq53ewPi16AzCss+2kJJ3IZ0m7BsVgwcoCMfxP7tAtLcS E8KJOrPJCmNoEuPdR7qDTRWoLZgfHD2kAK2jNoZPMx7wK0ctYJjPJ6ie/4xs6jT0 tRpUkHGc7YLfnuc/Wz89T6YdYILzrcddCEWniuC9Nh38A+iDQTljZWY9O48NVo0x x7tJBFjHuuop0Xwmbg7RAITUE2OmlvxDXtKhSKuUB2JYLdc0P1qEwRvVNXLIgfjk jtC4aopB4llSR7xSjTisNpY4LXPPvXAFXmmhVWO+g/4Lqqw0Py9LEzhBSNmP/V6G /3MEfsHcynp1avVyP3QGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598183; x= 1711684583; bh=xZePi0aMmsnR+c2thG2i40BlLLcfURrzWMoJ/9O8rms=; b=u STFZoxyqfahnhXh+nfIpYaUE4WE0ABn4J+wWD1dSrqteqSqZQQ9xTTkwqCG8yAqr cm3XqQeaGb7gMPJ6ga7uhPDMuzliNY7/mrLrr7rkNafVK5mV6uQsI8FRo+CoHpLY wz+EJjoVF6JPB7Nt3xG7iibbkG/LQOu1nnXUIQXSHygv0SrZSzFHckG5Bo8tmF/9 RuiY3R7OieH+vpyWJoTCF+cuRO44Axr3oWXXKztOBdQp33Sy5Hy35Oinf8yw1Rj7 v2L7CF5d9F7Md7LnkzaniFs6h1M7BDMD5vOWoUF7B6CDzdO3u/pQDyS2MsS7XT+D hRrVfbkF6vUDLko/ofutg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:22 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH mesa-updates v3 13/13] gnu: Add directx-shader-compiler. Date: Thu, 28 Mar 2024 11:54:55 +0800 Message-ID: <85c049f7241ecdb209022a8a473b5fc0baa6643d.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 Cc: john.kehayias@protonmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (directx-shader-compiler): New variable. Change-Id: I3d7ae6da3f6d6394d559c3cc2676be4d477e6b1e --- gnu/packages/vulkan.scm | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1016e9db36..35f2339e43 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -44,7 +44,9 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages version-control) #:use-module (gnu packages wine) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define-public spirv-headers @@ -615,3 +617,68 @@ (define-public vulkan-utility-libraries (synopsis "Utility libraries for Vulkan developers") (description "Utility libraries for Vulkan developers.") (license license:asl2.0))) + +;; directx-shader-compiler depends on an old version of directx-headers. +(define directx-headers-for-dxc + (let ((commit "980971e835876dc0cde415e8f9bc646e64667bf7") + (revision "115")) + (origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/microsoft/DirectX-Headers") + (commit commit))) + (file-name (git-file-name "directx-headers-for-dxc" + (git-version "0" revision commit))) + (sha256 (base32 "0c7l2xdsbr132ga2nyqjhz9xa42dxvhh9idjxnl673mz5kab1j6h"))))) + +(define-public directx-shader-compiler + (package + (name "directx-shader-compiler") + (version "1.8.2403.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/microsoft/DirectXShaderCompiler") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14nd4ys0x14z17l5fkaysc9a1gfw3fmdj8gvxw1a013yg6fla7g3")) + (modules '((guix build utils))) + (snippet '(substitute* "CMakeLists.txt" + (("add_subdirectory\\(external\\)") + "find_package(SPIRV-Tools REQUIRED) +find_package(SPIRV-Tools-opt CONFIG REQUIRED)"))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-G" + "Unix Makefiles" + "-C" + "../source/cmake/caches/PredefinedParams.cmake" + (string-append "-DSPIRV_HEADER_INCLUDE_DIR=" + #$(this-package-input + "spirv-headers") "/include") + (string-append "-DSPIRV_TOOLS_INCLUDE_DIR=" + #$(this-package-input + "spirv-tools") "/include") + (string-append "-DDIRECTX_HEADER_INCLUDE_DIR=" + #$directx-headers-for-dxc + "/include")) + #:phases #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install-distribution" + make-flags)))))) + (inputs (list libxml2 spirv-headers spirv-tools)) + (native-inputs (list git python)) + (home-page "https://github.com/microsoft/DirectXShaderCompiler") + (synopsis + "Compiler and related tools used to compile High-Level Shader Language (HLSL)") + (description + "The DirectX Shader Compiler project includes a compiler and related +tools used to compile High-Level Shader Language (HLSL) programs into DirectX +Intermediate Language (DXIL) representation. Applications that make use of +DirectX for graphics, games, and computation can use it to generate shader +programs.") + (license license:ncsa))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 18 00:55:05 2024 Received: (at 69461) by debbugs.gnu.org; 18 Apr 2024 04:55:05 +0000 Received: from localhost ([127.0.0.1]:50114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxJna-0004HI-GY for submit@debbugs.gnu.org; Thu, 18 Apr 2024 00:55:04 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:38323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxJnY-0004Fb-9E for 69461@debbugs.gnu.org; Thu, 18 Apr 2024 00:55:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1713416080; x=1713675280; bh=KaebKEfcDiZJ4YlzY/8aDnajt9qt/aIK2ud9PSPAdrw=; 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=ZdQTaRG6k89WuBRmz9hqKlv12Ic/htSRs+n/Ft1yuQ7kfAdgjQS6JPoMnne6kfmiQ pVifw6AP3exE2/NIgTbpfrXpUkJXjIQp3/K9BtC24WioNtbMeXA3uR6DrSCuDpila8 gldsPNlG+67WXU0u3jalw0ADae2l7jAZZP7qPYrNft+Q0vzsij9AWBKGtx3VJv65pz ALpEt1cy2TELRlIfMZY1EYONQkXkYhfpomwzIQOX+UkaxDRcHy+4POhNjjglAfcbXB mWgHj6FIOZu+Akh+bDuNmNHhP9WIO6rbVsSPQwOPtqNnbDocx+/RJbmr9idJV1DCKr LZowucH+DETXw== Date: Thu, 18 Apr 2024 04:54:34 +0000 To: dan From: John Kehayias Subject: Re: [bug#69461] [PATCH mesa-updates v3 00/13] Update vulkan-sdk to 1.3.280.0 and add directx-shader-compiler. Message-ID: <87sezj1da0.fsf@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69461 Cc: 69461@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dan, On Thu, Mar 28, 2024 at 11:54 AM, dan wrote: > This updated patch series update vulkan packages to 1.3.280.0, which is > released a few weeks ago. This patch series also drops the unified versi= on > number, and each vulkan-sdk package now use their own version number. Wh= at's > more, the version number is reverted to the old numbering style, dropping= the > prefix from the version number. > > I tried to enable tests for vulkan-validationlayers, but it seems the tes= t > crashed. I kept the test-enabling code either way. > > dan (13): > gnu: spirv-headers: Update to 1.3.280.0. > gnu: spirv-tools: Update to 1.3.280.0. > gnu: glslang: Update to 1.3.280.0. > gnu: spirv-cross: Update to 1.3.280.0. > gnu: shaderc: Update to 2024.0. > gnu: vulkan-headers: Update to 1.3.280.0. > gnu: vulkan-loader: Update to 1.3.280.0. > gnu: volk: Update to 1.3.280.0. > gnu: vulkan-tools: Update to 1.3.280.0. > gnu: magic-enum: Update to 0.9.5. > gnu: Add vulkan-utility-libraries. > gnu: vulkan-validationlayers: Update to 1.3.280.0. > gnu: Add directx-shader-compiler. > > gnu/local.mk | 1 - > gnu/packages/cpp.scm | 5 +- > .../patches/glslang-install-static-libs.patch | 61 ---- > gnu/packages/vulkan.scm | 262 ++++++++++++------ > 4 files changed, 181 insertions(+), 148 deletions(-) > delete mode 100644 gnu/packages/patches/glslang-install-static-libs.patc= h > > > base-commit: a223b1e52ba1db89b11a670915e8c9af3c3ac4af Done starting with ded6c9a692a9a4f5b21e7db9b75c967736bc2b34 in mesa-updates and in master with 2d5736cc3e869fadd2592cc13a8d332fac63b144. Except for the last patch, as that can be done separately so I hadn't looked at it. I think, since nothing else is using directx-headers, that can just be a bare origin input (e.g. an input where it is just that origin source) and used like that. Some minor stylistic stuff (synopsis can be shorter, change "used to compile" to just "for", double spaces in description, maybe long lines? didn't check yet) but otherwise I think is fine. Thanks for the great work on the vulkan updates! John From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 11:11:52 2024 Received: (at 69461) by debbugs.gnu.org; 7 Jul 2024 15:11:52 +0000 Received: from localhost ([127.0.0.1]:48996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTYN-00028z-KP for submit@debbugs.gnu.org; Sun, 07 Jul 2024 11:11:52 -0400 Received: from fhigh8-smtp.messagingengine.com ([103.168.172.159]:50059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTYK-00028i-Uy for 69461@debbugs.gnu.org; Sun, 07 Jul 2024 11:11:50 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 509CE11402BC for <69461@debbugs.gnu.org>; Sun, 7 Jul 2024 11:11:39 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sun, 07 Jul 2024 11:11:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1720365099; x=1720451499; bh=LTuMjn25BdLpVeUA6xG49 uvhyYAanwMfFtRR4FI5I68=; b=PWt9tMYAgoA+OyE4LfEZOp2L5wuXq4Dx/2KMC puK1hFGd2DLCKOrj0cKPuyRYokng1NfclM93Xl/fiY2GYjCBpRYYGiUk9yDK0g1Z X4DHCD9+rn6slSitEc27EGMA4vP9x8uqRRCF2je5deuDQcBSQlpcd5yQs4Qut7zO U6Ea6rnLcMOUo0d6kNOaFyiPSvboEm7VKRTcHfUUXHbm9DmUz1EZFt36IEVAIwbl nk52z/91f6gxiiq651PFnoIe1tNH68NuYsixxQoxx4Oxdr+pmMTpiCP9m253d+eG Ef7BsgFsnUZo7qwnXFPOmmlVKQYwXwPrNVm5lCFtL87dxxI/Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1720365099; x=1720451499; bh=LTuMjn25BdLpVeUA6xG49uvhyYAa nwMfFtRR4FI5I68=; b=i3zHWIOojSy7tpSc9shq4bKA1h4NdM9jtQRfwRkqNiMc P5ZrGv7O89Q5P8qIsOuRD5qmZ0XJmal+pdOgbl5rl3sz5s+U05+67GdQ3bzGhX/4 cYrXVhxeYMpaoyeNxkIepnNMQBazBZ1KN3i4zzxsWigoOHL4xIJlGOkdjpYtlHO6 7/rEdthxdUxQtEd23FSC2tmMgEYaL1m9wztg+HKf1jVOySgMln93L5ZH2qUtQLAY +kk10LraaKEWYOXQLTZjq22zTF6wBMBOuIAcYS8IelJTMNvuTBPj1Iu2sfr+ASmp 3v3jvzlxqy/hy62jL5tjjHF7qKemhsVKuPlptk6vWg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehgdekjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghr nhepudeugfekvedujedutefgkefhiefghefffeehledvtdffheetvdejveekjeekgfekne cuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Sun, 7 Jul 2024 11:11:36 -0400 (EDT) From: dan To: 69461@debbugs.gnu.org Subject: [PATCH] gnu: Add directx-shader-compiler. Date: Sun, 7 Jul 2024 23:11:14 +0800 Message-ID: <28e69dd9147a8e24ece2216f46bb15201b2b0a6a.1720365035.git.i@dan.games> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: dan , John Kehayias , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69461 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vulkan.scm (directx-headers-for-dxc): New variable. Change-Id: I6e81f59ebd7122c007cce2df820359c055df5fd9 --- gnu/packages/vulkan.scm | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 25542c1e06..61d49c7b2b 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -44,7 +44,9 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages version-control) #:use-module (gnu packages wine) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define-public spirv-headers @@ -642,3 +644,66 @@ (define-public vulkan-utility-libraries (synopsis "Utility libraries for Vulkan developers") (description "Utility libraries for Vulkan developers.") (license license:asl2.0))) + +;; directx-shader-compiler depends on an old version of directx-headers. +(define directx-headers-for-dxc + (let ((commit "980971e835876dc0cde415e8f9bc646e64667bf7") + (revision "115")) + (origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/microsoft/DirectX-Headers.git") + (commit commit))) + (file-name (git-file-name "directx-headers-for-dxc" + (git-version "0" revision commit))) + (sha256 (base32 "0c7l2xdsbr132ga2nyqjhz9xa42dxvhh9idjxnl673mz5kab1j6h"))))) + +(define-public directx-shader-compiler + (package + (name "directx-shader-compiler") + (version "1.8.2405") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/microsoft/DirectXShaderCompiler.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19rc3nb32ic0bz2vc3nbpb5lw3dh63vnpf2jvdk131m6j7kwbi4k")) + (modules '((guix build utils))) + (snippet '(substitute* "CMakeLists.txt" + (("add_subdirectory\\(external\\)") + "find_package(SPIRV-Tools REQUIRED) +find_package(SPIRV-Tools-opt CONFIG REQUIRED)"))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-G" + "Unix Makefiles" + "-C" + "../source/cmake/caches/PredefinedParams.cmake" + (string-append "-DSPIRV_HEADER_INCLUDE_DIR=" + #$(this-package-input + "spirv-headers") "/include") + (string-append "-DSPIRV_TOOLS_INCLUDE_DIR=" + #$(this-package-input + "spirv-tools") "/include") + (string-append "-DDIRECTX_HEADER_INCLUDE_DIR=" + #$directx-headers-for-dxc + "/include")) + #:phases #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install-distribution" + make-flags)))))) + (inputs (list libxml2 spirv-headers spirv-tools)) + (native-inputs (list git python)) + (home-page "https://github.com/microsoft/DirectXShaderCompiler") + (synopsis + "@acronym{HLSL, High-Level Shader Language} shader compiler") + (description + "The DirectX Shader Compiler project includes a compiler and related +tools for compiling @acronym{HLSL, High-Level Shader Language} programs into +SPIR-V.") + (license license:ncsa))) base-commit: c86a07bacc2469e7a00fbc66cfe4f322e4bafb06 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 07 10:43:24 2025 Received: (at 69461-done) by debbugs.gnu.org; 7 Jul 2025 14:43:24 +0000 Received: from localhost ([127.0.0.1]:36331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uYn40-0007ko-IR for submit@debbugs.gnu.org; Mon, 07 Jul 2025 10:43:24 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:49846) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uYn3y-0007k7-0v for 69461-done@debbugs.gnu.org; Mon, 07 Jul 2025 10:43:22 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 1E00EBF; Mon, 7 Jul 2025 16:43:16 +0200 (CEST) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id mpknv5brtuFV; Mon, 7 Jul 2025 16:43:15 +0200 (CEST) Received: from jurong (p-gweduroam01.u-bordeaux.fr [147.210.179.67]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 45AFE2E; Mon, 7 Jul 2025 16:43:15 +0200 (CEST) Date: Mon, 7 Jul 2025 16:43:13 +0200 From: Andreas Enge To: 69461-done@debbugs.gnu.org Subject: Close Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spamd-Result: default: False [-2.90 / 15.00]; NEURAL_HAM(-3.00)[-1.000]; MID_RHS_NOT_FQDN(0.50)[]; BAYES_HAM(-0.30)[75.00%]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; TO_DN_NONE(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Action: no action X-Rspamd-Queue-Id: 1E00EBF X-Rspamd-Server: hera X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69461-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This has been obsoleted by later updates. Andreas From unknown Fri Aug 08 22:53:46 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 05 Aug 2025 11:24:27 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator