me/guix
Archived
1
0
Fork 0
Code Activity

gnu: shaderc: Update to 2018.0.

Browse source 
* gnu/packages/vulkan.scm (shaderc): Update to 2018.0.
This commit is contained in:
Rutger Helling 2019-03-06 09:06:24 +01:00
parent 264c803b82
commit d9eada7917
No known key found for this signature in database
GPG key ID: F3A727DB44FCCA36
1 changed files with 66 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
gnu/packages/vulkan.scm
View file

@ -275,75 +275,73 @@ API.")
(license (list license:asl2.0)))) ;LICENSE.txt (license (list license:asl2.0)))) ;LICENSE.txt
(define-public shaderc (define-public shaderc
(let ((commit "be8e0879750303a1de09385465d6b20ecb8b380d") (package
(revision "2")) (name "shaderc")
(package (version "2018.0")
(name "shaderc") (source
(version (git-version "0.0.0" revision commit)) (origin
(source (method git-fetch)
(origin (uri (git-reference
(method git-fetch) (url "https://github.com/google/shaderc")
(uri (git-reference (commit (string-append "v" version))))
(url "https://github.com/google/shaderc") (file-name (git-file-name name version))
(commit commit))) (sha256
(file-name (string-append name "-" version ".tar.gz")) (base32
(sha256 "0qigmj0riw43pgjn5f6kpvk72fajssz1lc2aiqib5qvmj9rqq3hl"))))
(base32 (build-system meson-build-system)
"16p25ry2i4zrj00zihfpf210f8xd7g398ffbw25igvi9mbn4nbfd")))) (arguments
(build-system meson-build-system) `(#:tests? #f ; FIXME: Tests fail.
(arguments #:phases
`(#:tests? #f ; FIXME: Tests fail. (modify-phases %standard-phases
#:phases (replace 'configure
(modify-phases %standard-phases (lambda* (#:key outputs #:allow-other-keys)
(replace 'configure (let ((out (assoc-ref outputs "out")))
(lambda* (#:key outputs #:allow-other-keys) ;; Remove various lines and touch build-version.inc or
(let ((out (assoc-ref outputs "out"))) ;; configuring won't work.
;; Remove various lines and touch build-version.inc or (invoke "touch" "glslc/src/build-version.inc")
;; configuring won't work. (substitute* "CMakeLists.txt" (("..PYTHON_EXE..*") ""))
(invoke "touch" "glslc/src/build-version.inc") (substitute* "CMakeLists.txt"
(substitute* "CMakeLists.txt" (("..PYTHON_EXE..*") "")) ((".*update_build_version.py..*") ""))
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
((".*update_build_version.py..*") "")) ((".*add_custom_target.build-version.*") ""))
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
((".*add_custom_target.build-version.*") "")) ((".*spirv-tools_SOURCE_DIR.*glslang_SOURCE_DIR.*")
(substitute* "CMakeLists.txt" ""))
((".*spirv-tools_SOURCE_DIR.*glslang_SOURCE_DIR.*") (substitute* "CMakeLists.txt"
"")) ((".*Update build-version.inc.*") ""))
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt" ((".*--check.*") ""))
((".*Update build-version.inc.*") "")) (substitute* "glslc/src/main.cc" ((".*build-version.inc.*")
(substitute* "CMakeLists.txt" ((".*--check.*") "")) "\"1\""))
(substitute* "glslc/src/main.cc" ((".*build-version.inc.*") (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release"
"\"1\"")) "-DSHADERC_SKIP_TESTS=ON"
(invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_LIBDIR=lib"
"-DSHADERC_SKIP_TESTS=ON" (string-append "-DCMAKE_INSTALL_PREFIX="
"-DCMAKE_INSTALL_LIBDIR=lib" out)))))
(string-append "-DCMAKE_INSTALL_PREFIX=" (add-after 'unpack 'unpack-sources
out))))) (lambda* (#:key inputs #:allow-other-keys)
(add-after 'unpack 'unpack-sources (let ((spirv-tools-source (assoc-ref inputs "spirv-tools-source"))
(lambda* (#:key inputs #:allow-other-keys) (spirv-headers-source (assoc-ref inputs "spirv-headers-source"))
(let ((spirv-tools-source (assoc-ref inputs "spirv-tools-source")) (glslang-source (assoc-ref inputs "glslang-source")))
(spirv-headers-source (assoc-ref inputs "spirv-headers-source")) (copy-recursively spirv-tools-source "third_party/spirv-tools")
(glslang-source (assoc-ref inputs "glslang-source"))) (copy-recursively spirv-headers-source
(copy-recursively spirv-tools-source "third_party/spirv-tools") (string-append "third_party/spirv-tools"
(copy-recursively spirv-headers-source "/external/spirv-headers"))
(string-append "third_party/spirv-tools" (copy-recursively glslang-source "third_party/glslang")
"/external/spirv-headers")) #t))))))
(copy-recursively glslang-source "third_party/glslang") (inputs
#t)))))) `(("googletest" ,googletest)
(inputs ("python" ,python)))
`(("googletest" ,googletest) (native-inputs
("python" ,python))) `(("cmake" ,cmake)
(native-inputs ("glslang-source" ,(package-source glslang))
`(("cmake" ,cmake) ("pkg-config" ,pkg-config)
("glslang-source" ,(package-source glslang)) ("spirv-headers-source" ,(package-source spirv-headers))
("pkg-config" ,pkg-config) ("spirv-tools-source" ,(package-source spirv-tools))))
("spirv-headers-source" ,(package-source spirv-headers)) (home-page "https://github.com/google/shaderc")
("spirv-tools-source" ,(package-source spirv-tools)))) (synopsis "Tools for shader compilation")
(home-page "https://github.com/google/shaderc") (description "Shaderc is a collection of tools, libraries, and tests for
(synopsis "Tools for shader compilation")
(description "Shaderc is a collection of tools, libraries, and tests for
shader compilation.") shader compilation.")
(license license:asl2.0)))) (license license:asl2.0)))
(define-public vkd3d (define-public vkd3d
(let ((commit "ecda316ef54d70bf1b3e860755241bb75873e53f")) ; Release 1.1. (let ((commit "ecda316ef54d70bf1b3e860755241bb75873e53f")) ; Release 1.1.