GNU bug report logs - #69461
[PATCH mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix-patches; Reported by: dan <i@HIDDEN>; Keywords: patch; dated Wed, 28 Feb 2024 17:30:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.
Changed bug title to '[PATCH mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler.' from '[PATCH mesa-updates 00/13] Update vulkan-sdk and add' Request was from dan <i@HIDDEN> to control <at> debbugs.gnu.org. Full text available.
Changed bug title to '[PATCH mesa-updates 00/13] Update vulkan-sdk and add' from '[PATCH mesa-updates 00/13] Update vulkan-sdk and' Request was from dan <i@HIDDEN> to control <at> debbugs.gnu.org. Full text available.
Added tag(s) patch. Request was from dan <i@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 16 Mar 2024 16:10:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 16 12:10:12 2024
Received: from localhost ([127.0.0.1]:56373 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rlWbr-00054l-J9
	for submit <at> 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 <i@HIDDEN>) id 1rlWbn-00054K-PH
 for 69461 <at> 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 <at> 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: <xms:NcT1ZZUjRy2SUQDCs01yHXcr6y_vxFaTgr5MZc5HX2T_n_Z8h3aF_g>
 <xme:NcT1ZZkglHy4FL_kJcSi4qv2PZ1PE38Ec2zspcaTy6PL16WKFsxgtPjarmohYq55m
 -Zx7z9g1RwLwf-vusM>
X-ME-Received: <xmr:NcT1ZVavx9KHx3FYfZK7uMWSuxWmseffoOU8nHYPvXTe4bpjTWgZjS5fkfVqIc4B7z5vLGDnZac>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrkedvgdeiudcutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:NcT1ZcVXuKJ_3sQRc3KwmlPlbkR04PnTXUB2YvwjvArNWUOb3Y1nTA>
 <xmx:NcT1ZTkhOONSa0Nzb7-vnX894WS_jTIuEKU5lOa4XOOaILg7gVph7A>
 <xmx:NcT1ZZf3MbzcY2Zy54jlzjUexUXXP8H_y-GYmYPFiVJkPQXlUaraIg>
 <xmx:NcT1ZdGmian6cqulJGXiryVZ9jOoXgtHWQldiKcc_kxa-x_cYG75ew>
 <xmx:NcT1ZYy85heEh2prcIW5UDEVj93vpL4HBbMdMzVAHmH_pK4lCi_RrA>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Sat, 16 Mar 2024 12:09:24 -0400 (EDT)
From: dan <i@HIDDEN>
To: 69461 <at> 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: <c2f04c1084b0be75c8e8749caa066d3e587d670f.1710605074.git.i@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1710605074.git.i@HIDDEN>
References: <cover.1710605074.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 16 Mar 2024 16:10:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 16 12:10:08 2024
Received: from localhost ([127.0.0.1]:56371 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rlWbo-00054W-4u
	for submit <at> 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 <i@HIDDEN>) id 1rlWbm-00053w-10
 for 69461 <at> 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 <at> 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: <xms:M8T1ZeMGLKcvgd2048hMf43HNvavWrXU6nA9pQjjji4xOwL77H-f9w>
 <xme:M8T1Zc_8KDdBBcCKvEXZyH2CS5BLY4IDfqvNfLXz9wOMXjVbZD9kop6qKHMdEf5DH
 83WKlNWFgkA5kAwEV4>
X-ME-Received: <xmr:M8T1ZVT2ydeeelYX6Rah1_mmqa14WqMfPiNfPjzgbu5EA5nlj4VBI1wk3eruOgEr42vUUekHrQc>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrkedvgdeiudcutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd
 dtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghr
 nhepkefgtddvfeehueeufeeiveffgedtkeefudfhudfffeehgfehtdejjeelkeffueekne
 cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggr
 nhdrghgrmhgvsh
X-ME-Proxy: <xmx:M8T1ZevFoIZl2dalUecMAlCubQPpZ4VG1r4PHsNa6n8xhV3T7EGPSg>
 <xmx:M8T1ZWcrLT-3N64UJ93S0P0RrHjPFcGcnO8S-uB5k8uUb-EOvNZwoQ>
 <xmx:M8T1ZS2hFFFdB4nsWMRCRjSYoT0PHFnSpupAVYLk8NAMb7K3g77gBQ>
 <xmx:M8T1Za-fsBw-3MUXarkwqA5iCIafg-c5MOaryT2xBOdY1yhIxSg6Pw>
 <xmx:M8T1ZXqedS5hllXhrw4Xj2bGWHeDzTWmQFYgsuVHAK8PJWQM2UPO0Q>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Sat, 16 Mar 2024 12:09:21 -0400 (EDT)
From: dan <i@HIDDEN>
To: 69461 <at> 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: <cover.1710605074.git.i@HIDDEN>
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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 5 Mar 2024 05:21:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 05 00:21:15 2024
Received: from localhost ([127.0.0.1]:45666 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rhNEo-00074z-GW
	for submit <at> 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 <liliana.prikler@HIDDEN>) id 1rhNEk-00074b-Jj
 for 69461 <at> 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 <at> 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: <f299fc0b5c8452a153f8d52d68dbd0d6e54066ca.camel@HIDDEN>
Subject: Re: Should commits rather be buildable or small
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
To: John Kehayias <john.kehayias@HIDDEN>, Ricardo Wurmus
 <rekado@HIDDEN>
Date: Tue, 05 Mar 2024 06:19:32 +0100
In-Reply-To: <87jzmhad9s.fsf@HIDDEN>
References: <mcickgfi73ljvgxa7krdtuobuvfo3lvr5d67zqke2f2fbjj4sj@tutctuqoy7ce>
 <6bcc9412f092c20fbd7f8326dbf91e90cef0eed1.camel@HIDDEN>
 <baafvkmdhdyeevcd6jwric4qg7e7g5lmfq2f7lhzp3aumxh3ow@3bnc5vcgab2w>
 <gEmbDrP9RU_ma3QZhdh48YVQLx0pJOOQD6tTmJoKeLFy6sk4e1KFw9dghtlhpJHzMoH_oD2m1ZHLBEIDHuipH06WYgyxneeVSPoMZvb5g5g=@lendvai.name>
 <875y16c54b.fsf@HIDDEN>
 <SXjFmdTgxwHYE-Z6t7SZOykuXMBiD454EF2uad96jGQemgJ6hXki_f1C7VxVHKHa4b7_j5UwJmffh_FiQqEz_bIYIBn9tpG4s9F7W1eIDAQ=@lendvai.name>
 <f8d3e60b-c9b3-4d0a-b86d-2727bf823335@HIDDEN>
 <GguxiSN_Lv_4jViqwqV61-fUsXnseiVE17jgGed3W1vORceYk8hapZ6nLMnmLRinhtK9MJP2q7TupcheaYxdqvh62fWrUnYfPtj6szQ4D24=@lendvai.name>
 <87fs09ar56.fsf@HIDDEN> <87jzmhad9s.fsf@HIDDEN>
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 <i@HIDDEN>, Philip McGrath <philip@HIDDEN>,
 Saku Laesvuori <saku@HIDDEN>, 69461 <at> debbugs.gnu.org, guix-devel@HIDDEN,
 Attila Lendvai <attila@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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




Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 5 Mar 2024 04:33:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 04 23:33:30 2024
Received: from localhost ([127.0.0.1]:45627 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rhMUb-0005Dc-EU
	for submit <at> 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 <i@HIDDEN>) id 1rhMUW-0005DB-QZ
 for 69461 <at> 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: <xms:b6DmZZHyqKbtvE9G8njYXSuUteWmmaVVe0fHDQ472K0dt_6nLQYD2Q>
 <xme:b6DmZeWpf2O2h1WW3CVrPR-XJsrhOIejBuVfUBqHZ6YEQKzikkSRNHwjUEyD8IWK-
 gCF9KIG6H0P9zDDtME>
X-ME-Received: <xmr:b6DmZbJsezw89bpaKinLRV-_UT5Nw9f5UpaxVmHoCNGfPkbZu4_5isisw8FNNH7veaqyqHl1rhEh1b69__3In6XaN78>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrheekgdejtdcutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc
 fjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepuggrnhcu
 oehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpeekveduudehhfdtgfffff
 ehhefgvefgjeegveetveefhefhledthfefheevtdeivdenucevlhhushhtvghrufhiiigv
 pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:b6DmZfGfMHmjWJe75aCcYpwdgtuHDoBGirN9X-_dppJrrao2lHjhDw>
 <xmx:b6DmZfVj1vUOeH2gQp-9yQxxCCQFb9YP4uQiMOutJcifKRoheV9PJA>
 <xmx:b6DmZaNJ2WZPoqpqt90kb65IAckNhzXDFTEmvplPoLlS07k-7_hXQA>
 <xmx:b6DmZbrlhoq9VNxvQyXqNHlj2xwBsSw1EBtTErXeTFfbkJPR-KOEWbHiF30>
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@HIDDEN>
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 <john.kehayias@HIDDEN>,
 Ricardo Wurmus <rekado@HIDDEN>
References: <mcickgfi73ljvgxa7krdtuobuvfo3lvr5d67zqke2f2fbjj4sj@tutctuqoy7ce>
 <6bcc9412f092c20fbd7f8326dbf91e90cef0eed1.camel@HIDDEN>
 <baafvkmdhdyeevcd6jwric4qg7e7g5lmfq2f7lhzp3aumxh3ow@3bnc5vcgab2w>
 <gEmbDrP9RU_ma3QZhdh48YVQLx0pJOOQD6tTmJoKeLFy6sk4e1KFw9dghtlhpJHzMoH_oD2m1ZHLBEIDHuipH06WYgyxneeVSPoMZvb5g5g=@lendvai.name>
 <875y16c54b.fsf@HIDDEN>
 <SXjFmdTgxwHYE-Z6t7SZOykuXMBiD454EF2uad96jGQemgJ6hXki_f1C7VxVHKHa4b7_j5UwJmffh_FiQqEz_bIYIBn9tpG4s9F7W1eIDAQ=@lendvai.name>
 <f8d3e60b-c9b3-4d0a-b86d-2727bf823335@HIDDEN>
 <GguxiSN_Lv_4jViqwqV61-fUsXnseiVE17jgGed3W1vORceYk8hapZ6nLMnmLRinhtK9MJP2q7TupcheaYxdqvh62fWrUnYfPtj6szQ4D24=@lendvai.name>
 <87fs09ar56.fsf@HIDDEN> <87jzmhad9s.fsf@HIDDEN>
From: dan <i@HIDDEN>
In-Reply-To: <87jzmhad9s.fsf@HIDDEN>
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 <philip@HIDDEN>,
 Saku Laesvuori <saku@HIDDEN>, 69461 <at> debbugs.gnu.org,
 Liliana Marie Prikler <liliana.prikler@HIDDEN>, guix-devel@HIDDEN,
 Attila Lendvai <attila@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 4 Mar 2024 21:39:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 04 16:39:38 2024
Received: from localhost ([127.0.0.1]:45064 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rhG25-00032p-O4
	for submit <at> 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 <john.kehayias@HIDDEN>) id 1rhG23-00032a-45
 for 69461 <at> 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 <rekado@HIDDEN>
From: John Kehayias <john.kehayias@HIDDEN>
Subject: Re: Should commits rather be buildable or small
Message-ID: <87jzmhad9s.fsf@HIDDEN>
In-Reply-To: <87fs09ar56.fsf@HIDDEN>
References: <mcickgfi73ljvgxa7krdtuobuvfo3lvr5d67zqke2f2fbjj4sj@tutctuqoy7ce>
 <6bcc9412f092c20fbd7f8326dbf91e90cef0eed1.camel@HIDDEN>
 <baafvkmdhdyeevcd6jwric4qg7e7g5lmfq2f7lhzp3aumxh3ow@3bnc5vcgab2w>
 <gEmbDrP9RU_ma3QZhdh48YVQLx0pJOOQD6tTmJoKeLFy6sk4e1KFw9dghtlhpJHzMoH_oD2m1ZHLBEIDHuipH06WYgyxneeVSPoMZvb5g5g=@lendvai.name>
 <875y16c54b.fsf@HIDDEN>
 <SXjFmdTgxwHYE-Z6t7SZOykuXMBiD454EF2uad96jGQemgJ6hXki_f1C7VxVHKHa4b7_j5UwJmffh_FiQqEz_bIYIBn9tpG4s9F7W1eIDAQ=@lendvai.name>
 <f8d3e60b-c9b3-4d0a-b86d-2727bf823335@HIDDEN>
 <GguxiSN_Lv_4jViqwqV61-fUsXnseiVE17jgGed3W1vORceYk8hapZ6nLMnmLRinhtK9MJP2q7TupcheaYxdqvh62fWrUnYfPtj6szQ4D24=@lendvai.name>
 <87fs09ar56.fsf@HIDDEN>
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 <i@HIDDEN>, Philip McGrath <philip@HIDDEN>,
 Saku Laesvuori <saku@HIDDEN>,
 Liliana Marie Prikler <liliana.prikler@HIDDEN>, 69461 <at> debbugs.gnu.org,
 guix-devel@HIDDEN, Attila Lendvai <attila@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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): <https:=
