From: dan <i@dan.games>
To: 59386@debbugs.gnu.org
Subject: [bug#59386] [PATCH 05/11] gnu: shaderc: Update to 2022.3.
Date: Sat, 19 Nov 2022 23:02:42 +0800 [thread overview]
Message-ID: <20221119150248.19150-5-i@dan.games> (raw)
In-Reply-To: <20221119150248.19150-1-i@dan.games>
* 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
next prev parent reply other threads:[~2022-11-19 15:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-19 14:56 [bug#59386] [PATCH staging 00/11] Update vulkan-sdk packages to sdk-1.3.231.1 dan
2022-11-19 15:02 ` [bug#59386] [PATCH 01/11] gnu: spirv-headers: Replace version with %vulkan-sdk-version dan
2022-11-19 15:02 ` [bug#59386] [PATCH 02/11] gnu: spirv-tools: " dan
2022-11-19 15:02 ` [bug#59386] [PATCH 03/11] gnu: glslang: Update to sdk-1.3.231.1 dan
2022-11-19 15:02 ` [bug#59386] [PATCH 04/11] gnu: spirv-cross: " dan
2022-11-19 15:02 ` dan [this message]
2022-11-19 15:02 ` [bug#59386] [PATCH 06/11] gnu: vulkan-headers: " dan
2022-11-19 15:02 ` [bug#59386] [PATCH 07/11] gnu: vulkan-loader: " dan
2022-11-19 15:02 ` [bug#59386] [PATCH 08/11] gnu: vulkan-tools: " dan
2022-11-19 15:02 ` [bug#59386] [PATCH 09/11] gnu: vulkan-validationlayers: " dan
2022-11-20 8:11 ` Marius Bakke
2022-11-19 15:02 ` [bug#59386] [PATCH 10/11] gnu: Add volk dan
2022-11-20 8:14 ` Marius Bakke
2022-11-19 15:02 ` [bug#59386] [PATCH 11/11] gnu: Add vulkan-memory-allocator dan
2022-11-20 8:24 ` Marius Bakke
2022-11-20 8:06 ` [bug#59386] [PATCH staging 00/11] Update vulkan-sdk packages to sdk-1.3.231.1 Marius Bakke
2022-11-20 13:49 ` [bug#59386] [PATCH] gnu: Add vulkan-memory-allocator dan
2022-11-20 16:25 ` bug#59386: " Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221119150248.19150-5-i@dan.games \
--to=i@dan.games \
--cc=59386@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).