[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/21: gnu: shaderc: Update to 2024.0.
From: |
guix-commits |
Subject: |
13/21: gnu: shaderc: Update to 2024.0. |
Date: |
Mon, 1 Apr 2024 01:35:38 -0400 (EDT) |
podiki pushed a commit to branch mesa-updates
in repository guix.
commit 3105649b5ac66fdc142964316b1825d079e17750
Author: dan <i@dan.games>
AuthorDate: Thu Mar 28 11:54:47 2024 +0800
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>
---
gnu/packages/vulkan.scm | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 038a896803..ef6e4b454f 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -359,7 +359,7 @@ API.")
(package
(name "shaderc")
;; shaderc doesn't follow the versioning scheme of vulkan sdk
- (version "2022.3")
+ (version "2024.0")
(source
(origin
(method git-fetch)
@@ -369,13 +369,18 @@ API.")
(file-name (git-file-name name version))
(sha256
(base32
- "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d"))))
+ "1m5jncn6y8c6g83f8nwh86hz33mvv03x7fyr5zq0ynwanrcpn2hb"))))
(build-system cmake-build-system)
(arguments
`(;; FIXME: Skip most of the tests, because enabling system gtest breaks
;; the build: <https://github.com/google/shaderc/issues/470>.
#:configure-flags
(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.
(string-append "-Dglslang_SOURCE_DIR="
(assoc-ref %build-inputs "glslang")
"/include/glslang"))
@@ -401,20 +406,11 @@ API.")
,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") "")))))))
+ #t)))))
(inputs
- (list glslang python spirv-headers spirv-tools))
+ (list glslang spirv-headers spirv-tools))
(native-inputs
- (list pkg-config))
+ (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
- branch mesa-updates updated (d9dee5ea2f -> 23928e2d42), guix-commits, 2024/04/01
- 01/21: Merge branch 'master' into mesa-updates, guix-commits, 2024/04/01
- 02/21: gnu: python-pycairo: Update to 1.26.0., guix-commits, 2024/04/01
- 03/21: gnu: cairo: Update to 1.18.0., guix-commits, 2024/04/01
- 04/21: gnu: libdrm: Update to 2.4.120., guix-commits, 2024/04/01
- 06/21: gnu: mesa: Update to 24.0.3., guix-commits, 2024/04/01
- 09/21: gnu: spirv-headers: Update to 1.3.280.0., guix-commits, 2024/04/01
- 12/21: gnu: spirv-cross: Update to 1.3.280.0., guix-commits, 2024/04/01
- 13/21: gnu: shaderc: Update to 2024.0.,
guix-commits <=
- 15/21: gnu: vulkan-loader: Update to 1.3.280.0., guix-commits, 2024/04/01
- 16/21: gnu: volk: Update to 1.3.280.0., guix-commits, 2024/04/01
- 19/21: gnu: Add vulkan-utility-libraries., guix-commits, 2024/04/01
- 05/21: gnu: mesa: Hardcode libvulkan.so's dependency for zink., guix-commits, 2024/04/01
- 07/21: gnu: sdl2: Update to 2.30.1., guix-commits, 2024/04/01
- 08/21: gnu: librsvg-2.40: Skip tests that fail with cairo 1.18.0., guix-commits, 2024/04/01
- 10/21: gnu: spirv-tools: Update to 1.3.280.0., guix-commits, 2024/04/01
- 11/21: gnu: glslang: Update to 1.3.280.0., guix-commits, 2024/04/01
- 14/21: gnu: vulkan-headers: Update to 1.3.280.0., guix-commits, 2024/04/01
- 17/21: gnu: vulkan-tools: Update to 1.3.280.0., guix-commits, 2024/04/01