//issues.guix.gnu.org/69461>. 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 <attila@HIDDEN> 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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.
Changed bug title to '[PATCH mesa-updates 00/13] Update vulkan-sdk and' from '[mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler.' Request was from dan <i@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 18:12:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 13:12:02 2024
Received: from localhost ([127.0.0.1]:59289 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfOPR-0003Us-NX
	for submit <at> 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 <i@HIDDEN>) id 1rfOPP-0003UR-9K
 for 69461 <at> 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 <at> 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: <xms:GW7fZRgWeMX_Y7fFf3uN46No7grjQlBr0spdLzl0RvC_pA30Ii9Meg>
 <xme:GW7fZWAUEW4IoPzSyk0_7jn9BruvjIZ29hUNsH5PMIFjHIAm4_VNJ5618pvgqWrL0
 dYqK_AZmMmpSqq40xk>
X-ME-Received: <xmr:GW7fZRFFdDWMonT2jZ-4zFIoECQCOIgSq6VsKOxTKWSFEymj_9alFHy6QHksvrqrPMusNecV5i3b>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:GW7fZWQaHucwk7zQx097jyRFr_eKF_teLCiKdU0S0odC8UFxYxm4Lw>
 <xmx:GW7fZezY-rsoIwI0otBgIvOwH46HL4bHP4IbPHbZ2TpuO1gp3AF2zg>
 <xmx:GW7fZc4AKYtz345qf071EXNNw8UlDj3RLfqqAD8NcAG3aSGCtfrCRQ>
 <xmx:GW7fZUaTpM019dl_3gJP84SK907TM01ZsywWm4E9XshRGaTQNcmMlA>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:07 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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: <c6c671c2036f69f04571e0ee7d3f74f38b2bb7c3.1709140055.git.i@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:55:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:55:23 2024
