From patchwork Wed Feb 28 17:31:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61220 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 67C6B27BBE9; Wed, 28 Feb 2024 17:32:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E33027BBE2 for ; Wed, 28 Feb 2024 17:32:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfNnN-0005D6-Hb; Wed, 28 Feb 2024 12:32:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfNnJ-0005CH-Ui for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:38 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfNnJ-00021e-MN for guix-patches@gnu.org; Wed, 28 Feb 2024 12:32:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfNnk-0007EP-9h for guix-patches@gnu.org; Wed, 28 Feb 2024 12:33:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [mesa-updates 05/13] gnu: shaderc: Update to 2023.8. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Feb 2024 17:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.170914157327710 (code B ref 69461); Wed, 28 Feb 2024 17:33:04 +0000 Received: (at 69461) by debbugs.gnu.org; 28 Feb 2024 17:32:53 +0000 Received: from localhost ([127.0.0.1]:56316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnY-0007Cp-Tj for submit@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:53 -0500 Received: from wfhigh3-smtp.messagingengine.com ([64.147.123.154]:58771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfNnW-0007C8-BG for 69461@debbugs.gnu.org; Wed, 28 Feb 2024 12:32:50 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 040D0180008A for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:17 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 28 Feb 2024 12:32:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1709141537; x= 1709227937; bh=cGm53XoSBpmO6RnQUjYsL2duH7mKSmNQkXIyZGKK24o=; b=m pvIIYcqsVrqojOVL8oozVmIDVbj5BmjTGYjq79CnqFNvFXQm9R5+fB/CwB6g1yTS 30S0/ZWFDsvY50vOvb7IGGhM1xslgfK4B0foU2sh3VMJiwrLH6XWnpaDCbrlo77/ ibN8POLuSVsCzhb1awsBomr2ugeAyJqmf6uVF6jy8n+Nj0B6QPpyglVHjS8bSAiQ YxwkCtzItxUZ+hd7Wp43P3HuqPv7yjHB8Z/6FNlGxtSx4e4PkQdG0fSoQ5H2IDL3 Jv1iWq96lQpsgCPF+usqIMvC+nEdY6TyZZYJCVTX17ZUP/VCSwfvb8p/vCrmRX87 BbxitoJmsVaYXJr88CaCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1709141537; x=1709227937; bh=cGm53XoSBpmO6 RnQUjYsL2duH7mKSmNQkXIyZGKK24o=; b=FX2Hor3fIzXPBSLhIzqrtDV4MmPG0 aXdyfq69alBum8jnbdATrP6qaX9IZJgLkXoQ4ZYajN4ZIBLjQ4UFvPQTx8ui40+3 AGQkztPHiHw/wgkGOX40UUgmmPlwWGxgBRuIjllSLqdGBU+k61a1C/s2JKAavuAU gUXnjCp8LaXxnEoKC3oiH/ZYM6+adZCH/gt5uQt4g6ALJAK4VRWONa73D/HD+6uE CxLuGjV1fHAGKJh63ClMfUOU0wcewbuVs4afKPX5YWINGSpQQ/SCoOCTPP3qeD9m 7niUsEBiYX4D3PU9cz58Z1/o0Y3buCs4Ea5TCwwbycJhsClFpbG+gERRw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgeejgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepueevieevgfduieduhfethfduiedvueektdeltdeutedvhffhfeetfefhgefgfe ehnecuffhomhgrihhnpehgihhthhhusgdrtghomhdplhhunhgrrhhgrdgtohhmnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Wed, 28 Feb 2024 12:32:16 -0500 (EST) From: dan Date: Thu, 29 Feb 2024 01:31:38 +0800 Message-ID: <3e30ab660277e638f54846fab8c10ef298107114.1709140055.git.i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vulkan.scm (shaderc): Update to 2023.8. [arguments]<#:configure-flags>: Specify python executable. <#:phases>: Remove drop-additional-glslang-deps phase. [inputs]: Remove python. [native-inputs]: Add python. Change-Id: I1babcabf0be17c6a6237d30fad9b8dcd7a2d2ccf --- gnu/packages/vulkan.scm | 77 +++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 12baf52f92..38f723bd91 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -355,7 +355,7 @@ (define-public shaderc (package (name "shaderc") ;; shaderc doesn't follow the versioning scheme of vulkan sdk - (version "2022.3") + (version "2023.8") (source (origin (method git-fetch) @@ -364,53 +364,46 @@ (define-public shaderc (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d")))) + (base32 "0cs36p1y2269gjfv75fvs43ymsapmc8gsy2n91jnaqs3mpgqkjbk")))) (build-system cmake-build-system) (arguments `(;; FIXME: Skip most of the tests, because enabling system gtest breaks ;; the build: . - #:configure-flags - (list "-DSHADERC_SKIP_TESTS=ON" - ;; Note: despite the name, this just specifies the headers. - (string-append "-Dglslang_SOURCE_DIR=" - (assoc-ref %build-inputs "glslang") "/include/glslang")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-look-for-bundled-sources - (lambda _ - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(third_party\\)") - "")) + #:configure-flags (list "-DSHADERC_SKIP_TESTS=ON" + ;; These two flags are copied from: + ;; https://sdk.lunarg.com/sdk/download/1.3.275.0/linux/config.json + "-DSHADERC_ENABLE_SHARED_CRT=ON" + "-DSHADERC_SKIP_COPYRIGHT_CHECK=ON" + "-DPYTHON_EXECUTABLE=python3" + ;; Note: despite the name, this just specifies the headers. + (string-append "-Dglslang_SOURCE_DIR=" + (assoc-ref %build-inputs + "glslang") + "/include/glslang")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'do-not-look-for-bundled-sources + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(third_party\\)") + "")) - (substitute* "glslc/test/CMakeLists.txt" - (("\\$") - (which "spirv-dis"))) + (substitute* "glslc/test/CMakeLists.txt" + (("\\$") + (which "spirv-dis"))) - ;; Do not attempt to use git to encode version information. - (substitute* "glslc/CMakeLists.txt" - (("add_dependencies\\(glslc_exe build-version\\)") - "")) - (call-with-output-file "glslc/src/build-version.inc" - (lambda (port) - (format port "\"~a\"\n\"~a\"\n\"~a\"~%" - ,version - ,(package-version spirv-tools) - ,(package-version glslang)))) - #t)) - ;; see: https://github.com/google/shaderc/pull/1276 - (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps - (lambda _ - (substitute* "glslc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc/CMakeLists.txt" - (("OSDependent OGLCompiler") "")) - (substitute* "libshaderc_util/CMakeLists.txt" - (("OSDependent OGLCompiler") ""))))))) - (inputs - (list glslang python spirv-headers spirv-tools)) - (native-inputs - (list pkg-config)) + ;; Do not attempt to use git to encode version information. + (substitute* "glslc/CMakeLists.txt" + (("add_dependencies\\(glslc_exe build-version\\)") + "")) + (call-with-output-file "glslc/src/build-version.inc" + (lambda (port) + (format port "\"~a\"\n\"~a\"\n\"~a\"~%" + ,version + ,(package-version spirv-tools) + ,(package-version glslang)))) + #t))))) + (inputs (list glslang spirv-headers spirv-tools)) + (native-inputs (list pkg-config python)) (home-page "https://github.com/google/shaderc") (synopsis "Tools for shader compilation") (description "Shaderc is a collection of tools, libraries, and tests for