me
/
guix
Archived
1
0
Fork 0
Code

gnu: shaderc: Update to 2024.0. 

* gnu/packages/vulkan.scm (shaderc): Update to 2024.0.
[arguments]<#:configure-flags>: Specify python executable.
<#:phases>: Remove drop-additional-glslang-deps phase.
[inputs]: Move python from here ...
[native-inputs]: ... to here.

Change-Id: I3ca4b6560288f4b8ea9440a7fd0a7815b67471d8
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
master
dan 2024-03-28 11:54:47 +08:00 committed by John Kehayias
parent 474ed54aeb
commit 3105649b5a
No known key found for this signature in database
GPG Key ID: 499097AE5EA815D9
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/vulkan.scm
View File

@ -359,7 +359,7 @@ API.")
(package (package
(name "shaderc") (name "shaderc")
;; shaderc doesn't follow the versioning scheme of vulkan sdk ;; shaderc doesn't follow the versioning scheme of vulkan sdk
(version "2022.3") (version "2024.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -369,13 +369,18 @@ API.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d")))) "1m5jncn6y8c6g83f8nwh86hz33mvv03x7fyr5zq0ynwanrcpn2hb"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(;; FIXME: Skip most of the tests, because enabling system gtest breaks `(;; FIXME: Skip most of the tests, because enabling system gtest breaks
;; the build: <https://github.com/google/shaderc/issues/470>. ;; the build: <https://github.com/google/shaderc/issues/470>.
#:configure-flags #:configure-flags
(list "-DSHADERC_SKIP_TESTS=ON" (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. ;; Note: despite the name, this just specifies the headers.
(string-append "-Dglslang_SOURCE_DIR=" (string-append "-Dglslang_SOURCE_DIR="
(assoc-ref %build-inputs "glslang") "/include/glslang")) (assoc-ref %build-inputs "glslang") "/include/glslang"))
@ -401,20 +406,11 @@ API.")
,version ,version
,(package-version spirv-tools) ,(package-version spirv-tools)
,(package-version glslang)))) ,(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 (inputs
(list glslang python spirv-headers spirv-tools)) (list glslang spirv-headers spirv-tools))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config python))
(home-page "https://github.com/google/shaderc") (home-page "https://github.com/google/shaderc")
(synopsis "Tools for shader compilation") (synopsis "Tools for shader compilation")
(description "Shaderc is a collection of tools, libraries, and tests for (description "Shaderc is a collection of tools, libraries, and tests for