unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Kaelyn Takata via Guix-patches via <guix-patches@gnu.org>
To: 58617@debbugs.gnu.org
Cc: Kaelyn Takata <kaelyn.alexi@protonmail.com>
Subject: [bug#58617] [PATCH core-updates 5/8] gnu: vulkan-loader: Update to 1.3.224.1.
Date: Wed, 19 Oct 2022 00:42:31 +0000	[thread overview]
Message-ID: <20221019004136.32677-5-kaelyn.alexi@protonmail.com> (raw)
In-Reply-To: <20221019003957.31382-1-kaelyn.alexi@protonmail.com>

* gnu/packages/vulkan.scm (vulkan-loader): Update to 1.3.224.1.
[arguments]: Enable tests by removing the obsolete build phase
'disable-loader-tests and adjusting configure flags.
---
 gnu/packages/vulkan.scm | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 976e43456b..560475c273 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -208,42 +208,32 @@ (define-public vulkan-headers
 (define-public vulkan-loader
   (package
     (name "vulkan-loader")
-    (version "1.2.162")
+    (version "1.3.224.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/KhronosGroup/Vulkan-Loader")
-             (commit (string-append "v" version))))
+             (commit (string-append "sdk-" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv"))))
+         "1xqhqd37y1msaq6bz0ksc7z36sgm19p5bkscdk07dc58yyc4hrwn"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
        ,#~(list
            (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
                           #$(this-package-input "vulkan-headers"))
-           (string-append "-DCMAKE_INSTALL_INCLUDEDIR="
-                          #$(this-package-input "vulkan-headers")
-                          "/include"))
+           (string-append "-DGOOGLETEST_INSTALL_DIR="
+                          (getcwd) "/source/external/googletest")
+           "-DBUILD_TESTS=ON")
        #:phases (modify-phases %standard-phases
                   (add-after 'unpack 'unpack-googletest
                     (lambda* (#:key inputs #:allow-other-keys)
                       (let ((gtest (assoc-ref inputs "googletest:source")))
                         (when gtest
-                          (copy-recursively gtest "external/googletest"))
-                        #t)))
-                  (add-after 'unpack 'disable-loader-tests
-                    (lambda _
-                      ;; Many tests require a Vulkan driver.  Skip those.
-                      (substitute* "tests/loader_validation_tests.cpp"
-                        ((".*= vkCreateInstance.*" all)
-                         (string-append "GTEST_SKIP();\n" all))
-                        (("TEST_F.*InstanceExtensionEnumerated.*" all)
-                         (string-append all "\nGTEST_SKIP();\n")))
-                      #t)))))
+                          (copy-recursively gtest "external/googletest"))))))))
     (native-inputs
      `(("googletest:source" ,(package-source googletest))
        ("libxrandr" ,libxrandr)
--
2.37.3






  parent reply	other threads:[~2022-10-19  0:43 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-19  0:40 [bug#58617] [PATCH core-updates 0/8] Update Vulkan packages to sdk-1.3.224.1 Kaelyn Takata via Guix-patches via
2022-10-19  0:41 ` [bug#58617] [PATCH core-updates 1/8] gnu: spirv-headers: Update to 1.3.224.1 Kaelyn Takata via Guix-patches via
2022-10-19  0:42 ` [bug#58617] [PATCH core-updates 2/8] gnu: spirv-tools: Update to 2022.3 Kaelyn Takata via Guix-patches via
2022-10-19  0:42 ` [bug#58617] [PATCH core-updates 3/8] gnu: spirv-cross: Update to 1.3.224.1 Kaelyn Takata via Guix-patches via
2022-10-19  0:42 ` [bug#58617] [PATCH core-updates 4/8] gnu: vulkan-headers: " Kaelyn Takata via Guix-patches via
2022-10-19  0:42 ` Kaelyn Takata via Guix-patches via [this message]
2022-10-19  0:42 ` [bug#58617] [PATCH core-updates 6/8] gnu: vulkan-tools: " Kaelyn Takata via Guix-patches via
2022-10-19  0:42 ` [bug#58617] [PATCH core-updates 7/8] gnu: shaderc: Update to 2022.2 Kaelyn Takata via Guix-patches via
2022-10-19  0:42 ` [bug#58617] [PATCH core-updates 8/8] gnu: Add vulkan-validationlayers Kaelyn Takata via Guix-patches via
2022-12-30  9:51 ` [bug#58617] [PATCH core-updates 0/8] Update Vulkan packages to sdk-1.3.224.1 Ricardo Wurmus

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221019004136.32677-5-kaelyn.alexi@protonmail.com \
    --to=guix-patches@gnu.org \
    --cc=58617@debbugs.gnu.org \
    --cc=kaelyn.alexi@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 public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).