Received: from localhost ([127.0.0.1]:58006 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfO9J-0008P0-Ur
	for submit <at> 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 <i@HIDDEN>) id 1rfNwI-0007gP-At
 for 69461 <at> 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 <at> 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: <xms:Hm7fZTznHoSNUY1LDq8dWMfICHX2AzkO4_s8haddic5wymYztgjTtg>
 <xme:Hm7fZbR4LoDEPCAERN0FedrZJl4lViN6-7FLcP0STGy0FfTb50lkqw0eB30LPEMhm
 um2PTHTbFH6R4Bblcs>
X-ME-Received: <xmr:Hm7fZdV0i6mIaTkS_n8BpY8HxIEAEDO0piKla55DlQgIXI56NmemL3qcj9cvcmUFoexIRCq3FuI6>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:Hm7fZdiIlyoc-ZaJ1pYKPbPd9D-xCDjlImwCuJDfgnfgKhMrN3xn3g>
 <xmx:Hm7fZVAY2_q7aINWd54PWmOHOYAIdW0PQAZdD3UbAWMTbwksVMYU7g>
 <xmx:Hm7fZWLWx_FjqOw4SrIMEhQSOm5EfbvVDTNeFZpzCzrTnKe2YwRK5g>
 <xmx:Hm7fZS7XFaYRPpA6bvqPeO8eAxFgmbBUgNncaHaYV4oDu5jCp7-1ehqSNeU>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:13 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:42:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:42:02 2024
