[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/11: gnu: vulkan: Add glslang.
From: |
Marius Bakke |
Subject: |
09/11: gnu: vulkan: Add glslang. |
Date: |
Sun, 17 Dec 2017 19:26:05 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 6a11d5f149a0a2337b67269872af12051d7cb5b3
Author: Rutger Helling <address@hidden>
Date: Thu Dec 14 23:03:02 2017 +0100
gnu: vulkan: Add glslang.
* gnu/packages/vulkan.scm (glslang): New variable.
Signed-off-by: Marius Bakke <address@hidden>
---
gnu/packages/vulkan.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 252500a..ca6b72c 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -23,6 +23,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
+ #:use-module (gnu packages bison)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python))
@@ -98,3 +99,46 @@ and for the GLSL.std.450 extended instruction set.
SPIR-V modules. The project includes an assembler, binary module parser,
disassembler, validator, and optimizer for SPIR-V.")
(license license:asl2.0)))
+
+(define-public glslang
+ ;; Version 3.0 is too old for vulkan-icd-loader. Use a recent git commit
+ ;; until the next stable version.
+ (let ((commit "471bfed0621162a7513fc24a51e8a1ccc2e640ff")
+ (revision "1"))
+ (package
+ (name "glslang")
+ (version (string-append "3.0-" revision "." (string-take commit 9)))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/KhronosGroup/glslang")
+ (commit commit)))
+ (sha256
+ (base32
+ "0m2vljmrqppp80ghbbwfnayqw2canxlcjhgy6jw9xjdssln0d3pd"))
+ (file-name (string-append name "-" version "-checkout"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f ;; No tests
+ ;; glslang tries to set CMAKE_INSTALL_PREFIX manually. Remove the
+ ;; offending line.
+ #:phases (modify-phases %standard-phases
+ (add-after 'patch-source-shebangs 'fix-cmakelists
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("set.*CMAKE_INSTALL_PREFIX.*") ""))
+ #t)))))
+ (native-inputs `(("bison" ,bison)
+ ("pkg-config" ,pkg-config)))
+ (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
address@hidden and OpenGL shading languages. It implements a strict
+interpretation of the specifications for these languages.")
+ ;; Modified BSD license. See "copyright" section of
+ ;; https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
+ (license (list license:bsd-3
+ ;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.0.
+ license:asl2.0)))))
- branch core-updates updated (cafc97e -> 01564e5), Marius Bakke, 2017/12/17
- 03/11: gnu: pulseaudio: Update to 11.1., Marius Bakke, 2017/12/17
- 01/11: gnu: mesa: Update to 17.2.7., Marius Bakke, 2017/12/17
- 02/11: gnu: ftgl: Add missing dependency on pkg-config., Marius Bakke, 2017/12/17
- 08/11: gnu: vulkan: Add spirv-tools., Marius Bakke, 2017/12/17
- 04/11: gnu: pulseaudio: Use 'modify-phases' syntax., Marius Bakke, 2017/12/17
- 09/11: gnu: vulkan: Add glslang.,
Marius Bakke <=
- 11/11: gnu: retroarch: Enable Vulkan support., Marius Bakke, 2017/12/17
- 05/11: gnu: librsvg: Update to 2.40.20., Marius Bakke, 2017/12/17
- 06/11: gnu: mesa: Enable Vulkan drivers for Intel and Radeon., Marius Bakke, 2017/12/17
- 10/11: gnu: vulkan: Add vulkan-icd-loader., Marius Bakke, 2017/12/17
- 07/11: gnu: vulkan: Add spirv-headers., Marius Bakke, 2017/12/17