From patchwork Wed Feb 28 17:31:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61222 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 32F8227BBE9; Wed, 28 Feb 2024 17:33:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 65B7427BBE2 for ; Wed, 28 Feb 2024 17:33:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNnR-0005Dk-W6; Wed, 28 Feb 2024 12:32:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNnJ-0005C8-25 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:37 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNnI-00021P-OW for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNnj-0007E8-13 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 01/13] gnu: spirv-headers: Update to vulkan-sdk-1.3.275.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914156227654 (code B ref 69461); Wed, 28 Feb 2024 17:33:02 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:42 +0000 Received: from localhost ([127.0.0.1]:56295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnO-0007Bw-63 for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:42 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:33635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnL-0007BZ-Kr for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:40 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.west.internal (Postfix) with ESMTP id 29DCC1C0008F for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:07 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 28 Feb 2024 12:32:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1709141526; x=1709227926; bh=CPkhoYJtDp/lndhKX4XFe9mSvA3KUsL5vubC4C56JpM=; b= VyIpqCvRTLi34bgO34BCdE3HRA71v5zdjGXdOamfsvN691BwhAUQ1G04NUc+Fhvv LunpgZuYAC44kynJfD2eDShB+xwUjj7WN+jU34wbhhrX25SHn9F+AIM/dl16bNUf WmEO1yajRTDUK9Zs4BSSTh7/h9csAe9OhSGx7pDTi3Nz0sIBITu7r91udG1u6WVu ZcVTpJvPXFLAd/rd8xyBIoy4R2YGi9jd9bHIIzsyDG0TJtW6ewBGoENUzHO4rurx 7Sw6AiHZynq/GC7aGRLhlRAOI7g092oqX1l0obZd13za6KdlRYIcJ7y/g78esG2/ HjOY92L/dcE7eux2tLTFIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1709141526; x= 1709227926; bh=CPkhoYJtDp/lndhKX4XFe9mSvA3KUsL5vubC4C56JpM=; b=Q wcDpu23F1L2AzGWzgitIU0S303qwLG5vmc9jlF7mpIBKGTrha7IRj6v1Rm0gQjEZ wnhUQ5l/RHy2kVX6qUAgNqUXh1VQ+VPHoR10cYzq5mCw3vAF9P3tu5cNVbhpkn3t m+oV+zZ55RDCvxeSb5Y0sJOY8SL+liQ3CLHUyvwK/zrorT3TsdSxizM9stD4JMfe 9kNDgyeRPIu0z0ic7ZhLQqLtjkeDyt25uhpHRZvJwwyopbVjzWaORC97pHvErIBS xgL/a/k0WqRsvyXrak6Ytr9ktAdBrkVMvFeyb3NuI20AsJVWRaCKxctjk6jiaaIO fF7aWFWwmFXGTi+Nfaghg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpeekgedvvddtjedtuedvtdffheehgeekveekhfetffefkeelvddvieeggefgke eludenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:05 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:34 +0800 Message-ID: <6925020499c96ba08bb9cf59615c6ec96a4f24cd.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vulkan.scm (spirv-headers): Update to vulkan-sdk-1.3.275.0. Change-Id: Ibe72c71d0d269f1e3bddba1d880a4d5fce8ed4a9 --- gnu/packages/vulkan.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 285d6be7f5..2fb1884795 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2020, 2023 Marius Bakke ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata -;;; Copyright © 2022 dan +;;; Copyright © 2022, 2024 dan ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -47,7 +47,7 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages xorg)) ;; Note: Remember to change vulkan-loader version when bumping this. -(define %vulkan-sdk-version "sdk-1.3.231.1") +(define %vulkan-sdk-version "vulkan-sdk-1.3.275.0") (define-public spirv-headers (package @@ -60,12 +60,11 @@ (define-public spirv-headers (url "https://github.com/KhronosGroup/SPIRV-Headers") (commit version))) (sha256 - (base32 - "0z8b485hryya2g0jxv7amwg3fjj7pchbgnsa5ldf5fwgh5js0icm")) + (base32 "18gr715ap9w1rjvzd6l9pl9lwfqiikm2la5apv2lplj4a0k5v3zw")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ;no tests + `(#:tests? #f)) ;no tests (home-page "https://github.com/KhronosGroup/SPIRV-Headers") (synopsis "Machine-readable files from the SPIR-V Registry") (description @@ -76,10 +75,11 @@ (define-public spirv-headers @item JSON files describing the grammar for the SPIR-V core instruction set, and for the GLSL.std.450 extended instruction set. @item The XML registry file. -@end itemize\n") - (license (license:x11-style - (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" - version "/LICENSE"))))) +@end itemize +") + (license (license:x11-style (string-append + "https://github.com/KhronosGroup/SPIRV-Headers/blob/" + version "/LICENSE"))))) (define-public spirv-tools (package From patchwork Wed Feb 28 17:31:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61233 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0FD7127BBEA; Wed, 28 Feb 2024 18:13:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,TVD_SPACE_RATIO, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C85C327BBE2 for ; Wed, 28 Feb 2024 18:12:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfOQ4-0000rv-Bj; Wed, 28 Feb 2024 13:12:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfOQ1-0000r2-Hh for guix-patches@gnu.org; Wed, 28 Feb 2024 13:12:37 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfOQ1-0000HV-92 for guix-patches@gnu.org; Wed, 28 Feb 2024 13:12:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfOQQ-0003YS-Q8 for guix-patches@gnu.org; Wed, 28 Feb 2024 13:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 02/13] gnu: spirv-tools: Update to vulkan-sdk-1.3.275.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 18:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914392213460 (code B ref 69461); Wed, 28 Feb 2024 18:13:02 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 18:12:02 +0000 Received: from localhost ([127.0.0.1]:59289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfOPR-0003Us-NX for submit@debbugs.gnu.org; Wed, 28 Feb 2024 13:12:02 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:33913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfOPP-0003UR-9K for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 13:12:01 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id DCA853200AC5 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 28 Feb 2024 12:32:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141529; x= 1709227929; bh=oLstWkLmwgQ7WVDooldvxfjJPlV6ioZYi5U4C4/G4CE=; b=s +epHOFduhs6ctbzKziSjJwTL8pGmaBV+sqzLaoPmxGVSC0YWz2s1WYyx+jXO9mXJ Px6tze8/IZ4J/4DwqoU5hcK3+CExXtsBSR15m1viWiYt1XG4BT7jNczJcY/br7ko 5oOSAEpITMWbJgImI+n7hZJYYSqgHgJGNZrBA+1XTkr0Gx8DDKHuMPX16gByrkyh AaymFTTkX5a9yIl6QtWlK8nZQa1XWo8i1HPO4pTaCGQBjhj65lgTTENDWhgtaBrc V+TJiATltDKt2bOjyH8KwaHkwXlzMaLmX/hDlFGx22vV1dlsoorMzCYtARzs2vdl Ar8ofgm6EVXH7QYq3Crtw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141529; x=1709227929; bh=oLstWkLmwgQ7W VDooldvxfjJPlV6ioZYi5U4C4/G4CE=; b=rZ7ddfN372Y/gr9L5wd+j4hPiGjE+ R/GZbKSvSYhpXcVxBEB/Wa32qoSiI0sCndbb9qIpGQh3B0NKVKUjymV72RVd086X THGPc7syFPmZa4iUa9S3UbzjTONESvOVpA9CIxfFHcnkTjYe5CIipltbaZbP9eZA j15j6Rxi60oPk38H/pIbQT6C8Dl7q394bYR0XZpU5f8tcgYSeOyTHZ96j82EY5vB 7vYf3TeNPGBzITqTltmcUmaw6OfdD3R8QcLvD/HwCiKTuUnH5CIgyKnUCdPsNEOQ BBkpzE+VqvAo6mtMOc7QPt/X7W73NfOVMst/xtE5+tf/ynxhyQvsxWlmQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:07 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:35 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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") From patchwork Wed Feb 28 17:31:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61223 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E820527BBEC; Wed, 28 Feb 2024 17:33:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 39F8127BBE2 for ; Wed, 28 Feb 2024 17:33:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNnO-0005DD-7w; Wed, 28 Feb 2024 12:32:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNnJ-0005CC-CS for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:38 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNnJ-00021U-42 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNnj-0007EI-OU for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 03/13] gnu: glslang: Update to vulkan-sdk-1.3.275.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914156927685 (code B ref 69461); Wed, 28 Feb 2024 17:33:03 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:49 +0000 Received: from localhost ([127.0.0.1]:56309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnT-0007CM-P3 for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:48 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:49427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnQ-0007Bl-V7 for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:46 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id 98F4F1C00091 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:12 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 28 Feb 2024 12:32:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141532; x= 1709227932; bh=5oyZ2a0juuvfvFQhXhPhQD+8NjQs5vHcMeQJyZtphcY=; b=t O9D851tLwQhlFYMbUxDfxJJvushAYFkvMVAh9oeWonehG4m5gd4JRNg7mkz1vivP qVnmqa6aYJAD0x+SXgb7a8xjursmnc/fBALWH8iMfRZ7PdrExIsiQAc2Ffs2ZgaP LcssEav2VwX6+IvD7DAyp/tKXKFqjCQFWaLnnDX0YBh100r/yWZe683ijy/tFL1T OeT32HfosOAiqSPKSTkvAlHMdkoV0wDytHEyirymhUCoK9Qq4/MOLXe5Wslvu5E7 JZ/tkl6w9oOgKFSsDlN7VrzsMyUTt7czpwsZj3cfC8bEL7lwPYPGb8K1DrvrkFYX eOKhHvo3NPkv4uPSMW7wA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141532; x=1709227932; bh=5oyZ2a0juuvfv FQhXhPhQD+8NjQs5vHcMeQJyZtphcY=; b=YcvX7ZWCf8zerhB2VOIEoRQ6OmYG8 EpM/eLbQv7A/nasvjVKQVzDjMdFhA6NQ1YznEMsBPzv5pzMazBNqEppJUL3NTq0f fvMEi4OaDuKtu1Ermub1UStjlmzQkd9fnUb2R85PvqZuaOF9O/+8L4oeydb3jHK9 qLvN/+k8s18X4PwVXww4LKv8uQa0lD0gFcnjrhZT+21+BgPDvJ4J4euuH/As/+ah LoLB0klvh/2s5YPQ1UVmOH7U6UUVQs5a1aWGPGZHcmyVIX2amUN3GGWNql3NhJm2 G55hzlwkoIU9wfR8A/gM/aeTUjwnASX+V3wwOFofpEKL+OVTCZxrShQ4Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepkeehfeelieeghfegiedugeeufeegieekvefhhfegheeiiefgvdefheetgeefhf dunecuffhomhgrihhnpehgvghnthhoohdrohhrghdpghhithhhuhgsrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:10 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:36 +0800 Message-ID: <61fa2d39ac8f0fce6be8946887cd19d136b3d7fc.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 From patchwork Wed Feb 28 17:31:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61232 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 387D427BBEA; Wed, 28 Feb 2024 17:55:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,TVD_SPACE_RATIO, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D989327BBE9 for ; Wed, 28 Feb 2024 17:55:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfO9a-0003GH-3r; Wed, 28 Feb 2024 12:55:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfO9X-0003Fs-Tu for guix-patches@gnu.org; Wed, 28 Feb 2024 12:55:36 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfO9X-0002tI-JV for guix-patches@gnu.org; Wed, 28 Feb 2024 12:55:35 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfO9y-0008R7-5z for guix-patches@gnu.org; Wed, 28 Feb 2024 12:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 04/13] gnu: spirv-cross: Update to vulkan-sdk-1.3.275.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914292332310 (code B ref 69461); Wed, 28 Feb 2024 17:56:02 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:55:23 +0000 Received: from localhost ([127.0.0.1]:58006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfO9J-0008P0-Ur for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:55:22 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]:57643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNwI-0007gP-At for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:41:58 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.west.internal (Postfix) with ESMTP id 3A4521800084 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:15 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 28 Feb 2024 12:32:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141534; x= 1709227934; bh=sS8Bxd4BpFZwrqUGFkUpbIs8tSiTQsJhw0lkwMLUD3Y=; b=F UFsHZJaTp813956j2CINq0CMwx2oTh/nG/UDK9l4jmb7TSRmQUepmGKOnxAQS9Oy SG5KqECbcmXlACXJ51nCpMuys6LpMldaIHd518rYiJzWpC2O4z4R6JHpaW6Qcxu0 LHPzok8Z8xizUjuxh0fFO/jaTlNUBo6xU29daXT3LBZLVCWTUcsbhGGis4DcazLi OKa+1if4Bf+i+s1LeWq7SBJwv/alOe0hea2+z5JKg40bqKJlfIDl+lc9kCmAA1Lu Or/FSrc0GMuYfqh+2Gib/pSNsVffX9jmXtcxojKlyoQQ61jTRPcHpbiqwZWdW9/w GDjlSpmbxUo4fuHj/Pz9w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141534; x=1709227934; bh=sS8Bxd4BpFZwr qUGFkUpbIs8tSiTQsJhw0lkwMLUD3Y=; b=rw+8uNkkeroiNbdGByfldEm1uKmx9 bG/YSx6ICI2kYVubJ5V0PeuvSztiriJgeZxc8Nsggd18GsnwuyGa25yGJA7FfI0+ BR/Ie1Sab4ouVzkyXl7qpboRwzmSwA4nHyy6sgfeVDZVCx8HQgR5CLZKznpbe6YS Q+uma5x5qC+hyrJdvELzB0mrtuXY0GOdd1o+xSvk0tzPEE+0UIaPpEui+XmCH6Fl FtjogacGKVZY82TiWf9P4QriDI/nCAGvaYpg0ENQWIb2oqlDPnNFD2yPqCqQsZCk dFtni3TyzRkl2FEDkyOLj15CU7R0k5ZN3qCJgmO3833Hufejs5zo1NT4w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:13 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:37 +0800 Message-ID: <363af38c9a04e02d0ee1485732e7342ff551896d.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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") From patchwork Wed Feb 28 17:31:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61220 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 67C6B27BBE9; Wed, 28 Feb 2024 17:32:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E33027BBE2 for ; Wed, 28 Feb 2024 17:32:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNnN-0005D6-Hb; Wed, 28 Feb 2024 12:32:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNnJ-0005CH-Ui for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:38 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNnJ-00021e-MN for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNnk-0007EP-9h for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 05/13] gnu: shaderc: Update to 2023.8. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914157327710 (code B ref 69461); Wed, 28 Feb 2024 17:33:04 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:53 +0000 Received: from localhost ([127.0.0.1]:56316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnY-0007Cp-Tj for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:53 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]:58771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnW-0007C8-BG for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:50 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 040D0180008A for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:17 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 28 Feb 2024 12:32:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141537; x= 1709227937; bh=cGm53XoSBpmO6RnQUjYsL2duH7mKSmNQkXIyZGKK24o=; b=m pvIIYcqsVrqojOVL8oozVmIDVbj5BmjTGYjq79CnqFNvFXQm9R5+fB/CwB6g1yTS 30S0/ZWFDsvY50vOvb7IGGhM1xslgfK4B0foU2sh3VMJiwrLH6XWnpaDCbrlo77/ ibN8POLuSVsCzhb1awsBomr2ugeAyJqmf6uVF6jy8n+Nj0B6QPpyglVHjS8bSAiQ YxwkCtzItxUZ+hd7Wp43P3HuqPv7yjHB8Z/6FNlGxtSx4e4PkQdG0fSoQ5H2IDL3 Jv1iWq96lQpsgCPF+usqIMvC+nEdY6TyZZYJCVTX17ZUP/VCSwfvb8p/vCrmRX87 BbxitoJmsVaYXJr88CaCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141537; x=1709227937; bh=cGm53XoSBpmO6 RnQUjYsL2duH7mKSmNQkXIyZGKK24o=; b=FX2Hor3fIzXPBSLhIzqrtDV4MmPG0 aXdyfq69alBum8jnbdATrP6qaX9IZJgLkXoQ4ZYajN4ZIBLjQ4UFvPQTx8ui40+3 AGQkztPHiHw/wgkGOX40UUgmmPlwWGxgBRuIjllSLqdGBU+k61a1C/s2JKAavuAU gUXnjCp8LaXxnEoKC3oiH/ZYM6+adZCH/gt5uQt4g6ALJAK4VRWONa73D/HD+6uE CxLuGjV1fHAGKJh63ClMfUOU0wcewbuVs4afKPX5YWINGSpQQ/SCoOCTPP3qeD9m 7niUsEBiYX4D3PU9cz58Z1/o0Y3buCs4Ea5TCwwbycJhsClFpbG+gERRw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepueevieevgfduieduhfethfduiedvueektdeltdeutedvhffhfeetfefhgefgfe ehnecuffhomhgrihhnpehgihhthhhusgdrtghomhdplhhunhgrrhhgrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:16 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:38 +0800 Message-ID: <3e30ab660277e638f54846fab8c10ef298107114.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vulkan.scm (shaderc): Update to 2023.8. [arguments]<#:configure-flags>: Specify python executable. <#:phases>: Remove drop-additional-glslang-deps phase. [inputs]: Remove python. [native-inputs]: Add python. Change-Id: I1babcabf0be17c6a6237d30fad9b8dcd7a2d2ccf --- gnu/packages/vulkan.scm | 77 +++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 12baf52f92..38f723bd91 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -355,7 +355,7 @@ (define-public shaderc (package (name "shaderc") ;; shaderc doesn't follow the versioning scheme of vulkan sdk - (version "2022.3") + (version "2023.8") (source (origin (method git-fetch) @@ -364,53 +364,46 @@ (define-public shaderc (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d")))) + (base32 "0cs36p1y2269gjfv75fvs43ymsapmc8gsy2n91jnaqs3mpgqkjbk")))) (build-system cmake-build-system) (arguments `(;; FIXME: Skip most of the tests, because enabling system gtest breaks ;; the build: . - #:configure-flags - (list "-DSHADERC_SKIP_TESTS=ON" - ;; Note: despite the name, this just specifies the headers. - (string-append "-Dglslang_SOURCE_DIR=" - (assoc-ref %build-inputs "glslang") "/include/glslang")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-look-for-bundled-sources - (lambda _ - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(third_party\\)") - "")) + #:configure-flags (list "-DSHADERC_SKIP_TESTS=ON" + ;; These two flags are copied from: + ;; https://sdk.lunarg.com/sdk/download/1.3.275.0/linux/config.json + "-DSHADERC_ENABLE_SHARED_CRT=ON" + "-DSHADERC_SKIP_COPYRIGHT_CHECK=ON" + "-DPYTHON_EXECUTABLE=python3" + ;; Note: despite the name, this just specifies the headers. + (string-append "-Dglslang_SOURCE_DIR=" + (assoc-ref %build-inputs + "glslang") + "/include/glslang")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'do-not-look-for-bundled-sources + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(third_party\\)") + "")) - (substitute* "glslc/test/CMakeLists.txt" - (("\\$") - (which "spirv-dis"))) + (substitute* "glslc/test/CMakeLists.txt" + (("\\$") + (which "spirv-dis"))) - ;; Do not attempt to use git to encode version information. - (substitute* "glslc/CMakeLists.txt" - (("add_dependencies\\(glslc_exe build-version\\)") - "")) - (call-with-output-file "glslc/src/build-version.inc" - (lambda (port) - (format port "\"~a\"\n\"~a\"\n\"~a\"~%" - ,version - ,(package-version spirv-tools) - ,(package-version glslang)))) - #t)) - ;; see: https://github.com/google/shaderc/pull/1276 - (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps - (lambda _ - (substitute* "glslc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc_util/CMakeLists.txt" - (("OSDependent OGLCompiler") ""))))))) - (inputs - (list glslang python spirv-headers spirv-tools)) - (native-inputs - (list pkg-config)) + ;; Do not attempt to use git to encode version information. + (substitute* "glslc/CMakeLists.txt" + (("add_dependencies\\(glslc_exe build-version\\)") + "")) + (call-with-output-file "glslc/src/build-version.inc" + (lambda (port) + (format port "\"~a\"\n\"~a\"\n\"~a\"~%" + ,version + ,(package-version spirv-tools) + ,(package-version glslang)))) + #t))))) + (inputs (list glslang spirv-headers spirv-tools)) + (native-inputs (list pkg-config python)) (home-page "https://github.com/google/shaderc") (synopsis "Tools for shader compilation") (description "Shaderc is a collection of tools, libraries, and tests for From patchwork Wed Feb 28 17:31:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61219 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 32ADA27BBEB; Wed, 28 Feb 2024 17:32:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DFC6B27BBE9 for ; Wed, 28 Feb 2024 17:32:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNnP-0005DS-DT; Wed, 28 Feb 2024 12:32:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNnK-0005CW-IT for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:38 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNnK-00021n-8x for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNnk-0007EY-Sp for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 06/13] gnu: vulkan-headers: Update to vulkan-sdk-1.3.275.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914157927748 (code B ref 69461); Wed, 28 Feb 2024 17:33:04 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:59 +0000 Received: from localhost ([127.0.0.1]:56331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNne-0007DL-LE for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:59 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]:48847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnZ-0007CN-1i for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:53 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.west.internal (Postfix) with ESMTP id B332F180008B for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:20 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 28 Feb 2024 12:32:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141540; x= 1709227940; bh=cWuPkGctHh5zvKobE80J3d6JzZHfh2oYXBeKrE9dWDk=; b=j bIsq6iKgd/ohX6iQ92J/d9WghaBTPzSxokuVODvWvyrm2AatesVTd/RijhHVTjsA kJHPSdoa5NtiT+twiKCkE7wx9MYbMESG46iUe4FHP5kdVXa47UUeMPAy4S3HOLLh /qi9GrK61YSuREyS7LODzTIBttZxD27PIj6+Izqnm63wxRc814On5yaHeuvQo2sf V0J/xil0qd3/lbrj8uT8xqjqYzGr+0PAlmHDrssW7bLhhlZZBOlVEIao1WK5S8wl QCNDBRJ5+2t8CnuDEoZgSR4yoaqE1G8SM6tE5qQwYQ8Srik37fqPpiiRkB9DTZq9 9drwSG82ZxjMsRFneRylQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141540; x=1709227940; bh=cWuPkGctHh5zv KobE80J3d6JzZHfh2oYXBeKrE9dWDk=; b=Uaj/dsBplBi1LvpznFDCmNXkIpWhb iPY0VhMzP6vG0Y1hUfGz4Q4qqSABRAZPEUav+Js/nKBbVV4m4gtEFyWRb+CFh0LX KKz0snIcGmDRluQQ8s4xLOJZVo/ywNI2xc33zZ7hgFpIjlHrANSpdyFnrIp78b+6 tEep+S2sqBWgXk5T1Y5mEFhoO8tE3j8Unq0SzCAGnrBGaUajnD9j4d8eNyz7m0wJ YH4/oRABCkcQQn32DtVrDcxQSIeNlLNJ28RTp2qRF+aI5lF+p/F0rGeftojospaa iqci8vS3wGujMGPfea3WikyynPTUSUpvJoppm0PZjhbzapDefmaIpDFpQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:18 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:39 +0800 Message-ID: <62d151e6c27c8f56ebaf6b034183a59483d3ab4c.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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.") From patchwork Wed Feb 28 17:31:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61221 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3830927BBEA; Wed, 28 Feb 2024 17:33:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6307E27BBE2 for ; Wed, 28 Feb 2024 17:32:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNnP-0005DW-Ei; Wed, 28 Feb 2024 12:32:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNnL-0005Cr-BM for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:39 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNnK-00022A-OM for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNnl-0007Ef-Ak for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 07/13] gnu: vulkan-loader: Update to vulkan-sdk-1.3.275.0 Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:33:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914158027760 (code B ref 69461); Wed, 28 Feb 2024 17:33:05 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:00 +0000 Received: from localhost ([127.0.0.1]:56337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnf-0007DS-4E for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:00 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:50943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnb-0007Ce-Ql for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:56 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.west.internal (Postfix) with ESMTP id 7C76C1C00084 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:23 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 28 Feb 2024 12:32:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141543; x= 1709227943; bh=hCu+MciDf/k7Xb8B2H//k+erTsR2Ap65+g2nJu1lEBU=; b=T /AfM3eaS2xc3c9OEQHcX5Udb7zohplvFVojH2GQT0+uPBnDCaOKEbozBRK7LAyDj U/soO8tssDzVehC+plewM2zG0NEshX+sUAqXxNgKP8GvB/ULOn6FhzOKadgH+6vr i2OUvjcw/ekWjeyB9F/tKgYNU2CCu/zR0Kkz5pY2pE8rPC/iiVBsafcJbckQC1R8 Cx+eH893M/tppBue11tZLfJh7SIfg1vnV7F+bUvnjpPl2X1P/CwphrJCBAf+j0Ie 6TAJIJK94DZX71PxPwfSgYGN8QtKY36lOJq4RpLR6U5akHrLre+8b+g8aysOjDSe Tvgmd7GG9eISdN5CAyTTw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141543; x=1709227943; bh=hCu+MciDf/k7X b8B2H//k+erTsR2Ap65+g2nJu1lEBU=; b=CDsDoZUcRIeANC1cFtiTKSMj9Ry6k v/HGjqfDDiO2cKdZO2cNHlMcZ2CMR3EmtYFs7YeFOOUfUEUB8lafc9kZuTab/ZAo yn96hRZZOhO6MC7xq38+soxtyCOVOcvjlX8fJaIT1CE4PPJW14WToN+LXuPA5zdh tK3o4hbuTsABfkkrkhtbHYtlCAxryL+1h+RXrb1tbcxT3zl6MFSFy9HRreNhftmR rZrWad27pmPZFbEdkP9RFxd7KZV4RCqsAl55imQ6ANjs9Ub1ykvaqbA1gPPvBLxZ LYGF8eb5IsuS7vRykh1FzKE/LDmd+ezqOOnic9d37o1d94TzT9uLhM1lw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepudekheduvdejjeduhedtgeelveffledvuddvkeehhffftdelhedvkeekveegve einecuffhomhgrihhnpehgihhthhhusgdrtghomhdpphgtrdhinhenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:21 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:40 +0800 Message-ID: <8f806fbbb811debf1f63899fc8a882b4ac8ec723.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 From patchwork Wed Feb 28 17:31:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61228 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DE74327BBE9; Wed, 28 Feb 2024 17:34:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 07AA527BBE2 for ; Wed, 28 Feb 2024 17:34:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNoI-0005jJ-O5; Wed, 28 Feb 2024 12:33:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNoG-0005i2-I3 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:36 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNoG-0002Fs-A5 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNog-0007Ih-UZ for guix-patches@gnu.org; Wed, 28 Feb 2024 12:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 08/13] gnu: volk: Update to vulkan-sdk-1.3.275.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914159027863 (code B ref 69461); Wed, 28 Feb 2024 17:34:02 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000 Received: from localhost ([127.0.0.1]:56360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnp-0007FJ-9f for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:09 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]:51169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNne-0007Cr-KH for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:58 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 4B8D21800085 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:26 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 28 Feb 2024 12:32:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141545; x= 1709227945; bh=F3Z6W+JHSG4aIkPwWiu84pAFAiI4fS3ltSLFHmh7ITc=; b=C ewgMcRVYV7JrFIExKkXoEoF6CR90tbbttbl2CiS9YZYJuKM2bCYOIjVuxPhEaI+G TZlzDD+u7ZE9PElvX3cUVRpxx/syt9m6eAgJEWubQewnq1DJN6HYtv+L2FYcpfwB dbdb7IZS464zKex1GR4GcutQoHUS/RHZz7FcCfaSXGiE3nhX2Dk+vgcf7NFgkb1W S8Gxqe6G8sDx7cAxr/OnA4fTIwKr1BFI0wRJNibbUYOQPR6UBAU5e9X+ES0bxOQ8 QnaskmQ5Gh1qHN7bId/XeIkyKHOPr/O/Bq+0D8+cKXxX+RJ1x+pavy24ijhTBLh9 djULd4FG00soORmnskaWw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141545; x=1709227945; bh=F3Z6W+JHSG4aI kPwWiu84pAFAiI4fS3ltSLFHmh7ITc=; b=Yz6ryEhHiLI9ypkj+xUUy3oTAW952 KNfYwtJxvid2nJieKPFxN3Fax92JqlcuYRrBnjzvgTOP94sboXfmKpSKNMJhAEkX hBTdSFWLsrrQCs+mAtPgAHOBmQiWDm5QdsA8DdC0B8O8ZFf+Hwj8MHn0AJEfLSb5 GSXT958IJNQwsG91T3HxXzMESVi0j6SyFA4wBqj30+ab6cKdQg8EArPby1l/im0T shPNPqQKfTJFIrVaw1f13DCXJmBCY+Cw00tC3WiSbR/ebnAB1AL1938gXU9C6s2d QcNwpoIbb2iOSBYL3vtkolSS2BQzPwH5HoB+PBV5LCF9i7KvRmkEbwJvg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:24 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:41 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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") From patchwork Wed Feb 28 17:31:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61227 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 093F427BBEA; Wed, 28 Feb 2024 17:33:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3AC0427BBE2 for ; Wed, 28 Feb 2024 17:33:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNoM-0005mE-GB; Wed, 28 Feb 2024 12:33:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNoI-0005is-09 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:38 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNoG-0002Fx-SJ for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNoh-0007Io-Eu for guix-patches@gnu.org; Wed, 28 Feb 2024 12:34:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 09/13] gnu: vulkan-tools: Update to vulkan-sdk-1.3.275.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914159027870 (code B ref 69461); Wed, 28 Feb 2024 17:34:03 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000 Received: from localhost ([127.0.0.1]:56362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnp-0007FM-Rg for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:10 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:33665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnh-0007DB-Rr for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:02 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailfout.west.internal (Postfix) with ESMTP id 802FA1C00090 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:29 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 28 Feb 2024 12:32:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141549; x= 1709227949; bh=c/4ySSE17nbkcXoGuvRjP9rZZqEn6Vfq/zjwdX6g/tU=; b=C EFLQWQfXQw7lAEG2HsCxJ+0caJ8gzycttnbKgbKv1FCcFoHs5AieAVo+sGu2+vnd uJsH4z1orVC+fcxHptxCn+E38QirK/BQfOfjtJtb1EnbEApjd2E3Mr6N9GPqWwux F3nDetvAP+yD613bfzN2S69kBSqhuJGV9lgvw+WcIyy1O7kCMMil3ZPdhgsLhllH RhslgEYaruXb0IEDy37nAd76Q/8d6PHjSC4cK9FA3qxmxEE75yeMsWB5OaZsNUTy MZq3txPJl358Eb0QMgE8HQQfN0Z0FfllheodKIH6pmiWrrw+9jq74QkAOUSAxq3k JS51/4QlKilMozYnQL14Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141549; x=1709227949; bh=c/4ySSE17nbkc XoGuvRjP9rZZqEn6Vfq/zjwdX6g/tU=; b=PmIKDbfopXl5MJGTiVdK1PpLoz5BY unY0RNVkJ+B8Ldepu0fiZgVY1c4Hvm650CCKnMmQhd7Urj4irqf3ZahQO4XW26xj C52nX3SU2MEWZlIeDvCbV6IVIKieE8xCOeN4i7lzkVc3nOxhtCqzrZagmyDBKxNj tO8eJ54M30q+OT6Nne74W2oR1Rc9t1ZHuiVZfidesTdL0r0brCes1kt5Npf/qdiF euVS5472jMSeI5QLcv0u8uBM9mcji7RsSQaTkQ98zKmHxug6AbXdU0mLgpnz+T6G 7wnCAZDRQC8v6rIKarMzQTv/J2gkCN9U0G4J75qAtpKpWdhF1ispccKcg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:27 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:42 +0800 Message-ID: <617d4147db2b9bb37b94514cb79aaebf1fb5d5d5.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 From patchwork Wed Feb 28 17:31:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61225 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8847527BBEA; Wed, 28 Feb 2024 17:33:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0A38C27BBE2 for ; Wed, 28 Feb 2024 17:33:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNoM-0005lz-8X; Wed, 28 Feb 2024 12:33:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNoI-0005it-15 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:38 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNoH-0002Fy-IE for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNoi-0007Iw-5a for guix-patches@gnu.org; Wed, 28 Feb 2024 12:34:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 10/13] gnu: magic-enum: Update to 0.9.5. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:34:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914159027878 (code B ref 69461); Wed, 28 Feb 2024 17:34:04 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:10 +0000 Received: from localhost ([127.0.0.1]:56364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnq-0007FT-7w for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:10 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:42433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnl-0007Df-0g for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:05 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 3D2F83200AF3 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:32 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 28 Feb 2024 12:32:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141551; x= 1709227951; bh=GRkVbMvdrzFVxEyOepnwnUIy6xvVZqqzYf8tJEg5wtQ=; b=E fl5ZuCjrH51Hha4Dti/fXJMhLvCHkV2LZKzQvVZlITRroQZJvleEAizF0keRZZtw woMBu4UPfgwfHigd48wgjjhsNcnLY9uG9gzBmtY4Ee32YGVy2MqUw+pmIm2GZSD8 +3vP3vakfq6Wap50mgXsMgEC4A0fcExbSi6aAEAZA1m6R6XJbE2RGczS6Jq2QQc5 K3SGOcyhAasfb0DAGBkq66mRrrsxZNUNqUE0zK+GSRKZSMizqpnDUE/LPSdBYzaY ewX4BAWrQdkf49IZCdg18igNwAtf9oiIPYF2FYhMT0x5iYcI2jAtSoQjCo1AIh6B ocLNjtatPc5w1LdaWgBOA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141551; x=1709227951; bh=GRkVbMvdrzFVx EyOepnwnUIy6xvVZqqzYf8tJEg5wtQ=; b=iRRr9zNnUvglWiP3RMSMpsYlsp4iZ 76LHV4G9yjq1jHzYVB6QaEXSQ1F5FyYMDrU9OgWYFL+fnW/65JVZrPyDJfnVZ/BU BujFvIChKVF5Hw/agHF96j+6wLMcwX1Tjn0+6JZ7Jwk/ozzVxt+8IvwbKJSzSsUe D6vV1lm3TezQA2PP61u9/pCKusTh1NXRTOPYYUfQo3dO5quXmZf+KmIdirE8HE9e yrqwt7LshG49SPNDa6bvk1WcNflnXVrwhqyH1kAeqOKbhaTMICnP6YE9TxucAinh lb7BX+1jNFGjm+S+toPU6Qi1MfgdHlg5qUtfXUeSg4kMofQhhQfLV9WDA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:30 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:43 +0800 Message-ID: <28ec014c9c98fd17ed875d03b54daa191300e942.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 From patchwork Wed Feb 28 17:31:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61224 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7707F27BBEA; Wed, 28 Feb 2024 17:33:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,TVD_SPACE_RATIO, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CF33327BBE2 for ; Wed, 28 Feb 2024 17:33:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNoK-0005k0-CL; Wed, 28 Feb 2024 12:33:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNoI-0005iv-8e for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:38 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNoI-0002GL-15 for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNoi-0007J5-KL for guix-patches@gnu.org; Wed, 28 Feb 2024 12:34:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 11/13] gnu: Add vulkan-utility-libraries. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:34:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914159127884 (code B ref 69461); Wed, 28 Feb 2024 17:34:04 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:11 +0000 Received: from localhost ([127.0.0.1]:56366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnq-0007Fb-J9 for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:10 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:56929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnn-0007Dz-Dj for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:07 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id 18E0F1C00099 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:35 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 28 Feb 2024 12:32:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141554; x= 1709227954; bh=mC4rTcREp/ON0jJ2NKx7zjbCKK0DEG6kJMTW9wbAuEM=; b=b Ot/G2HmZ8+/GC/JBaLcLT17AYxm4JZC1FF08JveVSCnIfaVGWC1zaJhyK477KrDo d+OjgC3oR1pwPle7fQ0rJTzsnjTBJbVosIJ6/wz9DWatlb3u3syS7g4YeaDWKxim gFtu4/uNXiTDl+dOWJAXFERt962ile3cq1nZ+8Widk3vokj/fnS5aF7S5WtmICWL JAGsSMdwmF18QMyxaAgUtjKNP+bHltEKM7QgiYuJ7vycPh+TwGq7PzVQYqrNKPiZ Q5mns29BfG62yO8+ugLeibfQVoA0nGh/nKAJr8VY+LndUsCPJMcUD9M76kQRUPrQ TyibahBf+gowHRDS5Gqgg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141554; x=1709227954; bh=mC4rTcREp/ON0 jJ2NKx7zjbCKK0DEG6kJMTW9wbAuEM=; b=JQFken/BrQN9Dxi/DJCuJW4ReRfdA jgOKHWwMu7iP8ffUpLQ+VMRSNxt8pAF9fyYqqVQfy/kgEGfAh4mI2kHn0+movfpd zMS5ZEiGIflwQgcxJAQKcKZJoPB8uTgOwvWQekfv29EsEfMX9mw9/b3xtrUVLtmQ wvN0A7/XE9qbnwtEfLfCzapchisMwtcZfyQmQmZoNaSEg3fN8Zk8zgfoCVwerveV AoDKcf//9e/hwMtyKK5iQPWbB/i9jD0DRVYnbfBiV9Y049WWLpCmGkrn4VD5MF/p 9JBCxigoywO1+OsylFvX5ldkrsEHoQSiQb8OPsCkYizlGcIzHAfAqgh/g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:33 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:44 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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))) From patchwork Wed Feb 28 17:31:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61231 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B790327BBEA; Wed, 28 Feb 2024 17:42:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E35D727BBE2 for ; Wed, 28 Feb 2024 17:42:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNx0-00006P-J0; Wed, 28 Feb 2024 12:42:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNwx-000062-QL for guix-patches@gnu.org; Wed, 28 Feb 2024 12:42:36 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNwx-0005Og-Hh for guix-patches@gnu.org; Wed, 28 Feb 2024 12:42:35 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNxO-0007js-5a for guix-patches@gnu.org; Wed, 28 Feb 2024 12:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 12/13] gnu: vulkan-validationlayers: Update to vulkan-sdk-1.3.275.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914212229608 (code B ref 69461); Wed, 28 Feb 2024 17:43:02 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:42:02 +0000 Received: from localhost ([127.0.0.1]:57057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNwP-0007hN-KK for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:42:02 -0500 Received: from wfout3-smtp.messagingengine.com ([64.147.123.146]:54747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNwJ-0007gc-KY for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:42:00 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.west.internal (Postfix) with ESMTP id CF30C1C00096 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:37 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 28 Feb 2024 12:32:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141557; x= 1709227957; bh=ZriR4D8hQpB9fMFAQVvQLaNs4FH7aHEUf+eFWcsSVbI=; b=X ZKLY2dm4Rz6ROPJXA8rkuhOPmg/aY2x8wgfHDHm/pzfS3k4NcRcoVFA39UJBrE3I Vh2sryyMzw34YGm3GTQc/fvT0tW7QJ0ftpFuause3LWYiA+gkcGtgjNNT9nJTNTi wRnPbpzV2IH78/SIdUyF1R3zyQz5KXLZYQGRkCcE5OHpmfVRit9uANdWL24sWedP aommH0E5XneiWgfJyaYtwlgCnKf9D+wPgRXlLFPJYFfk/tMVk3Nc5rlx2RabFJ8u ikAd5dQ2zvroTVUyEWMtpT/O8oUaym2g7Dk7vM/8iw4SZesgErwibiBDrwyK6en5 AQBSy/Sx97Gz5aUV6TmaA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141557; x=1709227957; bh=ZriR4D8hQpB9f MFAQVvQLaNs4FH7aHEUf+eFWcsSVbI=; b=nwDRS5/O0AIGH+PcYScmMJSqZ2sMI lzAvqT07H462psGbbiooxP7d6EslTZqfE4sDgePoWjcoXsHFOZDrP6qE7yFj9Ss+ ezN9GMo3JAHd2q0G3Sbiz7udPdzTzp6TlTpphvHWMLWuhoUumH4WlChFMBhSyBdU wDrfx41oPQj+IGV/blWVEHGZ2NZD5zECQxbbH9mHxHHyCIFuA5jzP1/A6/bwsiyh 1LhntqQ7015j5slvJR0t5Au7gkyz456l30+kQ11mZJ+SING7ziuLXhkP3donZK4u XsW5X4rUMqhRsub1OfuutxjPwqNND8O/Ri5n3ZlKC7/cLdbSDDDSiqL8w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedu necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:35 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:45 +0800 Message-ID: <0af764f02fe999685998050a65aa66c341238d50.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 From patchwork Wed Feb 28 17:31:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61226 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D3C9627BBEA; Wed, 28 Feb 2024 17:33:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB2E927BBE2 for ; Wed, 28 Feb 2024 17:33:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNoO-0005qD-WC; Wed, 28 Feb 2024 12:33:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNoK-0005k7-Ej for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:40 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNoI-0002GR-GV for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNoj-0007JE-3H for guix-patches@gnu.org; Wed, 28 Feb 2024 12:34:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 13/13] gnu: Add directx-shader-compiler. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:34:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914160927952 (code B ref 69461); Wed, 28 Feb 2024 17:34:05 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:33:29 +0000 Received: from localhost ([127.0.0.1]:56388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNo5-0007Ga-1M for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:29 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:41107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnt-0007F9-0s for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:33:13 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id AC4D63200AC4 for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:40 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 28 Feb 2024 12:32:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141560; x= 1709227960; bh=UyIPEDIJLKlFNLTEhZG6+8vjlKn8nfYWXAh99nap28s=; b=J MhjzFtDfEU4UlpULUtw7EXUUdUv8gAOEcAw2Z4dyGJ3jmDG3WVHuFwGITXggW43j GFbWrMyctruZmQZBzu7BCpOD3iiVuIdIjbY7w1njOavfwiXnG6wN+1KgT0vJEE6M 4gveWoHbpFums9fuQ6rS574cTxs5yFwgEO1h8OOdoQRia+KTWTXZn4z9mi8Cvn0s OPU/7+cVcYmTCc5hryGccWyjTHyFaM5DtMd7tiYK3YJrhv0QLxe4laMoPCB84o3T 5Tn45n1h882oyPBGDK2HnMBOvix46qpjnZ1kEdggCObSg0jppjKIP3Dam/TAH0WY AEPeHBSuUD00a4cTkIAhg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141560; x=1709227960; bh=UyIPEDIJLKlFN LTEhZG6+8vjlKn8nfYWXAh99nap28s=; b=HI6WupxWzGT3YhH7YS28aXKGg78Ra fijoQfY4RfflxCr0YbWqtV+OpCHR83EsTUCaLQ08NiQ3P0+Zj84bmVqZE7BW/g31 V26nuE8FIocIKC33QQUpxfXwqfPGaJ5aGNsqho9FZ0EqEACmDutwcqMfPt3zboOR PtDuU6FG/PRPKkQxLiryUoh5aQXZ2mgeKH4B3BV8JBvPNGSKaRgQ5WsKk2/srXB8 cCqLF0fUcuATn69cpoxwbiFem0reMPx4AONXU8FJofVaUfSUHCZ2rZ+BDNYEZTnV doGCL7uyNSqxu1VfvvFwtqXfVoVye+aqff8+/m5Z0QQ61PRNOmQ8JND1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:38 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:46 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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)))) +