[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/63: gnu: shaderc: Update to 2020.0.
From: |
guix-commits |
Subject: |
48/63: gnu: shaderc: Update to 2020.0. |
Date: |
Tue, 26 May 2020 17:18:13 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 4c5e45eb6bf1ad50ee2d0b5c854e81f6ce8de523
Author: Marius Bakke <address@hidden>
AuthorDate: Fri May 22 17:38:36 2020 +0200
gnu: shaderc: Update to 2020.0.
* gnu/packages/vulkan.scm (shaderc): Update to 2020.0.
[build-system]: Change to CMAKE-BUILD-SYSTEM.
[arguments]: Move custom configure invokation to #:configure-flags. Add
phase
to prevent using bundled code.
[inputs]: Add GLSLANG, SPIRV-HEADERS, and SPIRV-TOOLS.
[native-inputs]: Remove CMAKE-MINIMAL, GLSLANG:SOURCE, SPIRV-HEADERS:SOURCE,
and SPIRV-TOOLS:SOURCE.
---
gnu/packages/vulkan.scm | 71 ++++++++++++++++++-------------------------------
1 file changed, 26 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 732d554..a96b33c 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -253,7 +253,7 @@ API.")
(define-public shaderc
(package
(name "shaderc")
- (version "2019.0")
+ (version "2020.0")
(source
(origin
(method git-fetch)
@@ -263,56 +263,37 @@ API.")
(file-name (git-file-name name version))
(sha256
(base32
- "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2"))))
- (build-system meson-build-system)
+ "1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff"))))
+ (build-system cmake-build-system)
(arguments
`(#:tests? #f ; FIXME: Tests fail.
+ #:configure-flags '("-DSHADERC_SKIP_TESTS=ON")
#:phases
(modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; Remove various lines and touch build-version.inc or
- ;; configuring won't work.
- (invoke "touch" "glslc/src/build-version.inc")
- (substitute* "CMakeLists.txt" (("..PYTHON_EXE..*") ""))
- (substitute* "CMakeLists.txt"
- ((".*update_build_version.py..*") ""))
- (substitute* "CMakeLists.txt"
- ((".*add_custom_target.build-version.*") ""))
- (substitute* "CMakeLists.txt"
- ((".*spirv-tools_SOURCE_DIR.*glslang_SOURCE_DIR.*")
- ""))
- (substitute* "CMakeLists.txt"
- ((".*Update build-version.inc.*") ""))
- (substitute* "CMakeLists.txt" ((".*--check.*") ""))
- (substitute* "glslc/src/main.cc" ((".*build-version.inc.*")
- "\"1\""))
- (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release"
- "-DSHADERC_SKIP_TESTS=ON"
- "-DCMAKE_INSTALL_LIBDIR=lib"
- (string-append "-DCMAKE_INSTALL_PREFIX="
- out)))))
- (add-after 'unpack 'unpack-sources
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((spirv-tools-source (assoc-ref inputs "spirv-tools-source"))
- (spirv-headers-source (assoc-ref inputs
"spirv-headers-source"))
- (glslang-source (assoc-ref inputs "glslang-source")))
- (copy-recursively spirv-tools-source "third_party/spirv-tools")
- (copy-recursively spirv-headers-source
- (string-append "third_party/spirv-tools"
- "/external/spirv-headers"))
- (copy-recursively glslang-source "third_party/glslang")
- #t))))))
+ (add-after 'unpack 'do-not-look-for-bundled-sources
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("add_subdirectory\\(third_party\\)")
+ ""))
+
+ ;; Do not attempt to use git to encode version information.
+ (substitute* "glslc/CMakeLists.txt"
+ (("add_dependencies\\(glslc_exe build-version\\)")
+ ""))
+ (call-with-output-file "glslc/src/build-version.inc"
+ (lambda (port)
+ (format port "\"~a\"\n\"~a\"\n\"~a\"~%"
+ ,version
+ ,(package-version spirv-tools)
+ ,(package-version glslang))))
+ #t)))))
(inputs
- `(("googletest" ,googletest)
- ("python" ,python)))
+ `(("glslang" ,glslang)
+ ("python" ,python)
+ ("spirv-headers" ,spirv-headers)
+ ("spirv-tools" ,spirv-tools)))
(native-inputs
- `(("cmake" ,cmake-minimal)
- ("glslang-source" ,(package-source glslang))
- ("pkg-config" ,pkg-config)
- ("spirv-headers-source" ,(package-source spirv-headers))
- ("spirv-tools-source" ,(package-source spirv-tools))))
+ `(("pkg-config" ,pkg-config)))
(home-page "https://github.com/google/shaderc")
(synopsis "Tools for shader compilation")
(description "Shaderc is a collection of tools, libraries, and tests for
- 33/63: gnu: Qt: Update to 5.14.2., (continued)
- 33/63: gnu: Qt: Update to 5.14.2., guix-commits, 2020/05/26
- 49/63: gnu: shaderc: Enable (some) tests., guix-commits, 2020/05/26
- 26/63: gnu: python-idna: Update to 2.9., guix-commits, 2020/05/26
- 28/63: gnu: NSS: Update to 3.52., guix-commits, 2020/05/26
- 32/63: gnu: KDE Frameworks: Update to 5.70., guix-commits, 2020/05/26
- 35/63: gnu: NSS: Update to 3.52.1 [fixes CVE-2020-12399]., guix-commits, 2020/05/26
- 40/63: gnu: spirv-tools: Update to 2020.2., guix-commits, 2020/05/26
- 34/63: gnu: Mesa: Fix ineffective substitution on i686-linux., guix-commits, 2020/05/26
- 42/63: gnu: glslang: Update to 8.13.3743., guix-commits, 2020/05/26
- 44/63: gnu: vulkan-headers: Update to 1.2.141., guix-commits, 2020/05/26
- 48/63: gnu: shaderc: Update to 2020.0.,
guix-commits <=
- 53/63: gnu: Mesa: Fix substitutions for absolute library references., guix-commits, 2020/05/26
- 55/63: gnu: vkd3d: Fix build with newer Vulkan headers., guix-commits, 2020/05/26
- 58/63: gnu: mtxclient: Update to 0.3.0., guix-commits, 2020/05/26
- 46/63: gnu: vulkan-loader: Enable tests., guix-commits, 2020/05/26
- 45/63: gnu: vulkan-loader: Update to 1.2.140., guix-commits, 2020/05/26
- 50/63: gnu: Mesa: Install scripts to a separate output., guix-commits, 2020/05/26
- 57/63: gnu: qtdeclarative: Fix reference on qmlcachegen., guix-commits, 2020/05/26
- 61/63: gnu: mesa-headers: Do not inherit outputs from Mesa., guix-commits, 2020/05/26
- 63/63: Merge branch 'master' into staging, guix-commits, 2020/05/26