gnu: glslang: Update to 7.11.3113.

* gnu/packages/vulkan.scm (glslang): Update to 7.11.3113.
This commit is contained in:
Rutger Helling 2019-03-06 08:45:27 +01:00
parent 3546e97f38
commit 3113ecfaec
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 35 additions and 39 deletions

View File

@ -118,47 +118,43 @@ disassembler, validator, and optimizer for SPIR-V.")
(license license:asl2.0)))) (license license:asl2.0))))
(define-public glslang (define-public glslang
;; Keep updated in accordance with (package
;; https://github.com/google/shaderc/blob/known-good/known_good.json (name "glslang")
(let ((commit "32d3ec319909fcad0b2b308fe1635198773e8316") (version "7.11.3113")
(revision "3")) (source
(package (origin
(name "glslang") (method git-fetch)
(version (string-append "3.0-" revision "." (string-take commit 9))) (uri (git-reference
(source (url "https://github.com/KhronosGroup/glslang")
(origin (commit version)))
(method git-fetch) (sha256
(uri (git-reference (base32
(url "https://github.com/KhronosGroup/glslang") "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6"))
(commit commit))) (file-name (string-append name "-" version "-checkout"))))
(sha256 (build-system cmake-build-system)
(base32 (arguments
"1kmgjv5kbrjy6azpgwnjcn3cj8vg5i8hnyk3m969sc0gq2j1rbjj")) `(#:tests? #f ;; No tests
(file-name (string-append name "-" version "-checkout")))) ;; glslang tries to set CMAKE_INSTALL_PREFIX manually. Remove the
(build-system cmake-build-system) ;; offending line.
(arguments #:phases (modify-phases %standard-phases
`(#:tests? #f ;; No tests (add-after 'patch-source-shebangs 'fix-cmakelists
;; glslang tries to set CMAKE_INSTALL_PREFIX manually. Remove the (lambda _
;; offending line. (substitute* "CMakeLists.txt"
#:phases (modify-phases %standard-phases (("set.*CMAKE_INSTALL_PREFIX.*") ""))
(add-after 'patch-source-shebangs 'fix-cmakelists #t)))))
(lambda _ (native-inputs `(("bison" ,bison)
(substitute* "CMakeLists.txt" ("pkg-config" ,pkg-config)))
(("set.*CMAKE_INSTALL_PREFIX.*") "")) (home-page "https://github.com/KhronosGroup/glslang")
#t))))) (synopsis "OpenGL and OpenGL ES shader front end and validator")
(native-inputs `(("bison" ,bison) (description
("pkg-config" ,pkg-config))) "Glslang is the official reference compiler front end for the
(home-page "https://github.com/KhronosGroup/glslang")
(synopsis "OpenGL and OpenGL ES shader front end and validator")
(description
"Glslang is the official reference compiler front end for the
OpenGL@tie{}ES and OpenGL shading languages. It implements a strict OpenGL@tie{}ES and OpenGL shading languages. It implements a strict
interpretation of the specifications for these languages.") interpretation of the specifications for these languages.")
;; Modified BSD license. See "copyright" section of ;; Modified BSD license. See "copyright" section of
;; https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ ;; https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
(license (list license:bsd-3 (license (list license:bsd-3
;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.0. ;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.0.
license:asl2.0))))) license:asl2.0))))
(define-public vulkan-headers (define-public vulkan-headers
(package (package