From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 2HRREcrqBGa7pwAAqHPOHw:P1 (envelope-from ) for ; Thu, 28 Mar 2024 04:58:02 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 2HRREcrqBGa7pwAAqHPOHw (envelope-from ) for ; Thu, 28 Mar 2024 04:58:02 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm3 header.b="s dlAE9f"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="k Vh5Bih"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711598282; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=O7U5NSmpvMwFes4TdrjCM4qvcQA7IAR8X+qvS9pAAqY=; b=RJuZ8bCqRF+caYvhoVyuWcQCqhM62CxqbatyFtC/niXjyfb7eOttj3TFApltbabWLBdQV8 uxl5zFp5UkoZRCbRcW0qv74djfAnPMCp3m97KQ77bnhSbhpi0rAqm7EJBOL9WOza9V15i1 ctgqMQuNLnaFMR1mY2J41hBCBALShikKzWAWVgActAclyXBgput0NOWptvsXng9ODBCJaW dAA25UiIBJrwaACYzmFc6s307Tnh4Rb9B9edpeDtAeYOThnluIW8uHIWSMYZpahpb5ac/3 oSuqRmDVvO9hVeji1fKvXAAiklp1MIh10B7DERV3tEVy4FF3lYQt7j4Ld9g1oQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm3 header.b="s dlAE9f"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="k Vh5Bih"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711598282; a=rsa-sha256; cv=none; b=SwX0HgeLOl7dbqWu2zqKU6Pn6Ws8uyHmxJLd20YZMCjn61wlzrpBB5VoiVZYiuPl0EoFrM Mj9CiB2Ys0gflFc9KY4JfUOtylS6Zwm+7t/ODQEut50xtI28xXnLAwIJjDFOxKwJd69pxC zm+ckIrkVlm3MrS2oIxisScDJB17Tteu4d134pmC0agI6aui8c/i9Wuu5gs/HTiAPz3OU/ e7JkpWCFhtM3mhhDDMZ9MadXSLvLHjdzCfuoYeUk27sFCHIbk8EYg8ahyU1ZmHrq6gvz5S rq3rTcJrGDVokAsGwEl9KyUq70AIRmTWop1MhwCRHbvXUnVDhsWjTy4tyP5/MA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 00AE7DB1D for ; Thu, 28 Mar 2024 04:58:02 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 00AE7DB1D X-Spam-Score: -2.45 X-Migadu-Spam-Score: -2.45 X-Migadu-Scanner: mx10.migadu.com X-TUID: rQzqfqyx5QHY * gnu/packages/vulkan.scm (shaderc): Update to 2024.0. [arguments]<#:configure-flags>: Specify python executable. <#:phases>: Remove drop-additional-glslang-deps phase. [inputs]: Remove python. [native-inputs]: Add python. Change-Id: I3ca4b6560288f4b8ea9440a7fd0a7815b67471d8 --- gnu/packages/vulkan.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 038a896803..ef6e4b454f 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -359,7 +359,7 @@ (define-public shaderc (package (name "shaderc") ;; shaderc doesn't follow the versioning scheme of vulkan sdk - (version "2022.3") + (version "2024.0") (source (origin (method git-fetch) @@ -369,13 +369,18 @@ (define-public shaderc (file-name (git-file-name name version)) (sha256 (base32 - "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d")))) + "1m5jncn6y8c6g83f8nwh86hz33mvv03x7fyr5zq0ynwanrcpn2hb")))) (build-system cmake-build-system) (arguments `(;; FIXME: Skip most of the tests, because enabling system gtest breaks ;; the build: . #:configure-flags (list "-DSHADERC_SKIP_TESTS=ON" + ;; The two flags are copied from: + ;; https://sdk.lunarg.com/sdk/download/1.3.280.0/linux/config.json + "-DSHADERC_ENABLE_SHARED_CRT=ON" + "-DSHADERC_SKIP_COPYRIGHT_CHECK=ON" + "-DPYTHON_EXECUTABLE=python3" ;; Note: despite the name, this just specifies the headers. (string-append "-Dglslang_SOURCE_DIR=" (assoc-ref %build-inputs "glslang") "/include/glslang")) @@ -401,20 +406,11 @@ (define-public shaderc ,version ,(package-version spirv-tools) ,(package-version glslang)))) - #t)) - ;; see: https://github.com/google/shaderc/pull/1276 - (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps - (lambda _ - (substitute* "glslc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc_util/CMakeLists.txt" - (("OSDependent OGLCompiler") ""))))))) + #t))))) (inputs - (list glslang python spirv-headers spirv-tools)) + (list glslang spirv-headers spirv-tools)) (native-inputs - (list pkg-config)) + (list pkg-config python)) (home-page "https://github.com/google/shaderc") (synopsis "Tools for shader compilation") (description "Shaderc is a collection of tools, libraries, and tests for -- 2.41.0