From patchwork Thu Mar 28 03:54:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62318 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 0638527BBE2; Thu, 28 Mar 2024 03:58: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 0DE8E27BBE9 for ; Thu, 28 Mar 2024 03:58:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgsz-00010W-4a; Wed, 27 Mar 2024 23:57:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgsx-00010A-CN for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgsw-0008AL-IL for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgsw-0001G5-UZ for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 01/13] gnu: spirv-headers: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57: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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981674478 (code B ref 69461); Thu, 28 Mar 2024 03:57:02 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:07 +0000 Received: from localhost ([127.0.0.1]:38680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs2-0001A9-Ad for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:06 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:58419) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgrs-00017v-FL for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:03 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfhigh.west.internal (Postfix) with ESMTP id 2AD8618000C2; Wed, 27 Mar 2024 23:55:50 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 27 Mar 2024 23:55:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1711598149; x=1711684549; bh=wObrB6u1Vd9Pn42Bfg6x8eT0UuJZTDB332qyObHNcIs=; b= xgUrMVwqqIcAsZ9y9AkZqMAVie20DC8iuPGOmLqZL3Dnv3VD9LTrta/EOWJ+hOi5 pXQvxFqD79HXpTYKdwxga7H1bv74iJPNBKFx6HIAtZKZbNPqxbIHCQMX+JeLmrHc Lkw/MMNx3q08Zq13UPL3iJE6N3sz+RrCX7PXv1oQKq7Ntc323K5T7pW51NATP1FU n8yfNKUdKtB2dRfS478s4pZfxB00gvdAfUkziuFz+TLfAbgMRTi/s9d6PXap0Kzr uKLhzUIKXa9RehrjR35trtC2F3j7+tjnzQdVxT8iEz8Gy1JG6JvQyIYWLzv6UrMb FZmfgHOVbl0gg4gIDnPuTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598149; x= 1711684549; bh=wObrB6u1Vd9Pn42Bfg6x8eT0UuJZTDB332qyObHNcIs=; b=B JQN1MlTypat0HIL+gkhJn59PVxtlrGOidO2xUhpEa8uIc1xKmnihz2okwwUBmi++ EAgbbdRaw9Q6b/zzgi6EMWBgDn8quz+2itoBG0hrLuPSDboPcVgEHTOYtjZwRzRu 8fvcmKqc9W9zvOSiO29BllyCyAj3P32Ks5CyRt2uR083Qm+KG1Wt6un4C9j07sAw AnsF6ubLPURKfOJjVgt90fynTxe83NIEqB6ybp8GgS2eu69lyWH9uXZzFtNpNaD2 ZLMpfYRjElCC2Mn/ocv8HG3mtK4jQBcPrKCShBe2uF5NnrjY/G+l4NGCG9Cq3wTw 1AuPfSlT5GpEwHBMi+fGw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffr rghtthgvrhhnpeehhefhieetveeuledtudetheehgfelueeigeekjeduieevveeuteeuhe fftdevjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:47 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:43 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 1.3.280.0. Change-Id: I7a00d3c432a9f6901b3b91b7df2ded887b6101d1 --- gnu/packages/vulkan.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 285d6be7f5..b4dfd191a9 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2020, 2023 Marius Bakke ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata -;;; Copyright © 2022 dan +;;; Copyright © 2022, 2024 dan ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -52,16 +52,16 @@ (define %vulkan-sdk-version "sdk-1.3.231.1") (define-public spirv-headers (package (name "spirv-headers") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/SPIRV-Headers") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (sha256 (base32 - "0z8b485hryya2g0jxv7amwg3fjj7pchbgnsa5ldf5fwgh5js0icm")) + "17jw5gwj2vmicyd6522b1zp7x551krfj826j0fg5kl0ixv0q08wk")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments From patchwork Thu Mar 28 03:54:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62311 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 C80B327BBE9; Thu, 28 Mar 2024 03:57:18 +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 2348527BBE2 for ; Thu, 28 Mar 2024 03:57:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt0-00012D-LS; Wed, 27 Mar 2024 23:57:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgsy-00010S-Up for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgsx-0008AY-Uf for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgsy-0001GV-9W for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 02/13] gnu: spirv-tools: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57: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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981674485 (code B ref 69461); Thu, 28 Mar 2024 03:57:04 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:07 +0000 Received: from localhost ([127.0.0.1]:38682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs2-0001AC-TC for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:07 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:49971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgrv-00018O-7f for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:03 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id D9AC13200A12; Wed, 27 Mar 2024 23:55:52 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 27 Mar 2024 23:55:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598152; x= 1711684552; bh=Hn2BScfXHIejEDopgOtWoHHzdAVpoccHz4yVn0zFzec=; b=S BkW+RkURrsnodD3zkinYufvUOzMpHSr691tOkxANBfTdiJLoJkRLCwN3ohBo7yaD 10NsTJFSI9TGn96xhMLZwVYrCnNudUQIQhiF1BEjd/dVLkg1ZY1epgj9gvOw4YgP GiBvJN59raVQtFJPNiTViGiQy1DhkLnJDIttbzSVQs59TX47AxxGEh8RtaOxkbbW EGwnJhukfk3YPzJ/nDyXFCVdFrJg9ctZ/aXxC/3O0URST9z4rgx27XMvZ/TgW3lx LciddA5JtaHW5BWcGl+T7gnAQAcpcWpkNSCPFnD3y/pD9l6ZgSEuchMrkC9ExJMK YPKsGPw1Rl1LM2/Wid7OQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598152; x= 1711684552; bh=Hn2BScfXHIejEDopgOtWoHHzdAVpoccHz4yVn0zFzec=; b=B XCAcHzX8ZD01G9jl1dU5Fqknz/Rmwi/OeDzPgMc2NPI1XW0sNs8tYqbG+NcEvaS7 EZWAJVWgrqyvXJ7PEmAbhCCXa22A/zotKaipYdAt0wGaM2pReXdzWNzoXIW+Ytdg DbS72He3nrF4veKqjB7EHVNIHy9215LpGXfKcHi2oMayGQSp686QQUAMFwTpuDEx XzVRYCRfmH2ahN0J+HV1RX2O4gKbevWRhXPFc0UxCcKxHbRzJfSTDpLgKagnAOsN +TYbZrghoUL71jEy6bgPHSAcpEtTLlRJYZ3C8ZOfJIwImBBIwhpO0DZkkudPAeTF ME+tVTxujBnT0r+AlX4gQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:50 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:44 +0800 Message-ID: <3902533ea4109ed9b772c767092456a5a6b6ffb5.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 1.3.280.0. Change-Id: Ie6e438849f8f59a4b7616ab05e81c4a76d64dd9e --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index b4dfd191a9..ade0f65665 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -84,15 +84,15 @@ (define-public spirv-headers (define-public spirv-tools (package (name "spirv-tools") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/SPIRV-Tools") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (sha256 - (base32 "03d489ind2az7w7q1slj3mdc04372r3qqbnd7m9akxbg7yix1a5j")) + (base32 "1sj84ngwcgmydlj88nx1a9jfmhmxlij7wc92khp8wf1vsfplayas")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments From patchwork Thu Mar 28 03:54:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62312 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 76B1D27BBEA; Thu, 28 Mar 2024 03:57: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 4B19C27BBE2 for ; Thu, 28 Mar 2024 03:57:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt0-00011d-4H; Wed, 27 Mar 2024 23:57:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgsz-00010e-9c for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgsz-0008Ae-1B for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgsz-0001Gp-Ga for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 03/13] gnu: glslang: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57: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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981684493 (code B ref 69461); Thu, 28 Mar 2024 03:57:05 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:08 +0000 Received: from localhost ([127.0.0.1]:38684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs3-0001AI-AO for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:07 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:46051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgry-00018X-2x for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:05 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id D022D1C000C1; Wed, 27 Mar 2024 23:55:55 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:55:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598155; x= 1711684555; bh=GM6bDe3b+qe/hsZiJtgWlz1niucQ9neDLQOhDmMFW7w=; b=r 04YvAetyK8ST5j97jWwmrEGaTeNeUFMkumq+Bj9rO99Vv7U0S2+vtLIwpa912yxK Tt+ZJmIiHOWAPzxaiQ5ViYKIJaysMbKa5cgBBbxrozKSMmu3WWPWmB6QF92dcsYm QIrNVYadeM/64S1HrB6FUKn22IHjGcrTqHTcp/CoRNRyF9t65/peW4hBxOxUzIL8 tcRgyu5wgwiVsVe6G8D9jWJrQTQudA10hcIkCaxQf5ZKyeLmYqa7TUUCnCVvgO66 i9El51QT03N9KVS8RAvZtAu5r2JbY/qvkP6417e7h/Ufw3eBzpQ+l/HknOsu90YW Sz0R7pmYr4gS/Bd7OJx3A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598155; x= 1711684555; bh=GM6bDe3b+qe/hsZiJtgWlz1niucQ9neDLQOhDmMFW7w=; b=G LGgd27TYdPpb+nWqaisMRS40xOzeyeTTxl7ju5BYHxeOIUbS4WZyy75TCsMpp39K cyWBQTU6s3YM58T0yjv+bPcAzwYHDNJPgttksBqjeE7YfvzsJ07k16FHlYMJSe7Z e731TIcVIfWYwYHt8amYhBLDyB+LsuUIGaHm0bg2CfuAfDd7ivulgTPgK8XqmAP8 vCByL6+YpxlWvjuxJmbkI5MvdOFyhMe0ULQOksualEPzvKKK5Tk3X8hwh2h/jZbl UpNphCButAP+9aICaXS0Kha5HW8XLcgibj+0Qs2oghdo5vfCyp8jjIk9yRHvaDB/ GakNI74adfaCEPoIbYDmA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnheptdelhfegtdehudekleduheegfeeiueffkeelveefieejhfeivdfhfefgud dtvddunecuffhomhgrihhnpehgvghnthhoohdrohhrghdpghhithhhuhgsrdgtohhmnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnh drghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:53 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:45 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 1.3.280.0. [source]: Remove patch. [arguments]: Run tests. [inputs]: Add spirv-tools. * gnu/packages/patches/glslang-install-static-libs.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Ungerister it. Change-Id: I39ef23565e575179b292a1ab76d2d70c98f84767 --- gnu/local.mk | 1 - .../patches/glslang-install-static-libs.patch | 61 ------------------- gnu/packages/vulkan.scm | 17 ++++-- 3 files changed, 11 insertions(+), 68 deletions(-) delete mode 100644 gnu/packages/patches/glslang-install-static-libs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5429dc498c..beec92e9fc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1355,7 +1355,6 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.29-git-updates.patch \ %D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-supported-locales.patch \ - %D%/packages/patches/glslang-install-static-libs.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ diff --git a/gnu/packages/patches/glslang-install-static-libs.patch b/gnu/packages/patches/glslang-install-static-libs.patch deleted file mode 100644 index a155dde30e..0000000000 --- a/gnu/packages/patches/glslang-install-static-libs.patch +++ /dev/null @@ -1,61 +0,0 @@ -Install OGLCompiler et.al. even when building shared libraries. Also fix -CMake file locations. - -Patch taken from Gentoo: - - https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch - -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -41,7 +41,7 @@ if(WIN32) - source_group("Source" FILES ${SOURCES}) - endif(WIN32) - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OGLCompiler EXPORT glslang-targets) - - # Backward compatibility -@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OGLCompiler) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OGLCompiler ALIAS glslang::OGLCompiler) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -203,7 +203,7 @@ endif() - ################################################################################ - if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang EXPORT glslang-targets) -- if(NOT BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS) - install(TARGETS MachineIndependent EXPORT glslang-targets) - install(TARGETS GenericCodeGen EXPORT glslang-targets) - -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -52,7 +52,7 @@ else() - target_link_libraries(OSDependent Threads::Threads) - endif() - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OSDependent EXPORT glslang-targets) - - # Backward compatibility -@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OSDependent) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OSDependent ALIAS glslang::OSDependent) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ade0f65665..499165f581 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -189,22 +189,27 @@ (define-public spirv-llvm-translator (define-public glslang (package (name "glslang") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/glslang") - (commit version))) - (patches (search-patches "glslang-install-static-libs.patch")) + (commit (string-append "vulkan-sdk-" version)))) (sha256 (base32 - "12a1zl8qxa28nbf6m67260c0lwdw3bqbj0jz1382wgm5px1fpqw6")) + "1vvgqvwhsimlz8wkk38b9cvp9abggq840iws8al0znzz3mnvkfdn")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;FIXME: requires bundled SPIRV-Tools - #:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" + "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON") + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest"))))))) + (inputs (list spirv-tools)) (native-inputs (list pkg-config python)) (home-page "https://github.com/KhronosGroup/glslang") From patchwork Thu Mar 28 03:54:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62315 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 1A7C327BBE9; Thu, 28 Mar 2024 03:57: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=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 B6F7127BBE2 for ; Thu, 28 Mar 2024 03:57:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt1-00012i-Cw; Wed, 27 Mar 2024 23:57:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgsz-000114-Nd for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgsz-0008An-Em for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgsz-0001Gw-T5 for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 04/13] gnu: spirv-cross: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57: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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981694508 (code B ref 69461); Thu, 28 Mar 2024 03:57:05 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:09 +0000 Received: from localhost ([127.0.0.1]:38688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs3-0001AR-Uk for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:08 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:47987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs0-00018l-Qi for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:05 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 8E52018000E4; Wed, 27 Mar 2024 23:55:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:55:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598158; x= 1711684558; bh=GpIsTX5Yd0C7oBIbJrtOZjbbQUczJC+/LvcQbAIPtRs=; b=p 0iOzNPw9cdshyGTSWvs6GOK7J84enTe0dxyuCxLT2EsPEaGGDIBLP8QumOGJzijX Ca4JwpW0n6TzfB+WykJ3R2gjL8kQz6D9LObBFWHSbZL6b/qiWrbUrZXwHKU2Fbdv e64+UYy6sV0NikFM3ZPuX3KuQw8eT5DE3QaglcR621YWM3HLEGhi0Zfv8JO++thA 8pHomvmlPVTfJ0e1l8AuQcfmyQsU35nBmAa4Y0wKiDkYY7bVLZuAsVy7FArwPF3A ltoRFt5VLUEu7adegeLm/06T58goDlLH1cdlJv84LZJhy1L946LF1WPs8u1Uta1v jsptL1K3dEbhm8K3/q+Lg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598158; x= 1711684558; bh=GpIsTX5Yd0C7oBIbJrtOZjbbQUczJC+/LvcQbAIPtRs=; b=s p+yTfxiaacGB9PyVhdGmVptdMyXBYLvYz35xqrmCtVGvPlz/+rdY+3lNPjvVpQZd 4Ld6iQvqvtMpoSRsrJZdn3fNazJ23wG0PXg17jn4QbcN+mDYUCnoPya0hNc3c5Bh Q7qnIxhRT0qMq11VtyULOskPdIFRa7zynSITuDHODRwJkpZBmdzmR2X+qLCm++0D uVDPG2DHWu0jyupoN74IVbZPlfKW9dbQsMd789f7CPHDIdCKNIOk/LUShZkJ0kXP jwjFwmdJBM9aPvkFNR9FO2Q1+bo/ivTEKeRESpQUBR/0nZuiPq2hYB53tMZUV7/q SWinAZX1JuLk66sPQtLeQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:56 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:46 +0800 Message-ID: <5cc37c6a8577c587bdd3d4f61900caa38fd24b51.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 1.3.280.0. Change-Id: Ie8e45c6892892c02e3d970a831044ff9f70a9547 --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 499165f581..038a896803 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -116,15 +116,15 @@ (define-public spirv-tools (define-public spirv-cross (package (name "spirv-cross") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/SPIRV-Cross") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (sha256 - (base32 "1ypbc1krkr0yywa1m976g3sjyb80l7hxwrnh6gp70w6va1dlnnn9")) + (base32 "1k6fbkradknxis85akzzksz9ipm3v42xvrzaamwj2lrgfm8d6r4d")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments From patchwork Thu Mar 28 03:54:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62319 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 10A6C27BBE9; Thu, 28 Mar 2024 03:58:05 +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 8585427BBED for ; Thu, 28 Mar 2024 03:58:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt3-00014Z-RP; Wed, 27 Mar 2024 23:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgt0-00011g-6x for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgsz-0008At-Ub for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt0-0001H3-DC for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 05/13] gnu: shaderc: Update to 2024.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57:06 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981864635 (code B ref 69461); Thu, 28 Mar 2024 03:57:06 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:26 +0000 Received: from localhost ([127.0.0.1]:38702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsL-0001Cg-MY for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:26 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:38821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs3-00019Q-MH for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:08 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 6D59B18000DF; Wed, 27 Mar 2024 23:56:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598160; x= 1711684560; bh=O7U5NSmpvMwFes4TdrjCM4qvcQA7IAR8X+qvS9pAAqY=; b=s dlAE9frorPMC5VJjD0Qojvp1XefSRrUfDWgYfOgf4pWQhkCRUWu33aqo5NEAlUuE /6y36se6mdq/F9tEtclY8ijNb+X4zpjwTOq9+1flydsIM+j9o49LocindbuA5uTo pVxe7o5mn91gGcrlt6i5XYKndKOLeTpYBfHyL/5Z/qK//VVVSRDR/fdpQ4NCrYRr CGehwJH13AwKDNEWtoL9k8j4wA1ElX5Z1pYGOVGnKn4LXYuSUDyIt6yAqP41I0HV tSoVeyg1mle0PTIC8DFn8hqHXagDU0prtg3zpIBTbBpc9EyR3y/m0lF48toJTovw qrV2cQCQJqX6l4z+sPoug== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598160; x= 1711684560; bh=O7U5NSmpvMwFes4TdrjCM4qvcQA7IAR8X+qvS9pAAqY=; b=k Vh5BihPe0jCyqXys56L+Tt4TEG2MD4+eoD7ZA0FITg7C5RWbrzrawK3bxzp82vAY ZjjpRjYbwnJxac7oDm/kPuLM9GFXsBx5mZBhPeemBnSzW+FJOs57Aoh0+m6AhQ6T BZIVkajYWfWl8p5r+rP63zL0Hcb/OSp83QGw70pEtWGzn8N/8wbPm3AKEQmcH4jn h2y/PtwKnJu/mxIFR2wKgduJuXViJSKB/zrPlsfD6V5i8338B8bb9uxeEaDVG+cZ fHXcw3ai4dBDppgZgXPmOTQx2hhSsxSPUVANk5DGbpRIj0TT2HmEss5x6cEBFWXL wHwpZga+LkGdSQvy7lsOw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnheptdfffedvheduvefgueetveegveekteevleevleefjedttddvhfeikeegfe efhefhnecuffhomhgrihhnpehgihhthhhusgdrtghomhdplhhunhgrrhhgrdgtohhmnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnh drghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:55:59 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:47 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 2024.0. [arguments]<#:configure-flags>: Specify python executable. <#:phases>: Remove drop-additional-glslang-deps phase. [inputs]: Remove python. [native-inputs]: Add python. Change-Id: I3ca4b6560288f4b8ea9440a7fd0a7815b67471d8 --- gnu/packages/vulkan.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 038a896803..ef6e4b454f 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -359,7 +359,7 @@ (define-public shaderc (package (name "shaderc") ;; shaderc doesn't follow the versioning scheme of vulkan sdk - (version "2022.3") + (version "2024.0") (source (origin (method git-fetch) @@ -369,13 +369,18 @@ (define-public shaderc (file-name (git-file-name name version)) (sha256 (base32 - "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d")))) + "1m5jncn6y8c6g83f8nwh86hz33mvv03x7fyr5zq0ynwanrcpn2hb")))) (build-system cmake-build-system) (arguments `(;; FIXME: Skip most of the tests, because enabling system gtest breaks ;; the build: . #:configure-flags (list "-DSHADERC_SKIP_TESTS=ON" + ;; The two flags are copied from: + ;; https://sdk.lunarg.com/sdk/download/1.3.280.0/linux/config.json + "-DSHADERC_ENABLE_SHARED_CRT=ON" + "-DSHADERC_SKIP_COPYRIGHT_CHECK=ON" + "-DPYTHON_EXECUTABLE=python3" ;; Note: despite the name, this just specifies the headers. (string-append "-Dglslang_SOURCE_DIR=" (assoc-ref %build-inputs "glslang") "/include/glslang")) @@ -401,20 +406,11 @@ (define-public shaderc ,version ,(package-version spirv-tools) ,(package-version glslang)))) - #t)) - ;; see: https://github.com/google/shaderc/pull/1276 - (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps - (lambda _ - (substitute* "glslc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc_util/CMakeLists.txt" - (("OSDependent OGLCompiler") ""))))))) + #t))))) (inputs - (list glslang python spirv-headers spirv-tools)) + (list glslang spirv-headers spirv-tools)) (native-inputs - (list pkg-config)) + (list pkg-config python)) (home-page "https://github.com/google/shaderc") (synopsis "Tools for shader compilation") (description "Shaderc is a collection of tools, libraries, and tests for From patchwork Thu Mar 28 03:54:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62313 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 F3F8727BBE2; Thu, 28 Mar 2024 03:57:40 +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 0650827BBEA for ; Thu, 28 Mar 2024 03:57:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt2-00013D-4D; Wed, 27 Mar 2024 23:57:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgt0-00012F-LM for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgt0-0008B0-Bg for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt0-0001HB-P7 for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 06/13] gnu: vulkan-headers: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57:06 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981904661 (code B ref 69461); Thu, 28 Mar 2024 03:57:06 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:30 +0000 Received: from localhost ([127.0.0.1]:38704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsM-0001Ci-3w for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:29 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:58731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs6-00019w-Fn for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:11 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 3F6373200A12; Wed, 27 Mar 2024 23:56:04 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598163; x= 1711684563; bh=cA7YN/jrh8v7bFcAqCJioskzHaXUhE7KzHPpcb7Ac1w=; b=K XgLZ/Q5l4urxX7dUlSaZ3SYWMhjLsmA2STy7h51vGUIqGvCMx6UxgW+Ps4NpCgIM ON8EG6cPUNdiNrkeZYwUCNEv9jOFXt/AbHDCj4K8k3oDpse0BX0zY7mdObmflcFa dmeeuzvlZbIE1TT/z2Y9YT7BK8KiMURkWsiZJKpplT/dzLDTk/abMqXcIjVnt8hp PCndzOnuIxUEJSPmBKK6kN1ViCQmeW4RTgwgsoR3kG0OJ2cckGzdruVQaTbrBihN 5ClEXE2sUJSZ84sDACy4XWZA8WBVL2l+xDFTjNzcE2IKmRe7Qz1MZlEBq3UInpok zl4P/Dj/apvkP6F0hk3TQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598163; x= 1711684563; bh=cA7YN/jrh8v7bFcAqCJioskzHaXUhE7KzHPpcb7Ac1w=; b=N mkAGfzH/vkWcd+0N+vOXYqml6IhsxZL3FqCjvzOrH4egYRGcf5jD8tN3srG64bCN 7uJhKqQZUDO+zww8elyt1S2S0mKbORI7PqiVlQGCBDhkXCdhp5XOv8Qv7NttYDLx THY8yhhgyAPTrTHjv51UuGXG0q+InnDyzZZlNuSl5bfrEGhkL7k8aOOI7SseUr+q jMqrc5QjVYp+7pPmAAgURl1H6tDpO/WhzddlnvQ2JJVHZLUxSH5h02oTbot2sj8t bv7XpBb/RUNboPj2Ca2R4+aZnkXUSrRZZu7Wx0Ihj828DiozM75+4t7dttWNkIZU BSi1yBaGKv6oDxgkkaoMg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:02 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:48 +0800 Message-ID: <3537c17756cf185ef5b83d7fe0f1c7626ab0260f.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 1.3.280.0. Change-Id: Ie4c135fd53a9cacb36e766daba9524ce33fa5630 --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ef6e4b454f..3324e8bf45 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -227,17 +227,17 @@ (define-public glslang (define-public vulkan-headers (package (name "vulkan-headers") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Headers") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "167zdank6pn66mzjdwgrdlmhmsy4v2k0nhw0nwg649k863rgi00j")))) + "13mmv5621z73hlfnsrccbcb4z0d7kwj92a081701vbpss45a4whj")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. From patchwork Thu Mar 28 03:54:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62321 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 802EB27BBEA; Thu, 28 Mar 2024 03:58:07 +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 B86E427BBE2 for ; Thu, 28 Mar 2024 03:58:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt3-000142-FK; Wed, 27 Mar 2024 23:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgt0-00012X-WA for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgt0-0008B7-N6 for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt1-0001HI-5E for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 07/13] gnu: vulkan-loader: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57:07 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981904667 (code B ref 69461); Thu, 28 Mar 2024 03:57:07 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:30 +0000 Received: from localhost ([127.0.0.1]:38708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsP-0001D9-U5 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:30 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:43945) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgs9-0001Al-WD for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:14 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 7F16818000DC; Wed, 27 Mar 2024 23:56:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598167; x= 1711684567; bh=jDywyIHbhA2arnXlo+d8GWHtLaAU6N8wrOk8lVAr1mc=; b=h 3tqkvfeZiapzuRtIrDrzOsvoL35XF/3iaytDfMCwBItMBblociSAKRgL3SNgt8qn NUmUtEtTUsfS9omahMLICW4KUVaNj2NL5b9va6AEvOqzchT5/u3ZZMytlmaWPg5g /4w14MACXkap8fSb0VAl5NmAtWNyMQ0bAsav9iJ0XOHIglFFFpyDRA4eahRbdSiq wQoni7GrionJ5FAtDZ0cfQVJEbPmC+cyiaGqKu87XtlIdQhzb/h+ennXB1WTGz5W dLBRkOUNPTep4DgjqkLmM70oK+zZvIr74slm28uo4ZhQHh0yBtozKQymC+pc1Gn4 8AF9LFCD/pu71l/3rwSeA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598167; x= 1711684567; bh=jDywyIHbhA2arnXlo+d8GWHtLaAU6N8wrOk8lVAr1mc=; b=j wQGdwcXCncIj31+2A8Ct2jikeJOwpZe4wFxkOKT/wbwRPKvlqZnkI1QWczZ4wlUp 9OmKI5edT1OFbCCUIIxtc8/S7XJg1MIa7o4LQkquULE487c1e607Jbr8+Qa4tGZG ZoiKMffzs35OHiFWGBqaxc6N7qFpJaEl9PQPE20dlEfHGcrnF+Cc4DFx0D83Ys0q 7Rx9NA1fzeNDnST2lb1UJ5WdhJ5vak9MUn0zeEZX8DiV2VQh+PjQy5nENFgUbfQb VtzIaZPBhu/wW5O8EmutG3iZyNqqBcoadSl2E+K+kgzZ4WheolCY5siTg9cKsI6/ 7wgCnWjD1+I5MJO+hysXQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:05 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:49 +0800 Message-ID: <18e4585ccf2c39b8905de5e679be296c7cc3bde1.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 1.3.280.0. [arguments]<#:phases>: Change the place setting system googletest. [native-search-paths]: export XDG_DATA_DIRS. Change-Id: Ib270eeeea6500691a75c36612104c7ddb1c28dfb --- gnu/packages/vulkan.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 3324e8bf45..14e50c59c6 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -251,19 +251,17 @@ (define-public vulkan-headers (define-public vulkan-loader (package (name "vulkan-loader") - ;; XXX: Take a slightly newer commit to fix a test failure on i686: - ;; https://github.com/KhronosGroup/Vulkan-Loader/pull/1036 - (version "sdk-1.3.232") + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Loader") - (commit "v1.3.232"))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) + "0glix3clqkdbi9kqcp8abmglqpgjd2r2bjqvi11r8sair0z54hnf")))) (build-system cmake-build-system) (arguments (list @@ -291,11 +289,9 @@ (define-public vulkan-loader (string-append "includedir=" vulkan-headers "\n")))))) (add-after 'unpack 'use-system-googletest (lambda _ - ;; Inform the build system that googletest is already built. - (substitute* "CMakeLists.txt" - ((".*if\\(TARGET gtest\\)") - (string-append " find_package(GTest REQUIRED)\n" - " if(true)"))) + (substitute* "tests/CMakeLists.txt" + (("message\\(FATAL_ERROR \"Could not find googletest directory. See BUILD.md\"\\)") + "find_package(GTest REQUIRED)")) ;; Use the namespaced variable. (substitute* "tests/framework/CMakeLists.txt" (("PUBLIC gtest ") @@ -308,6 +304,10 @@ (define-public vulkan-loader wayland)) (inputs (list vulkan-headers libxrandr)) + (native-search-paths + (list (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))))) (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan") From patchwork Thu Mar 28 03:54:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62317 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 A174E27BBE2; Thu, 28 Mar 2024 03:58:01 +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 0D87A27BBE2 for ; Thu, 28 Mar 2024 03:58:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt5-00016l-5q; Wed, 27 Mar 2024 23:57:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgt1-00012m-JB for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgt1-0008BE-AF for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt1-0001HQ-Io for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 08/13] gnu: volk: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57:07 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981954687 (code B ref 69461); Thu, 28 Mar 2024 03:57:07 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:35 +0000 Received: from localhost ([127.0.0.1]:38712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsV-0001DX-C7 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:35 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:59817) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsC-0001BK-Nz for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:17 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.west.internal (Postfix) with ESMTP id 7BC801C000BF; Wed, 27 Mar 2024 23:56:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 27 Mar 2024 23:56:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598170; x= 1711684570; bh=L7uKVO047E56JLo8qSq8gWqM0YUiQh+ct1JUxyigErU=; b=K +hehF503FN9HIqVPVj87Ik0sl3j64jtzLsLQJmdTUp1B72igUkahqZptNzfLqQ08 ITDPtyBZ+LONGIGALYeplfBbZrVY+Uq0l8VZARuLASUcVgalm8lZJiN6vr9/4uYN yV4QwHwYQt9PZRIDql0u1LvlhtYI2tnZRpqraFUS+46X39JT6DY2VXdUe/eZWxgK 0xK+EEa/8HDZjn4ZUlR+WEFKg07hIUc81QkUhxAS/MGGWvUzELwqT2V2s9gPzCFC VYnc2j2FdF8bw2UpKQR6hrP+OFDZrHbfVf0Kzvk0bXEi6/a4cUkYWbth7U+Hx2rl mn5x+hudLDARprWAH6xuA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598170; x= 1711684570; bh=L7uKVO047E56JLo8qSq8gWqM0YUiQh+ct1JUxyigErU=; b=r tgtkgL5TBuF7idJZRNB2o2MjxQhTHm9dyhyRrciFwX6mT/B6lAdv5yHeQN4J/c0+ M+fYjf0xqMmdD7R+wU+Sw/OzYlB20/fn7+P2hUirnMi1GJD9sILFdzhCzUVVtpgP SmcJY+9ks6/aviIhb87T+4KZoP5fT7ZUSnBNluAR+c2ubRbpH0Jg5CWOMlNYTEdi GneEXDLsq7fkSssznH2L5MGPfP2yGfIAEASvXXxPjytkOfx4EbagvtW074ubP28Q A8EydLWMZzy5Rz3s1aBLSzo3H3fXhjDERxqw1icUUzhoa9lgs4x+frEe2hiXFxo3 vsZI7g9uNerW/v/p1g/Yg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:08 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:50 +0800 Message-ID: <29de178f1dbebe1d817f8855d79542364c0ecd7d.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 1.3.280.0. Change-Id: I4f72df2ba6784f3dae93cf60361e1bceaf61d3bb --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 14e50c59c6..c6d3d3d347 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -535,16 +535,16 @@ (define-public vulkan-validationlayers (define-public volk (package (name "volk") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/zeux/volk") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0xaw3kg754mknx8lfj1p74a9npjfvdvlpicvn0hla4495zpc10rq")))) + "0x4jhc8n9c4k8svmmcaxxs613xbsav7wam94gacddlm738cwp13v")))) (build-system cmake-build-system) (arguments '(#:tests? #f ;no test From patchwork Thu Mar 28 03:54:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62320 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 B463B27BBE2; Thu, 28 Mar 2024 03:58:05 +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 7D9AB27BBEC for ; Thu, 28 Mar 2024 03:58:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt5-00017Q-SZ; Wed, 27 Mar 2024 23:57:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgt1-000131-Pm for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgt1-0008BM-Gr for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt1-0001HY-VO for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 09/13] gnu: vulkan-tools: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57:07 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981964696 (code B ref 69461); Thu, 28 Mar 2024 03:57:07 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:36 +0000 Received: from localhost ([127.0.0.1]:38714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsV-0001Dd-T4 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:36 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:50583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsF-0001BV-Dg for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:20 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.west.internal (Postfix) with ESMTP id 2D48D1C000C1; Wed, 27 Mar 2024 23:56:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 27 Mar 2024 23:56:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598172; x= 1711684572; bh=oruVbQJVkJpKInYbi25CUlIpUsdHY/X9f7E89+n9P4I=; b=m pF7RyKIebd5L41dyGvsUi6D3F+7l0Rw7Ey37hTYhTKdfmAcxXUXVWvsB3qgiZVRJ /qsUUlNikh1qgZuabwEnGWX7kJRH9nxOJ2FstvfExQ19LkNCG+M8xL2Z1YE+rdDY l7UJAf3lT8NGU4qKduR/i2UD6qJjEBng2b61asJe9EIAvtygp6DokXHUVUDLMR7l o05L9NkCYwhrDLmJ4okYY8hsfYvxGXDPNH43qfAEVX7M0aC7iG2NXMSfHqmOdy2z +22e0Ziox97e+aggaImJX5v4TIuq4fapWAp07O+L09wW6uNPowdKGcLZiTRYfmK8 zeuqv2GjqGQ1IKl87vdlA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598172; x= 1711684572; bh=oruVbQJVkJpKInYbi25CUlIpUsdHY/X9f7E89+n9P4I=; b=Z k8xMDiLV2abuvc+rYYFvYwkIn2JhsCOFgB8nN0aTjUiU+qLEk6pntNMmSgxgsrI6 4koZVflm3wdeZ/1lR/zckn3e7o9CNggz5oo9+v9Mt1+C/Q1QtNO26G9W7G0MCIIE +iwcpixXLH6pPVHscX60KB6HpGBUfyJyjmAsleWJPe9V9MzBH9mF6Kyq3TXZtEV6 BUPBOAp7xxeYmhg+peafxiTtIIpc09COiL4bv3Gt1/SL3D+na41PLVmwqbOb1hEJ YAZw89o3OmKaI3F6c8Mnv9E3XcFQw3JzyvLc5Yl5IglQ05tLvyeiyEKYwHzYAXdq ALbfL4+eH6z3kb8WqEQPg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:11 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:51 +0800 Message-ID: <28d6db476c6a195925f0b4d2866facacefdec770.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 1.3.280.0. [arguments]: Turn on tests. [arguments]<:#configure-flags>: Remove GLSLANG_INSTALL_DIR. [native-inputs]: Add googletest. Change-Id: Iadf98fc95d0d70c3780159992ebc2fdff6a2d108 --- gnu/packages/vulkan.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index c6d3d3d347..dfd8f73d9b 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -326,26 +326,34 @@ (define-public vulkan-loader (define-public vulkan-tools (package (name "vulkan-tools") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Tools") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet #~(substitute* "tests/icd/mock_icd_tests.cpp" + ;; Disable driver info test since it relies on git branch info + (("ASSERT_EQ\\(std::string\\(driver_properties\\.driverInfo\\)") + "// ASSERT_EQ(std::string(driver_properties.driverInfo)"))) (sha256 (base32 - "0jzwjfx4c7y15wkwfhhc64rzljpi47bxrm5jw5blfsqjh8zsd27a")))) + "0w0m04vscr4a6vr682g3mn7mfni740cmai9ylzlgfdggb77y58xz")))) (build-system cmake-build-system) (inputs (list glslang libxrandr vulkan-loader wayland wayland-protocols)) (native-inputs - (list pkg-config python vulkan-headers)) + (list googletest pkg-config python volk vulkan-headers)) (arguments - `(#:tests? #f ;no tests - #:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR=" - (assoc-ref %build-inputs "glslang"))))) + `(#:configure-flags (list "-DBUILD_TESTS=ON") + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./tests/vulkan_tools_tests"))))))) (home-page "https://github.com/KhronosGroup/Vulkan-Tools") (synopsis "Tools and utilities for Vulkan") From patchwork Thu Mar 28 03:54:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62316 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 81D6D27BBE9; Thu, 28 Mar 2024 03:57: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=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 D8DA027BBEA for ; Thu, 28 Mar 2024 03:57:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt4-00014v-EB; Wed, 27 Mar 2024 23:57:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgt2-00013Z-BQ for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgt1-0008BT-Vj for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt2-0001Hf-DU for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 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: Thu, 28 Mar 2024 03:57:08 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981964703 (code B ref 69461); Thu, 28 Mar 2024 03:57:08 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:36 +0000 Received: from localhost ([127.0.0.1]:38716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsW-0001Dg-Ay for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:36 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:47887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsI-0001Bd-00 for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:22 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.west.internal (Postfix) with ESMTP id B9D3D1C000C8; Wed, 27 Mar 2024 23:56:15 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 27 Mar 2024 23:56:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1711598175; x=1711684575; bh=GKMH78PubeJxJTCUvr6rBcdVCsb3c/bjOKjhJe7Wr8g=; b= pppfhysHehnG6Rn2QhAmnLHXkGNzqN/3wkXaqy2T19tHpWeCNSKbeQOKShDnc39s tE03sU+qEEz1OmRkP4dqDtmp3JVyK+jOnYEZeUSKE9UUGwx79hao+AJBTQMs5IlZ 3Zs5B5jCf5jb2fvk9lap/+5Xsyr2lxfrYjCfg5Gk9eXXEECoB1I1pLIdJYX+8GJO f5OPuKg3NoSguaJqOMK8sTgf5NpeVyx3BQRH2RYSq9vmbMgNtFy20ASF/0/CH3ZH r6TC8+lclLX91r7bDTMNUKfze2nPQ9UK3smZM2zfNNLP3jaHPS5ufUzYLE+hciDf vJO6QTeg/fDLeR0nkRYpuQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598175; x= 1711684575; bh=GKMH78PubeJxJTCUvr6rBcdVCsb3c/bjOKjhJe7Wr8g=; b=Z Nx4FDhBT8IWt2xluSqkXSIDdk+1auyVaW+Ozz0bxPl9TFtd94IP5HyHXrWLiShP7 cJZP+pninvqLB/9ytAp2g41ESR5ot6BxNc6LlHGE94ViDWSFobge3JvZAcE3vLQe gu2yD2eutKq6934/WVoG4Jo/pyh6h0yfxS+/ax2o7xOgAIjKsFUa/CtOjsoKLCLk VALKlQn4LiWfcNoSHpS4bvOOb4UAnMpX7TtKdWEEjlAwD++jbPLH9hNXqxRDy+nu FVUqY2UUPccUQ/WNpRjjzSNkre2E30Rdjn3FiQCFVmJV/W5yBZ3BU4XPCctAJnER 18wsLdLjClwqgWjsW6Z5Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffr rghtthgvrhhnpeehhefhieetveeuledtudetheehgfelueeigeekjeduieevveeuteeuhe fftdevjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:13 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:52 +0800 Message-ID: <016b1a765e31297919aa133a66a39871118a49c3.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: I8306d7ef69276e33f7daada895165a88bfc938ad --- gnu/packages/cpp.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index acbe3e4836..cfff141dcc 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 Foundation Devices, Inc. ;;; Copyright © 2023 Paul A. Patience +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1795,7 +1796,7 @@ (define-public atomic-queue (define-public magic-enum (package (name "magic-enum") - (version "0.7.3") + (version "0.9.5") (home-page "https://github.com/Neargye/magic_enum") (source (origin (method git-fetch) @@ -1805,7 +1806,7 @@ (define-public magic-enum (file-name (git-file-name name version)) (sha256 (base32 - "1x47radgsifgz3vn2561mlvf4cq46ii33cpyqf01znm56iirwq89")))) + "14ys5sn2v1mai8bclvi81cp65g6jblqpdsi94639hphca5v8gka3")))) (build-system cmake-build-system) (synopsis "C++17 header only library for compile time reflection of enums") (description "Magic Enum offers static reflection of enums, with From patchwork Thu Mar 28 03:54:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62314 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 4133C27BBE2; Thu, 28 Mar 2024 03:57:41 +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 C958127BBE9 for ; Thu, 28 Mar 2024 03:57:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt4-00014h-08; Wed, 27 Mar 2024 23:57:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgt2-00013k-Un for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgt2-0008BZ-HX for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt2-0001Hn-Ph for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 11/13] gnu: Add vulkan-utility-libraries. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57:08 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981974710 (code B ref 69461); Thu, 28 Mar 2024 03:57:08 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:37 +0000 Received: from localhost ([127.0.0.1]:38718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsW-0001Do-P2 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:37 -0400 Received: from wfout2-smtp.messagingengine.com ([64.147.123.145]:41947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsK-0001C2-NV for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:25 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id 749781C000CF; Wed, 27 Mar 2024 23:56:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598177; x= 1711684577; bh=xPMcUE2MfnOjNrYKWKtaLDcbJUuiNnrknEMZK3qht4E=; b=k FRCYRB47SmsAHeNfrC5qeuNr/d5PDBHDZZA98Jsd99m3EjFybrWkqa3TNOYlzuFB aWGwqr414Buv2Hi3WYmi1kSNrK4bdGTnMm0iMsSXiHP3Ox06g2XlyHRjl8WqHDEp dxyWnlxgyT8dVEbGsxeZzEl0mR3/Ml+b3IBLd8WqHryX4ONT8kzVvbbq7bB7ITlJ xx593ScY7qa/r0l3K71ay5+O+iDtnZBZ0YpXnq7bdJVwlSpTHvXPwK9zp4oNWEN5 g2y91JEsxYkKI8Dyd5qcdgFAw0fE1LjWd4LLEVHEJQgKJ0bfVgehmhDI2XFtunNh btNspFKq6PiszbKP8PCpA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598177; x= 1711684577; bh=xPMcUE2MfnOjNrYKWKtaLDcbJUuiNnrknEMZK3qht4E=; b=o w0NK5Mtp4HbG8+6xomfVRLCl3sOObX+oLvPmHq9+/ut+wzWBCedFjUt+T55gxC0p 6gDuPons6njdFycPsyIo/f3UtERJVGSuqxI75onuap169h+Ipzew9qvefi0GE1te Zg9GAlav/7G4uAox1cGsY11Dia5PnRQZpnhUBNEwZxTIRQh0elwB3yoWuMhmhtob qSkvKhd6beNTMQGZB8R1FWukh7ThUW/ic86Fzp7BzjyLA2ZGYw9I7qqUgGYwDOqe lbkB1+t0J9o63vGAU1oMhqH1uEkGDuqqQI/TFvIILQ4NYBfWyQxzTyx56IWYZL1P D7FnhCWksX2y73PC6y2ag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv peefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:16 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:53 +0800 Message-ID: <75fce4aad0cbf3e8f2c271afa00419ed33651de2.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: I5a7c3fa51150e2181197316f6b97a54f12a24236 --- gnu/packages/vulkan.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index dfd8f73d9b..6239f7ea4d 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -37,6 +37,7 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages cmake) + #:use-module (gnu packages cpp) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -597,3 +598,27 @@ (define-public vulkan-memory-allocator (home-page "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator") (license license:expat))) + +(define-public vulkan-utility-libraries + (package + (name "vulkan-utility-libraries") + (version "1.3.280.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-Utility-Libraries") + (commit (string-append "vulkan-sdk-" version)))) + (sha256 + (base32 "17fmalilczs4x435f8kdx8bf0x5mnjhkmcp34xap8lanpbyzs84q")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DBUILD_TESTS=ON"))) + (inputs (list vulkan-headers)) + (native-inputs (list googletest magic-enum)) + (home-page "https://github.com/KhronosGroup/Vulkan-Utility-Libraries") + (synopsis "Utility libraries for Vulkan developers") + (description "Utility libraries for Vulkan developers.") + (license license:asl2.0))) From patchwork Thu Mar 28 03:54:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62323 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 4A2EC27BBE2; Thu, 28 Mar 2024 03:58:16 +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 EE74A27BBE9 for ; Thu, 28 Mar 2024 03:58:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt6-00017u-6C; Wed, 27 Mar 2024 23:57:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgt3-00013r-8a for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgt2-0008Bf-WE for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt3-0001Hu-6y for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 12/13] gnu: vulkan-validationlayers: Update to 1.3.280.0. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57:09 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981974718 (code B ref 69461); Thu, 28 Mar 2024 03:57:09 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:37 +0000 Received: from localhost ([127.0.0.1]:38720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsX-0001Dv-6y for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:37 -0400 Received: from wfhigh2-smtp.messagingengine.com ([64.147.123.153]:50529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsN-0001CR-JI for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:28 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 580EC180006E; Wed, 27 Mar 2024 23:56:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 27 Mar 2024 23:56:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598180; x= 1711684580; bh=XL3gg5y/HeEpA/3Y0Tg+TxSOxipFLlyExq+vnrczhVk=; b=N YhUsnHY0INC6/5prhC9p4LoBmKGyZHmCxZowdO0VJGi2GSqyOa6nLTvhbdwNDwaC 6m96MFlosBfTDZEYLEWQB2a1MaSrCdMkYOwL6Wd/C7evr+ijuY6xgJuUKWudP0p9 Ns37R14M+MezFJLR/XPahjmsS2HD9Vn0tj5c02BgvKUeowhlnJwPVoOacU7mBgcX 9fklOAFpA2JQLMlmZtT/53nR5kgaukPZosXfCIz0JG4Mk6gA8l/UkBjW58RT+Ve/ HEZjh72bN9aO7Qy/lzJhMSS6Z6E3cpaFql4r9fgq7N+Wp8bt8r0taD90kkus1NIU 50WG5VINwG3OvuNFLPTeA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598180; x= 1711684580; bh=XL3gg5y/HeEpA/3Y0Tg+TxSOxipFLlyExq+vnrczhVk=; b=x 96VTf59uSAR3pAiXoP84PC9D2ny2qHjLykVw3yjuhUC3aUjcsYLeSfW/ATJOlVu3 4N4rO2Vw/yFJrfmiFWdwpshkLUe1+/MYW2GwI4XclYw+VEIUpFOxa8t1sBhJxFtm 7JImfaAqmj7NlOSHC5mn96Ls9EIDWlSTx/MSiD/AUkBo5uIfHMH0HhU6JYVXlixU Lvd8JtJP5kFBRuuHugLlwW8HRMDH1x64+/d3GtytobOdF6mDhv2cJnV6SIgx51jF sRBfy6Q8sVguwYypCVIRYrZLNPmtJ6V2nOI5GqQQlqnNXGaPm8IslsFLk+gL7Awu Dmk9/MROAm6FlEw+jk8eg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv peegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:19 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:54 +0800 Message-ID: <435c72f590aa854b9072c5967eabfd1cbc6c8bcb.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 1.3.280.0. [source]: Add snippet. [inputs]: Add robin-hood-hashing and vulkan-utility-libraries. [arguments]: Remove configure-flags, replace check step, and update reason why disabling tests. Change-Id: I80ca002d8dbe71cad57f859ee34ac8f10e175907 --- gnu/packages/vulkan.scm | 55 ++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6239f7ea4d..1016e9db36 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -47,9 +47,6 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages wine) #:use-module (gnu packages xorg)) -;; Note: Remember to change vulkan-loader version when bumping this. -(define %vulkan-sdk-version "sdk-1.3.231.1") - (define-public spirv-headers (package (name "spirv-headers") @@ -478,51 +475,37 @@ (define-public vkd3d (define-public vulkan-validationlayers (package (name "vulkan-validationlayers") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-ValidationLayers") - (commit version))) + (commit (string-append "vulkan-sdk-" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + ;; We don't build static libraries in SPIRV-Tools. + (snippet '(substitute* "tests/CMakeLists.txt" + (("-static") + ""))) (sha256 (base32 - "07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75")))) + "1w6fsaicrgnzkj5vz2v86a2gk1n7478q6n66ac2920avnin9a64c")))) (build-system cmake-build-system) (inputs (list glslang libxrandr mesa + robin-hood-hashing shaderc spirv-tools vulkan-loader + vulkan-utility-libraries wayland)) - (native-inputs (list pkg-config python spirv-headers vulkan-headers)) + (native-inputs (list googletest pkg-config python spirv-headers vulkan-headers)) (arguments - (list #:tests? #f ;no tests + (list #:tests? #f ; test crashed #:configure-flags - #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF" - (string-append "-DGLSLANG_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/glslang")))) - (string-append "-DSPIRV_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/spirv")))) - (string-append "-DSPIRV_TOOLS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/spirv-tools")))) - (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" - (dirname (dirname - (search-input-directory - %build-inputs - "include/vulkan")))) - "-Wno-dev") + #~(list "-DBUILD_TESTS=ON") #:phases #~(modify-phases %standard-phases (add-after 'install 'set-layer-path-in-manifest (lambda _ @@ -532,7 +515,17 @@ (define-public vulkan-validationlayers (substitute* manifest (("\"libVkLayer_khronos_validation.so\"") (string-append "\"" #$output - "/lib/libVkLayer_khronos_validation.so\""))))))))) + "/lib/libVkLayer_khronos_validation.so\"")))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "VK_LAYER_PATH" (string-append (getcwd) "/layers")) + (setenv "LD_LIBRARY_PATH" + (string-append #$(this-package-input "vulkan-loader") "/lib")) + (setenv "MESA_SHADER_CACHE_DIR" + (string-append (getcwd) "/shader-cache")) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (invoke "./tests/vk_layer_validation_tests"))))))) (home-page "https://github.com/KhronosGroup/Vulkan-ValidationLayers") (synopsis "Khronos official validation layers for Vulkan") (description From patchwork Thu Mar 28 03:54:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 62322 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 7194027BBEA; Thu, 28 Mar 2024 03:58:14 +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 854CE27BBE2 for ; Thu, 28 Mar 2024 03:58:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpgt6-000186-M0; Wed, 27 Mar 2024 23:57:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpgt3-00014G-Gs for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpgt3-0008Bm-7R for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpgt3-0001I1-MZ for guix-patches@gnu.org; Wed, 27 Mar 2024 23:57:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v3 13/13] gnu: Add directx-shader-compiler. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 03:57:09 +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: patch To: 69461@debbugs.gnu.org Cc: john.kehayias@protonmail.com Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17115981984724 (code B ref 69461); Thu, 28 Mar 2024 03:57:09 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Mar 2024 03:56:38 +0000 Received: from localhost ([127.0.0.1]:38722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsX-0001E3-OS for submit@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:38 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:54115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpgsQ-0001CZ-Ao for 69461@debbugs.gnu.org; Wed, 27 Mar 2024 23:56:30 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 186DE3200A12; Wed, 27 Mar 2024 23:56:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 27 Mar 2024 23:56:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1711598183; x= 1711684583; bh=xZePi0aMmsnR+c2thG2i40BlLLcfURrzWMoJ/9O8rms=; b=I ZbvFdYVZMP+XRlAaWbBmq53ewPi16AzCss+2kJJ3IZ0m7BsVgwcoCMfxP7tAtLcS E8KJOrPJCmNoEuPdR7qDTRWoLZgfHD2kAK2jNoZPMx7wK0ctYJjPJ6ie/4xs6jT0 tRpUkHGc7YLfnuc/Wz89T6YdYILzrcddCEWniuC9Nh38A+iDQTljZWY9O48NVo0x x7tJBFjHuuop0Xwmbg7RAITUE2OmlvxDXtKhSKuUB2JYLdc0P1qEwRvVNXLIgfjk jtC4aopB4llSR7xSjTisNpY4LXPPvXAFXmmhVWO+g/4Lqqw0Py9LEzhBSNmP/V6G /3MEfsHcynp1avVyP3QGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1711598183; x= 1711684583; bh=xZePi0aMmsnR+c2thG2i40BlLLcfURrzWMoJ/9O8rms=; b=u STFZoxyqfahnhXh+nfIpYaUE4WE0ABn4J+wWD1dSrqteqSqZQQ9xTTkwqCG8yAqr cm3XqQeaGb7gMPJ6ga7uhPDMuzliNY7/mrLrr7rkNafVK5mV6uQsI8FRo+CoHpLY wz+EJjoVF6JPB7Nt3xG7iibbkG/LQOu1nnXUIQXSHygv0SrZSzFHckG5Bo8tmF/9 RuiY3R7OieH+vpyWJoTCF+cuRO44Axr3oWXXKztOBdQp33Sy5Hy35Oinf8yw1Rj7 v2L7CF5d9F7Md7LnkzaniFs6h1M7BDMD5vOWoUF7B6CDzdO3u/pQDyS2MsS7XT+D hRrVfbkF6vUDLko/ofutg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddukedgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgr thhtvghrnhepvdekvdelueffhfeffeffueduieehgfdvjedvtddvkeehvdffgeevgffgff fhgeejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigv pedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Mar 2024 23:56:22 -0400 (EDT) From: dan Date: Thu, 28 Mar 2024 11:54:55 +0800 Message-ID: <85c049f7241ecdb209022a8a473b5fc0baa6643d.1711561863.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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-shader-compiler): New variable. Change-Id: I3d7ae6da3f6d6394d559c3cc2676be4d477e6b1e --- gnu/packages/vulkan.scm | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1016e9db36..35f2339e43 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -44,7 +44,9 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages version-control) #:use-module (gnu packages wine) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define-public spirv-headers @@ -615,3 +617,68 @@ (define-public vulkan-utility-libraries (synopsis "Utility libraries for Vulkan developers") (description "Utility libraries for Vulkan developers.") (license license:asl2.0))) + +;; directx-shader-compiler depends on an old version of directx-headers. +(define directx-headers-for-dxc + (let ((commit "980971e835876dc0cde415e8f9bc646e64667bf7") + (revision "115")) + (origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/microsoft/DirectX-Headers") + (commit commit))) + (file-name (git-file-name "directx-headers-for-dxc" + (git-version "0" revision commit))) + (sha256 (base32 "0c7l2xdsbr132ga2nyqjhz9xa42dxvhh9idjxnl673mz5kab1j6h"))))) + +(define-public directx-shader-compiler + (package + (name "directx-shader-compiler") + (version "1.8.2403.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/microsoft/DirectXShaderCompiler") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14nd4ys0x14z17l5fkaysc9a1gfw3fmdj8gvxw1a013yg6fla7g3")) + (modules '((guix build utils))) + (snippet '(substitute* "CMakeLists.txt" + (("add_subdirectory\\(external\\)") + "find_package(SPIRV-Tools REQUIRED) +find_package(SPIRV-Tools-opt CONFIG REQUIRED)"))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-G" + "Unix Makefiles" + "-C" + "../source/cmake/caches/PredefinedParams.cmake" + (string-append "-DSPIRV_HEADER_INCLUDE_DIR=" + #$(this-package-input + "spirv-headers") "/include") + (string-append "-DSPIRV_TOOLS_INCLUDE_DIR=" + #$(this-package-input + "spirv-tools") "/include") + (string-append "-DDIRECTX_HEADER_INCLUDE_DIR=" + #$directx-headers-for-dxc + "/include")) + #:phases #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install-distribution" + make-flags)))))) + (inputs (list libxml2 spirv-headers spirv-tools)) + (native-inputs (list git python)) + (home-page "https://github.com/microsoft/DirectXShaderCompiler") + (synopsis + "Compiler and related tools used to compile High-Level Shader Language (HLSL)") + (description + "The DirectX Shader Compiler project includes a compiler and related +tools used to compile High-Level Shader Language (HLSL) programs into DirectX +Intermediate Language (DXIL) representation. Applications that make use of +DirectX for graphics, games, and computation can use it to generate shader +programs.") + (license license:ncsa)))