Received: from localhost ([127.0.0.1]:57057 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNwP-0007hN-KK
	for submit <at> 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 <i@HIDDEN>) id 1rfNwJ-0007gc-KY
 for 69461 <at> 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 <at> 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: <xms:NW7fZdqRMXzOUSYfolxWMRM6NbMDq_MFjaA0UkrnuBa8izi0_LdeJQ>
 <xme:NW7fZfoREzNPDFfiwvQ86DT2XSqpnyAo-ydpDKrwhU5DKfR6N9X1l4Y7CO64Bklbv
 JvUVVE3nBTLxm-7SdQ>
X-ME-Received: <xmr:NW7fZaObHTfVBz8Xf-I8GrDdAW17Jvd5fbUy7puLAY0VC_a4GvPhq2KH4K3reuxKqZ0VYB7XSg_W>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:NW7fZY4ilyo8VApOVkZtSQNRtq3svDDLJWlXDyhIi2SmetGFrMInig>
 <xmx:NW7fZc4OkSZcD-JotGgk-jyGSt7q_cWxZJbtxg_XKESwk-6-ou1Apg>
 <xmx:NW7fZQj-3ok_l9CjGiuN02Kx2R0J5kPD99-lmY3PNZObGmc9BMKkuQ>
 <xmx:NW7fZaSxzqdoIyjeAOHyBAEBhSnAxX0-fc7njT41dDqVlwUmGTCt8b5KPIU>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:35 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:33:29 2024
Received: from localhost ([127.0.0.1]:56388 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNo5-0007Ga-1M
	for submit <at> 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 <i@HIDDEN>) id 1rfNnt-0007F9-0s
 for 69461 <at> 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 <at> 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: <xms:N27fZd2zRPSMHW2okef-3BUu1IEZV9onCCMM2pzg8Qa-YZsKsXMrkw>
 <xme:N27fZUE_i3gilrxb3p3aOyGhuplirEqsEoyRGqNGYirqnYs8cdQGVOT_-RVNmgi2u
 9y4Egl4mBlGaPDfWkk>
