From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iH7MHYrweGMiSgAAbAwnHQ (envelope-from ) for ; Sat, 19 Nov 2022 16:04:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id +AzOHYrweGN4EgEA9RJhRA (envelope-from ) for ; Sat, 19 Nov 2022 16:04:42 +0100 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 41BCD27D7 for ; Sat, 19 Nov 2022 16:04:42 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owPO2-0003cf-Ss; Sat, 19 Nov 2022 10:04:06 -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 1owPNz-0003aQ-Vf for guix-patches@gnu.org; Sat, 19 Nov 2022 10:04:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owPNz-00068s-FL for guix-patches@gnu.org; Sat, 19 Nov 2022 10:04:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owPNz-0008QA-AQ for guix-patches@gnu.org; Sat, 19 Nov 2022 10:04:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59386] [PATCH 05/11] gnu: shaderc: Update to 2022.3. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Nov 2022 15:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59386 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59386@debbugs.gnu.org Received: via spool by 59386-submit@debbugs.gnu.org id=B59386.166887021332238 (code B ref 59386); Sat, 19 Nov 2022 15:04:03 +0000 Received: (at 59386) by debbugs.gnu.org; 19 Nov 2022 15:03:33 +0000 Received: from localhost ([127.0.0.1]:40933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owPNU-0008Nm-Pv for submit@debbugs.gnu.org; Sat, 19 Nov 2022 10:03:33 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:55291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owPNR-0008N2-7z for 59386@debbugs.gnu.org; Sat, 19 Nov 2022 10:03:29 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id BB2BE320099C for <59386@debbugs.gnu.org>; Sat, 19 Nov 2022 10:03:23 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 19 Nov 2022 10:03:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1668870203; x=1668956603; bh=5P tuOVT5Yd+jlvFM0EhhdZ6UldpasfUgDm6oNdoC4cQ=; b=s+CyoLVxIH14FpkTXK LqHkc8pLtvq0L5yMh3EBfYFlj+ZfQDpORs82fbUu+IwZjEl3JUGElbQ6+op/5WG3 RHrRpaEuZ35M4DK5UWrJoJ06WpHE0I8oaJb2cYQidvuq8LOjZfAxDoN3COGo11sH 64VSNeazh8DBM0Ubiv5qPlXcAQ7Elu/q2iUtYrp5WRTBIzzaYdwuO409QWj43/Wo ReNPeOUWcBU2VWhCd4fvkcuEtwHvH1ZXYr7dmGSZz8XFWzcQuDNhgZq5Ux162rTy tv4ExdFPaGlPhILWKj3rbmfuhL7V+97NtWrcbUZuweWGq98YwQIe69KbWPtK+a+e 99yQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1668870203; x=1668956603; bh=5PtuOVT5Yd+jl vFM0EhhdZ6UldpasfUgDm6oNdoC4cQ=; b=oh6DbGGZAEt6S4w7bgFsIHvlGGHQ5 xckNcMd8y+HzM//rcvBJHvBT/a7ln3B7fHXrjWQh2PO7Q5wL451EOFJO7ZNuVXR8 1gBvi+sLD2kYZiAHO/6gC3ubSJ6jmoWb7rCWGPucz87mz1VaM0BVt6FIWI1cTLHC bTXIHSqskpAqvTEIQdqSZblPzbTEtj6whPsneuFfQfG1P0ejgXs/lLxNBrjySv23 2lOInBS7Gt4JpsBmYviyQMS7Y/OzkzEpuGBNKdtXKZdYVyesLINRXjwktDoQDHF4 ZH3KbQvERDd/ajS7S7Zky1RpNBxURK3NmaVEt03SkUqEt34taiGIXV73g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrhedvgdejfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <59386@debbugs.gnu.org>; Sat, 19 Nov 2022 10:03:22 -0500 (EST) From: dan Date: Sat, 19 Nov 2022 23:02:42 +0800 Message-Id: <20221119150248.19150-5-i@dan.games> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221119150248.19150-1-i@dan.games> References: <20221119150248.19150-1-i@dan.games> 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-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668870282; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=5PtuOVT5Yd+jlvFM0EhhdZ6UldpasfUgDm6oNdoC4cQ=; b=Oq5FGHFwkLf/biJy6/WnW4wqtdbVAtA6y2o2jREOIAr/gEBqWHNx1uhGomL++WHfc/v/PO Nruk5ulKDKRemZyg+4mkLKzSKwOPoWTdelJCjREh3pHj5xvR0hAXia/f8cIKddugSWHij8 aW79+p7GU5gfMgdmXsmqAw7hgJ4wpJ588MMAJbTXi1CttFIlzqVs6V40fTkS45oRl0W/GV RodkS3HCdkjLkJtlhanj4RZFen0Yvq+DjNXQ8MUo48fYb51qq84aWZ51S4aaWU8uoRfEet ZEv0kf3V3VeFy4bIXXMsnTZX4qXdx8dbGgfzQ1FAZ4ViXlu9QLGZ8htjdUH9Ig== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668870282; a=rsa-sha256; cv=none; b=H3jVlTNAMsA3hVCtKuVMlOraqUpeaeh81Ox4brjx2gx803ghpDLXF77C/fby9sfgpzRSHI 69C737RTIG4YS+Y7k2VHPZAsMsgqNiSmbrswg3HdTgrJ/zRxRZUQEnrcBPhmvZe0SQlBkh jQg0JMj86SttmdpVlST9lbXjgeEdGqtWN5GMsSmWNoFJ9AYU2cNdMKj6zG/aqtZGVFmY9w S4DkfEIa/hTDSKKMkdAoMtOvKcvU/dYSIN+fF8+MGsb1o6JCUib26YiUaS94IYbuJQgIa7 dOId6pLdnkgrwmoaZp/sWGqwXiOJweF1joSp6Yw/OiOltQZXEWX4xrERlZ37RA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm2 header.b=s+CyoLVx; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=oh6DbGGZ; dmarc=none; 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" X-Migadu-Spam-Score: 1.79 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm2 header.b=s+CyoLVx; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=oh6DbGGZ; dmarc=none; 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" X-Migadu-Queue-Id: 41BCD27D7 X-Spam-Score: 1.79 X-Migadu-Scanner: scn0.migadu.com X-TUID: vTB1GIeveVSQ * gnu/packages/vulkan.scm (shaderc): Update to 2022.3. --- gnu/packages/vulkan.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 5a2294d6bc..3440c671dc 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -296,7 +296,8 @@ (define-public vulkan-tools (define-public shaderc (package (name "shaderc") - (version "2021.3") + ;; shaderc doesn't follow the versioning scheme of vulkan sdk + (version "2022.3") (source (origin (method git-fetch) @@ -306,7 +307,7 @@ (define-public shaderc (file-name (git-file-name name version)) (sha256 (base32 - "0qjwixcx74dvx68jl51x2mp2q1346hvhwxr8w3wk36nzla62k2s6")))) + "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d")))) (build-system cmake-build-system) (arguments `(;; FIXME: Skip most of the tests, because enabling system gtest breaks @@ -338,7 +339,16 @@ (define-public shaderc ,version ,(package-version spirv-tools) ,(package-version glslang)))) - #t))))) + #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 -- 2.38.1