[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/10: gnu: shaderc: Update to 2022.3.
From: |
guix-commits |
Subject: |
05/10: gnu: shaderc: Update to 2022.3. |
Date: |
Sun, 20 Nov 2022 03:32:29 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 0ea4e5613c3a4d7d1099b251ebb3326c8da83c18
Author: dan <i@dan.games>
AuthorDate: Sat Nov 19 23:02:42 2022 +0800
gnu: shaderc: Update to 2022.3.
* gnu/packages/vulkan.scm (shaderc): Update to 2022.3.
Signed-off-by: Marius Bakke <marius@gnu.org>
---
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 @@ API.")
(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 @@ API.")
(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 @@ API.")
,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
- branch staging updated (7d5e045a69 -> e43df543a8), guix-commits, 2022/11/20
- 04/10: gnu: spirv-cross: Update to sdk-1.3.231.1., guix-commits, 2022/11/20
- 07/10: gnu: vulkan-loader: Update to sdk-1.3.231.1., guix-commits, 2022/11/20
- 06/10: gnu: vulkan-headers: Update to sdk-1.3.231.1., guix-commits, 2022/11/20
- 02/10: gnu: spirv-tools: Replace version with %vulkan-sdk-version., guix-commits, 2022/11/20
- 03/10: gnu: glslang: Update to sdk-1.3.231.1., guix-commits, 2022/11/20
- 01/10: gnu: spirv-headers: Replace version with %vulkan-sdk-version., guix-commits, 2022/11/20
- 05/10: gnu: shaderc: Update to 2022.3.,
guix-commits <=
- 08/10: gnu: vulkan-tools: Update to sdk-1.3.231.1., guix-commits, 2022/11/20
- 09/10: gnu: vulkan-validationlayers: Update to sdk-1.3.231.1., guix-commits, 2022/11/20
- 10/10: gnu: Add volk., guix-commits, 2022/11/20