X-ME-Received: <xmr:N27fZd6sahMS3pjvp9GgMtog9UEGIE6VGqrJDBaLDVGWkYLg5vPiWro_GitWneqlfMzyAy_51aeq>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:N27fZa16RkEnoOgM5B3bD0VLyqS6iVrn9gVxkUnltZJGyhkk6Nj55w>
 <xmx:N27fZQFu-XagC-mnUXHMfWxQ214wD-zFBSqLNQFcfEU_TyVvreJX2Q>
 <xmx:N27fZb9Y24h2surZlEm9GJ-GRNwu4Et3Wfor-62rktZ0b8lDCGBgOQ>
 <xmx:OG7fZbNHgcg8j-RlPOsp-oS3yQb9chO1yUp-ZJWh43lueJq_gmdjiA>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:38 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> debbugs.gnu.org
Subject: [mesa-updates 13/13] gnu: Add directx-shader-compiler.
Date: Thu, 29 Feb 2024 01:31:46 +0800
Message-ID: <cf35dd023dbe78296d8972113c03c9a221b25a7f.1709140055.git.i@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:33:11 2024
Received: from localhost ([127.0.0.1]:56366 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNnq-0007Fb-J9
	for submit <at> 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 <i@HIDDEN>) id 1rfNnn-0007Dz-Dj
 for 69461 <at> 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 <at> 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: <xms:Mm7fZRh8I7mPCNZUfC2MfnrpYiOOqD79pFGVeuhO3sUfZZwm99WNEQ>
 <xme:Mm7fZWCCrzNiTVMX2R1XZSfFLeDpjVEqOSj9fbhvjhzuzXXZXngySEXpW5T4CxnMz
 Vnx7_Js-NPR7jjfqeI>
X-ME-Received: <xmr:Mm7fZREbvRhl--8QxbMt0KCL5xg7yq8P2yy5wlxpKVLDgOlgKV0Jf5uSVjB7oefV0S-wzy0jrDuC>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:Mm7fZWQ4ZWXJwIxTtLfgzc-EsmCY4jtSRQzWCsK-bUmJwOS6Zr-tsA>
 <xmx:Mm7fZeyeNg3DimuQYYIiGAkJi4_YMO5aqn6qbAqnyY7HlkQay_rRZg>
 <xmx:Mm7fZc5OgF1QnZ7rHWWvxreGmsy3MFoid9qpb_qSjhBVmU-FTB22CQ>
 <xmx:Mm7fZTps3U26KztHOGXvI-5bod1WOEzrPXth5S3api1f2WyC4tr3XSq5eFo>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:33 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> debbugs.gnu.org
Subject: [mesa-updates 11/13] gnu: Add vulkan-utility-libraries.
Date: Thu, 29 Feb 2024 01:31:44 +0800
Message-ID: <baf76c85e2751d6d157c16fa2f18dbbd00798fcb.1709140055.git.i@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:33:10 2024
Received: from localhost ([127.0.0.1]:56364 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNnq-0007FT-7w
	for submit <at> 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 <i@HIDDEN>) id 1rfNnl-0007Df-0g
 for 69461 <at> 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 <at> 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: <xms:L27fZbs7RCkMwgyHIng4Mo4PdgVLINORclSXFmEW0P7xsdjwTeO7UA>
 <xme:L27fZceMEWIicgkayHmDqjm9kO3kt0m2Xw6GpJeFH4hsj-ff1SJ4oVQIwSkW0vOtU
 MnXOpyftQs_ASH30lw>
X-ME-Received: <xmr:L27fZewSyNa_I_UogTgMCC1b4bmW4OIbyd2k_MhjervRaYGWSjTOGVbTuL4bU1Pqi6SGNQEWMwF2>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:L27fZaOCo5LCAkUgPyL2mAQccGs4vqCxAFYDS1CVSULGQHyTc6Gqhg>
 <xmx:L27fZb_VhFtWPMJWjYw0g7j9ON7Vd8HWoKA9zuiwK4XNt86jLWgy5A>
 <xmx:L27fZaU4k35DIYwRiA31N0vRTuGQwsxHzrrvWWoUzBRYdndw1lWcwA>
 <xmx:L27fZYEh9Gv33i5FaKcp9JiSip-aTQvERJs6NerKFV4t_kDJSEuy_Q>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:30 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:33:10 2024
Received: from localhost ([127.0.0.1]:56362 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNnp-0007FM-Rg
	for submit <at> 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 <i@HIDDEN>) id 1rfNnh-0007DB-Rr
 for 69461 <at> 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 <at> 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: <xms:LG7fZQw9SWp4GjJhaM87wwCzRmCrRYDS8Ta_1zYX725PaB-9t585NQ>
 <xme:LG7fZUTiDQWrnoP0t95kcN4_cyLsJ_5iJXsZ64R9f7K2-4GZkpVsMAx5u6fKIYxAk
 8qHUVj5X_InD8ZEbTA>
