From: dan <i@dan.games>
To: 69461@debbugs.gnu.org
Cc: john.kehayias@protonmail.com
Subject: [bug#69461] [PATCH mesa-updates v3 12/13] gnu: vulkan-validationlayers: Update to 1.3.280.0.
Date: Thu, 28 Mar 2024 11:54:54 +0800 [thread overview]
Message-ID: <435c72f590aa854b9072c5967eabfd1cbc6c8bcb.1711561863.git.i@dan.games> (raw)
In-Reply-To: <cover.1711561863.git.i@dan.games>
* gnu/packages/vulkan.scm (vulkan-validationlayers): Update to 1.3.280.0.
[source]: Add snippet.
[inputs]: Add robin-hood-hashing and vulkan-utility-libraries.
[arguments]: Remove configure-flags, replace check step, and update reason
why disabling tests.
Change-Id: I80ca002d8dbe71cad57f859ee34ac8f10e175907
---
gnu/packages/vulkan.scm | 55 ++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 6239f7ea4d..1016e9db36 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -47,9 +47,6 @@ (define-module (gnu packages vulkan)
#:use-module (gnu packages wine)
#:use-module (gnu packages xorg))
-;; Note: Remember to change vulkan-loader version when bumping this.
-(define %vulkan-sdk-version "sdk-1.3.231.1")
-
(define-public spirv-headers
(package
(name "spirv-headers")
@@ -478,51 +475,37 @@ (define-public vkd3d
(define-public vulkan-validationlayers
(package
(name "vulkan-validationlayers")
- (version %vulkan-sdk-version)
+ (version "1.3.280.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://github.com/KhronosGroup/Vulkan-ValidationLayers")
- (commit version)))
+ (commit (string-append "vulkan-sdk-" version))))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ ;; We don't build static libraries in SPIRV-Tools.
+ (snippet '(substitute* "tests/CMakeLists.txt"
+ (("-static")
+ "")))
(sha256
(base32
- "07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75"))))
+ "1w6fsaicrgnzkj5vz2v86a2gk1n7478q6n66ac2920avnin9a64c"))))
(build-system cmake-build-system)
(inputs (list glslang
libxrandr
mesa
+ robin-hood-hashing
shaderc
spirv-tools
vulkan-loader
+ vulkan-utility-libraries
wayland))
- (native-inputs (list pkg-config python spirv-headers vulkan-headers))
+ (native-inputs (list googletest pkg-config python spirv-headers vulkan-headers))
(arguments
- (list #:tests? #f ;no tests
+ (list #:tests? #f ; test crashed
#:configure-flags
- #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF"
- (string-append "-DGLSLANG_INSTALL_DIR="
- (dirname (dirname
- (search-input-directory
- %build-inputs
- "include/glslang"))))
- (string-append "-DSPIRV_HEADERS_INSTALL_DIR="
- (dirname (dirname
- (search-input-directory
- %build-inputs
- "include/spirv"))))
- (string-append "-DSPIRV_TOOLS_INSTALL_DIR="
- (dirname (dirname
- (search-input-directory
- %build-inputs
- "include/spirv-tools"))))
- (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
- (dirname (dirname
- (search-input-directory
- %build-inputs
- "include/vulkan"))))
- "-Wno-dev")
+ #~(list "-DBUILD_TESTS=ON")
#:phases #~(modify-phases %standard-phases
(add-after 'install 'set-layer-path-in-manifest
(lambda _
@@ -532,7 +515,17 @@ (define-public vulkan-validationlayers
(substitute* manifest
(("\"libVkLayer_khronos_validation.so\"")
(string-append "\"" #$output
- "/lib/libVkLayer_khronos_validation.so\"")))))))))
+ "/lib/libVkLayer_khronos_validation.so\""))))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "VK_LAYER_PATH" (string-append (getcwd) "/layers"))
+ (setenv "LD_LIBRARY_PATH"
+ (string-append #$(this-package-input "vulkan-loader") "/lib"))
+ (setenv "MESA_SHADER_CACHE_DIR"
+ (string-append (getcwd) "/shader-cache"))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (invoke "./tests/vk_layer_validation_tests")))))))
(home-page "https://github.com/KhronosGroup/Vulkan-ValidationLayers")
(synopsis "Khronos official validation layers for Vulkan")
(description
--
2.41.0
next prev parent reply other threads:[~2024-03-28 3:58 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-28 17:28 [bug#69461] [mesa-updates 00/13] Update vulkan-sdk and add dirctx-shader-compiler dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 01/13] gnu: spirv-headers: Update to vulkan-sdk-1.3.275.0 dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 02/13] gnu: spirv-tools: " dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 03/13] gnu: glslang: " dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 04/13] gnu: spirv-cross: " dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 05/13] gnu: shaderc: Update to 2023.8 dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 06/13] gnu: vulkan-headers: Update to vulkan-sdk-1.3.275.0 dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 07/13] gnu: vulkan-loader: " dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 08/13] gnu: volk: " dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 09/13] gnu: vulkan-tools: " dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 10/13] gnu: magic-enum: Update to 0.9.5 dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 11/13] gnu: Add vulkan-utility-libraries dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 12/13] gnu: vulkan-validationlayers: Update to vulkan-sdk-1.3.275.0 dan
2024-02-28 17:31 ` [bug#69461] [mesa-updates 13/13] gnu: Add directx-shader-compiler dan
2024-03-16 16:09 ` [bug#69461] [PATCH mesa-updates v2 0/1] " dan
2024-03-16 16:09 ` [bug#69461] [PATCH mesa-updates v2 1/1] " dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 00/13] Update vulkan-sdk to 1.3.280.0 and add directx-shader-compiler dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 01/13] gnu: spirv-headers: Update to 1.3.280.0 dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 02/13] gnu: spirv-tools: " dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 03/13] gnu: glslang: " dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 04/13] gnu: spirv-cross: " dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 05/13] gnu: shaderc: Update to 2024.0 dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 06/13] gnu: vulkan-headers: Update to 1.3.280.0 dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 07/13] gnu: vulkan-loader: " dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 08/13] gnu: volk: " dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 09/13] gnu: vulkan-tools: " dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 10/13] gnu: magic-enum: Update to 0.9.5 dan
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 11/13] gnu: Add vulkan-utility-libraries dan
2024-03-28 3:54 ` dan [this message]
2024-03-28 3:54 ` [bug#69461] [PATCH mesa-updates v3 13/13] gnu: Add directx-shader-compiler dan
2024-04-18 4:54 ` [bug#69461] [PATCH mesa-updates v3 00/13] Update vulkan-sdk to 1.3.280.0 and add directx-shader-compiler John Kehayias via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=435c72f590aa854b9072c5967eabfd1cbc6c8bcb.1711561863.git.i@dan.games \
--to=i@dan.games \
--cc=69461@debbugs.gnu.org \
--cc=john.kehayias@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.