From 6edbf8de877651495c7b9f6f41e921c501f3c9fb Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 21 Jun 2019 10:18:19 +0200 Subject: gnu: vulkan-headers: Update to 1.1.108. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.1.108. * gnu/packages/vulkan.scm (vulkan-loader): Update hash. [arguments]: Add 'copy-headers1 and 'copy-headers2 phases. * gnu/packages/vulkan.scm (vulkan-tools): Update hash. --- gnu/packages/vulkan.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'gnu/packages/vulkan.scm') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6b151f0a31..86a0d711eb 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -159,7 +159,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.107") + (version "1.1.108") (source (origin (method git-fetch) @@ -169,7 +169,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0kyf83n6fghqmjj5jbwhy08yq5sl598qnmw3kbavrnw9avqqm0c4")))) + "0slj10rfcrd6xpfhm13x3q1ldz2qhk9p64cw0nw0qlmy40k1iy83")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -193,7 +193,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "1p64k9x5r7nsrs0cn6d61687xbajqvsm78xk6j85w9wfin5dxs30")))) + "08v3sdkr0aii4a9jqhyz8j3x42zm2qswsiy6qsb47wz4bpi90zgy")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -203,6 +203,28 @@ interpretation of the specifications for these languages.") (lambda* (#:key inputs #:allow-other-keys) ;; Remove lines trying to build in a git commit id. (substitute* "CMakeLists.txt" ((".*spirv_tools_commit_id.h.*") "")) + #t)) + ;; Make sure that the files needed for Mesa's Vulkan overlay are availabe. + (add-after 'unpack 'copy-headers1 + (lambda* (#:key outputs #:allow-other-keys) + (install-file "tests/layers/vk_layer_data.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) + (install-file "tests/layers/vk_layer_extension_utils.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) + (install-file "loader/vk_loader_platform.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) + #t)) + (add-after 'build 'copy-headers2 + (lambda* (#:key outputs #:allow-other-keys) + (install-file "vk_layer_dispatch_table.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) + (install-file "vk_dispatch_table_helper.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) #t))) #:configure-flags (list "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule. @@ -244,7 +266,7 @@ and the ICD.") (file-name (git-file-name name version)) (sha256 (base32 - "1mak96jdg3wv043b4jxyv1fm2cz4nnallg0yb90my3yp5q64grrw")))) + "1azch34l9b57wxvh2k5vc0qzmhnapli3348wwhs04z6izszyz4kf")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) -- cgit v1.2.3 From c24b896365ebf0c783140e53e000305e682d18c5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 26 Jun 2019 09:16:20 +0200 Subject: gnu: vulkan-headers: Update to 1.1.112. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.1.112. * gnu/packages/vulkan.scm (vulkan-loader): Update hash. * gnu/packages/vulkan.scm (vulkan-tools): Update hash. --- gnu/packages/vulkan.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/vulkan.scm') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 86a0d711eb..9fb780de77 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -159,7 +159,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.108") + (version "1.1.112") (source (origin (method git-fetch) @@ -169,7 +169,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0slj10rfcrd6xpfhm13x3q1ldz2qhk9p64cw0nw0qlmy40k1iy83")))) + "0iia2wlq38hvxwip6r3k5946ylrlk42fw50mhf0pdjxjh02p8zn5")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -193,7 +193,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "08v3sdkr0aii4a9jqhyz8j3x42zm2qswsiy6qsb47wz4bpi90zgy")))) + "1819bgmpjlikcc25bkmwwb7mp1rlyrq2v74wybg1g40ix70v0m0d")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -266,7 +266,7 @@ and the ICD.") (file-name (git-file-name name version)) (sha256 (base32 - "1azch34l9b57wxvh2k5vc0qzmhnapli3348wwhs04z6izszyz4kf")))) + "0an9hqvvpfmfld2pkszzwi7ccb9g2ijjqqzlj24dqg9kqnmcr3x4")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) -- cgit v1.2.3