X-ME-Received: <xmr:LG7fZSXHQiZegd7P_TnGjBYHR9_SltCxOou4hvf33-Qfx6ZBE5Vsj__vALNo4rzBRZyHZssLXsSY>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:LG7fZeh0WToP3tgUTilFPbS6_mukvdfk6ZA9D2YbA8s54J0KUq8W_g>
 <xmx:LG7fZSD7Qmkx3EWNuJhisVH1ihecEee0EqxJVHDkH_MXwhbeelhQBA>
 <xmx:LG7fZfJIisEJ3skPhZUHWZE_OuQHTtFD8YnrBVu02VGk3W20f2Jm2Q>
 <xmx:LW7fZT41Ay4oM9pUJ4XVAaIAnU7P5w1oKYHLnqxQJBnyqmvhYnHhWRo0UOU>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:27 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:33:09 2024
Received: from localhost ([127.0.0.1]:56360 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNnp-0007FJ-9f
	for submit <at> 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 <i@HIDDEN>) id 1rfNne-0007Cr-KH
 for 69461 <at> 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 <at> 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: <xms:KW7fZf8mU8oh2LtL0o4llPgqKnx7Hwqwkipb3Zkc-43dKrYdWl1jvA>
 <xme:KW7fZbvQejf6UT9oETNya-GgapQgxbC3mn5hp21_0xFYObbOqnmMLwTLgT3ONyAjI
 yp5x5XAUiORW-EZsgo>
X-ME-Received: <xmr:KW7fZdA5l4QrFZCzqG2e0zCjS29GwSOg5N2McS9sjrrSh070ZHFXr0pH248bi-r9qShfMH1794d8>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:KW7fZbfp90LeuoCwlQ7qRWAjpLIpThI5724ghgy_kAbYpjpSWNbN9A>
 <xmx:KW7fZUOxgKI_pFu8ngdx0DDtpCT_WHmabo7d6nDtoaNjKgE80tyj_A>
 <xmx:KW7fZdlHuNQNdygsOFGPoC1RwYf8qbNnPgAbX3NXNja9Y1g7k72uqg>
 <xmx:KW7fZe3U5yeftfVaRJ7hndFhkqREgwN1MEk1iN-hBceM6XcERXsvru6Q9hw>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:24 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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: <e243df7347ea70fe1d27c860e9a326dc0f3626e8.1709140055.git.i@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:33:00 2024
Received: from localhost ([127.0.0.1]:56337 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNnf-0007DS-4E
	for submit <at> 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 <i@HIDDEN>) id 1rfNnb-0007Ce-Ql
 for 69461 <at> 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 <at> 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: <xms:Jm7fZU1vOok_CkzL2pRrPQkEXABcAtXYYhDIIqcNyvTpwGpIRhdukA>
 <xme:Jm7fZfGt0pbwVWnWiXr0NLXiTJYn5ZIr_wQj90VBjl0iCOm8wOqAtEwXR-so-awAq
 CS_pa9Netqdxhyg8tU>
X-ME-Received: <xmr:Jm7fZc7ths-PCArD71rxS5eRdebq0-fTWfcy3jyEWpSCg8tdFMcvvTdmVbdHUJCDqlOf_kE3gltZ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhepudekheduvdejjeduhedtgeelveffledvuddvkeehhffftdelhedvkeekveegve
 einecuffhomhgrihhnpehgihhthhhusgdrtghomhdpphgtrdhinhenucevlhhushhtvghr
 ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:Jm7fZd3A5bgYB8-pzPkcQtPlx6Om_doAXYgfZktUHAX8YmCvXiJLkQ>
 <xmx:Jm7fZXFwGdNB-JFE_JPFZBwmtNXV1NHFhEQzFU6OgSbQJijL5ZS4iA>
 <xmx:Jm7fZW8C7eNxaGrTyyaB4XiJ0qpnOwMGKSY9XCw-x1AXi3eUekDA_g>
 <xmx:J27fZdMqr8aZMWr7p2w-ysgCSKjSWf_Z_rjwVzoFWVnNdLBamuOguWDEC78>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:21 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:32:59 2024
Received: from localhost ([127.0.0.1]:56331 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNne-0007DL-LE
	for submit <at> 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 <i@HIDDEN>) id 1rfNnZ-0007CN-1i
 for 69461 <at> 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 <at> 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: <xms:JG7fZfgBPV3Vvk48ElOEJRe8D5WtOErp3URanfXtspZArGDJzfykmA>
 <xme:JG7fZcDCVKtTDmoISFWAqPnRo6oD4ryUQW9Sb91TR44WYzCxG26PEqhjAppdKu0qW
 8zfSHx4Gdlx78b37vU>
