all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: dan <i@dan.games>
To: 69461@debbugs.gnu.org
Subject: [bug#69461] [mesa-updates 09/13] gnu: vulkan-tools: Update to vulkan-sdk-1.3.275.0.
Date: Thu, 29 Feb 2024 01:31:42 +0800	[thread overview]
Message-ID: <617d4147db2b9bb37b94514cb79aaebf1fb5d5d5.1709140055.git.i@dan.games> (raw)
In-Reply-To: <cover.1709140055.git.i@dan.games>

* gnu/packages/vulkan.scm (vulkan-tools): Update to vulkan-sdk-1.3.275.0.
  [arguments]: Turn on tests.
  [arguments]<:#configure-flags>: Remove GLSLANG_INSTALL_DIR.
  [native-inputs]: Add googletest.

Change-Id: I607c7ce414f8c0c8ee25ad0701d91771f5c4a7fc
---
 gnu/packages/vulkan.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 807b0be8af..82bc87dcd6 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -316,20 +316,24 @@ (define-public vulkan-tools
              (url "https://github.com/KhronosGroup/Vulkan-Tools")
              (commit version)))
        (file-name (git-file-name name version))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "tests/icd/mock_icd_tests.cpp"
+                    ;; Disable driver info test since it relies on git branch info
+                    (("ASSERT_EQ\\(std::string\\(driver_properties\\.driverInfo\\)")
+                     "// ASSERT_EQ(std::string(driver_properties.driverInfo)")))
        (sha256
-        (base32
-         "0jzwjfx4c7y15wkwfhhc64rzljpi47bxrm5jw5blfsqjh8zsd27a"))))
+        (base32 "0g604gzzlqibnkjd18iss6iwn852nnsfrrgfnwn97khpr0xk1h6j"))))
     (build-system cmake-build-system)
-    (inputs
-     (list glslang libxrandr vulkan-loader wayland wayland-protocols))
-    (native-inputs
-     (list pkg-config python vulkan-headers))
+    (inputs (list glslang libxrandr vulkan-loader wayland wayland-protocols))
+    (native-inputs (list googletest pkg-config python volk vulkan-headers))
     (arguments
-     `(#:tests? #f                      ;no tests
-       #:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR="
-                               (assoc-ref %build-inputs "glslang")))))
-    (home-page
-     "https://github.com/KhronosGroup/Vulkan-Tools")
+     `(#:configure-flags (list "-DBUILD_TESTS=ON")
+       #:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "./tests/vulkan_tools_tests")))))))
+    (home-page "https://github.com/KhronosGroup/Vulkan-Tools")
     (synopsis "Tools and utilities for Vulkan")
     (description
      "Vulkan-Tools provides tools and utilities that can assist development by
-- 
2.41.0





  parent reply	other threads:[~2024-02-28 17:33 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 ` dan [this message]
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   ` [bug#69461] [PATCH mesa-updates v3 12/13] gnu: vulkan-validationlayers: Update to 1.3.280.0 dan
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=617d4147db2b9bb37b94514cb79aaebf1fb5d5d5.1709140055.git.i@dan.games \
    --to=i@dan.games \
    --cc=69461@debbugs.gnu.org \
    /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.