X-ME-Received: <xmr:JG7fZfHDbxqKODVDpBDVtaTNxqUnKkQBnaJxENykP9-hul8G2v-wweAKU82BWOv5xE11QurYTqqK>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue
 dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu
 necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs
X-ME-Proxy: <xmx:JG7fZcRfsJB7RG_15hf_AaN9NoLPPXWwb55HBAQ2pXI9Inp5deOfPg>
 <xmx:JG7fZcyiFo4i5lm2onK-5HNDeWoIfdp4J-Dvf8kujgbnEsBpKnAITg>
 <xmx:JG7fZS413VJUV_u5nDM-3A72vi8mfnl9fyr7ckQ6sIOhBrHZ24FSrg>
 <xmx:JG7fZZof4uD609HJYCnZwR5eZATmDE1AfXN3cUFGZyxTMjNWPewVa75phHI>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:18 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:32:53 2024
Received: from localhost ([127.0.0.1]:56316 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNnY-0007Cp-Tj
	for submit <at> 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 <i@HIDDEN>) id 1rfNnW-0007C8-BG
 for 69461 <at> 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 <at> 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: <xms:IW7fZQQmPjt2rXPjFfUU3H0hA5gb_9GZY_VJVBFwSZRMI4pvLPY2fA>
 <xme:IW7fZdzjQ9sVk-scLLVKw4HNkBAbQRnJDJLNwPz5goelzxthtQArNtlhGjVaoNmJO
 wSydtpNBcjxYkQjn6U>
X-ME-Received: <xmr:IW7fZd0E0Chsbupf8ZhqtRdIXXaFAicIBbuuaJVTBvc5sm8rXQaA2FwFk0vtZvF5FDg_lk18LApi>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhepueevieevgfduieduhfethfduiedvueektdeltdeutedvhffhfeetfefhgefgfe
 ehnecuffhomhgrihhnpehgihhthhhusgdrtghomhdplhhunhgrrhhgrdgtohhmnecuvehl
 uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh
 grmhgvsh
X-ME-Proxy: <xmx:IW7fZUAMkKvt0mE-yn71uohOFybVRf2Jw5H2RV5Sx0xODIdT-OSFvw>
 <xmx:IW7fZZh7mn7bk4vYl6cuYeeV5S7qRE8T03W_LCIioo0zyzCh0NXqCw>
 <xmx:IW7fZQrM1_M9nwQ7ZxgcEI4YalnbMXMs2amW2bXtIVYF1RFoXaSknQ>
 <xmx:IW7fZZZfxDXFOjV62CU3ffnnlL7JTAzU4Y4uGI8FddIXKi_WQBBsNM7aC7E>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:16 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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: <https://github.com/google/shaderc/issues/470>.
-       #: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"
-               (("\\$<TARGET_FILE:spirv-dis>")
-                (which "spirv-dis")))
+                      (substitute* "glslc/test/CMakeLists.txt"
+                        (("\\$<TARGET_FILE:spirv-dis>")
+                         (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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:32:48 2024
Received: from localhost ([127.0.0.1]:56309 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNnT-0007CM-P3
	for submit <at> 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 <i@HIDDEN>) id 1rfNnQ-0007Bl-V7
 for 69461 <at> 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 <at> 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: <xms:G27fZVXbhIyF5u1-E7eGTNdHSjsF3AaUYrYuRyEcfG9TD9LfmcYXoA>
 <xme:G27fZVnd8WGR_YJvO3b_RoOvQ4ziCwVqE8PvsPEzeEP88WK0lenAhi9vcnqTdphGi
 kFUbEwHiYLMwmxe_zo>
X-ME-Received: <xmr:G27fZRaNRTTwliLe4qVxdd82hRR2qaIRUvGKI1y9ysChwD_BIsxWyPSx4vNRMDQsdYH0AUsDvOl->
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht
 vghrnhepkeehfeelieeghfegiedugeeufeegieekvefhhfegheeiiefgvdefheetgeefhf
 dunecuffhomhgrihhnpehgvghnthhoohdrohhrghdpghhithhhuhgsrdgtohhmnecuvehl
 uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh
 grmhgvsh
X-ME-Proxy: <xmx:HG7fZYVCiicN2yLYBR0KHh3QB-ZoturJgYvMr0DEvsWkSzI-SgMQlQ>
 <xmx:HG7fZfmUgfKyJPDAL9K-LiW2L0hK6ySbISmgZl4W7bcZFjdQ9iwp-g>
 <xmx:HG7fZVfAdnEwY076ZrCwkHAFhIQOobWe20PaiSsEdiTW6o32cagy_w>
 <xmx:HG7fZXs5s0sJyLJKbX894s2yrpzzuJWpREUAhDxv44C25wR3qSdOPb4KxIo>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:10 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 69461
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at 69461 <at> debbugs.gnu.org:


Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:32:42 2024
Received: from localhost ([127.0.0.1]:56295 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNnO-0007Bw-63
	for submit <at> 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 <i@HIDDEN>) id 1rfNnL-0007BZ-Kr
 for 69461 <at> 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 <at> 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: <xms:Fm7fZYH6fZPex0JJ0w_4GSxCFxw4XIdR6SrTYV644UKDEymEBTI94Q>
 <xme:Fm7fZRWrlRDh2jJ5YV64AVjmTrwxChNuFP-S_p0BBwoFc7z5FsoSt8iQsiChQITth
 onkXVUfIHoCD3LoWUA>
X-ME-Received: <xmr:Fm7fZSIOK2xUztdipT0I-eGgKGyo1l1Ek6iH_GQpWB1dBJTTxbz62ni768gYVr-5WthDawIBw8AM>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre
 dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght
 thgvrhhnpeekgedvvddtjedtuedvtdffheehgeekveekhfetffefkeelvddvieeggefgke
 eludenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgep
 tdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh
X-ME-Proxy: <xmx:Fm7fZaH8QoWd7GzaYm-ByxuKZKFBkmnFuuJv-EeIzx_WHF_J8VtQ2g>
 <xmx:Fm7fZeX6Lasl6mwWqw_B_jxaG4i_HR9r0fuc6nE0UYGQfI_wt88dtw>
 <xmx:Fm7fZdMtAJQw2MBYEVzv2hP74r5JqRVe9EtsB6pWW9MOcj4smNXPKA>
 <xmx:Fm7fZRebJmbfkfrce7d-2-HlKZHJEMBE-lmB0aHrYU206kNhnYR1t0HGV1Q>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <69461 <at> debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:05 -0500 (EST)
From: dan <i@HIDDEN>
To: 69461 <at> 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@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1709140055.git.i@HIDDEN>
References: <cover.1709140055.git.i@HIDDEN>
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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <marius@HIDDEN>
 ;;; Copyright © 2021 Mathieu Othacehe <othacehe@HIDDEN>
 ;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@HIDDEN>
-;;; Copyright © 2022 dan <i@HIDDEN>
+;;; Copyright © 2022, 2024 dan <i@HIDDEN>
 ;;; Copyright © 2023 Zheng Junjie <873216071@HIDDEN>
 ;;;
 ;;; 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





Information forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 28 Feb 2024 17:29:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 28 12:29:25 2024
Received: from localhost ([127.0.0.1]:56053 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rfNkB-00070f-OY
	for submit <at> 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 <i@HIDDEN>) id 1rfNk6-00070O-8K
 for submit <at> 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 <i@HIDDEN>) id 1rfNjX-0004OO-Vb
 for guix-patches@HIDDEN; 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 <i@HIDDEN>) id 1rfNjV-0001AK-51
 for guix-patches@HIDDEN; 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: <xms:Qm3fZSknsHes399K4lXWQ1i5PktMg6CuGarniLfYYMWQCTwBdV6z8g>
 <xme:Qm3fZZ2e8SjhP5aremP_b9IqrWjk1CRfsmDb_xTHdMTzO5CXGGoCpXosKez-fhIbN
 QGytHsh_FNgS2yv2aw>
X-ME-Received: <xmr:Qm3fZQrvfdkTUbN8xwPCITl_ANtwhTWtPSUIVQNUJpX7mmeqyAMR7uvGWUjiCnUmkya1Vf3itfHz>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgggfestdekredtre
 dttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv
 rhhnpeevfffgvdejkefhkeejvdeltdeugfeiveejgeehudfftdevgeeujefhueefgeevve
 enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegu
 rghnrdhgrghmvghs
X-ME-Proxy: <xmx:Qm3fZWkvfQ2OZN0r5tcSkGSbro0-SVYczu8HfOlofT6GLpAubWmsRg>
 <xmx:Qm3fZQ1K9TVtU1JVTOShESTdkd9gmu_zEY0K2fYygd-GROFGxtc8jQ>
 <xmx:Qm3fZdvR2mT2iWcuJahUnwYSMEEsAT_8zZpaNbNUW7TPzENfBKObgw>
 <xmx:Qm3fZeCrSNEwCwNZ0Z44URbdf0vC0TS-oufYcsxHbVL7BQ1QRsfloleGCXM>
Feedback-ID: i3b5946ed:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed,
 28 Feb 2024 12:28:32 -0500 (EST)
From: dan <i@HIDDEN>
To: guix-patches@HIDDEN
Subject: [mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler.
Date: Thu, 29 Feb 2024 01:28:24 +0800
Message-ID: <cover.1709140055.git.i@HIDDEN>
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@HIDDEN;
 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@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Acknowledgement sent to dan <i@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#69461; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Thu, 21 Mar 2024 09:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.