gnu: vulkan-loader: Update URL and change name.

* gnu/packages/emulators.scm: Change references from 'vulkan-icd-loader' to
'vulkan-loader'.
* gnu/packages/games.scm: Change references from 'vulkan-icd-loader' to
'vulkan-loader'.
* gnu/packages/video.scm: Change references from 'vulkan-icd-loader' to
'vulkan-loader'.
* gnu/packages/vulkan.scm (vulkan-loader): Rename from 'vulkan-icd-loader' to
'vulkan-loader'. Update URL and hash.
* gnu/packages/wine.scm: Change references from 'vulkan-icd-loader' to
'vulkan-loader'.

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index c354386..b798b81 100644 (file)
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -156,7 +156,7 @@
                       (string-append (assoc-ref inputs "font-wqy-microhei")
                                      "/share/fonts/truetype/wqy-microhei.ttc"))
                      (libvulkan
-                      (string-append (assoc-ref inputs "vulkan-icd-loader")
+                      (string-append (assoc-ref inputs "vulkan-loader")
                                      "/lib/libvulkan.so")))
                  (chdir "docs")
                  (invoke "bash" "-c" "g++ -O2 -std=c++11 $(freetype-config \
@@ -219,7 +219,7 @@
          ("sfml" ,sfml)
          ("soil" ,soil)
          ("soundtouch" ,soundtouch)
-         ("vulkan-icd-loader" ,vulkan-icd-loader)
+         ("vulkan-loader" ,vulkan-loader)
          ("wxwidgets" ,wxwidgets-gtk2-3.1)
          ("zlib" ,zlib)))
       (home-page "https://dolphin-emu.org/")
@@ -1069,7 +1069,7 @@ emulation community.  It provides highly accurate emulation.")
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (etc (string-append out "/etc"))
-                    (vulkan (assoc-ref inputs "vulkan-icd-loader")))
+                    (vulkan (assoc-ref inputs "vulkan-loader")))
                ;; Hard-code the path to libvulkan.so.
                (substitute* "gfx/common/vulkan_common.c"
                  (("libvulkan.so") (string-append vulkan "/lib/libvulkan.so")))
@@ -1096,7 +1096,7 @@ emulation community.  It provides highly accurate emulation.")
        ("qtbase" ,qtbase)
        ("sdl" ,sdl2)
        ("udev" ,eudev)
-       ("vulkan-icd-loader" ,vulkan-icd-loader)
+       ("vulkan-loader" ,vulkan-loader)
        ("wayland" ,wayland)
        ("zlib" ,zlib)))
     (native-inputs

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9408925..e9f3e69 100644 (file)
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4467,7 +4467,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
     (arguments
      `(#:make-flags
        (let ((vulkanlib (string-append (assoc-ref %build-inputs
-                                                  "vulkan-icd-loader") "/lib")))
+                                                  "vulkan-loader") "/lib")))
          (list "CC=gcc"
                "MP3LIB=mpg123"
                "USE_CODEC_FLAC=1"
@@ -4480,7 +4480,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
                   (add-after 'unpack 'fix-makefile-paths
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let ((vulkan (assoc-ref %build-inputs
-                                               "vulkan-icd-loader"))
+                                               "vulkan-loader"))
                             (out (assoc-ref outputs "out")))
                         (mkdir-p (string-append out "/bin"))
                         (substitute* "Quake/Makefile" ((" /usr")
@@ -4491,7 +4491,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
                         #t))))
        ,@(strip-keyword-arguments '(#:make-flags #:phases)
                                   (package-arguments quakespasm))))
-    (inputs `(("vulkan-icd-loader" ,vulkan-icd-loader)
+    (inputs `(("vulkan-loader" ,vulkan-loader)
               ,@(package-inputs quakespasm)))
     (description "vkquake is a modern engine for id software's Quake 1.
 It includes support for 64 bit CPUs, custom music playback, a new sound driver,

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 09b281c..3d3b1c7 100644 (file)
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1119,7 +1119,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
        ("pulseaudio" ,pulseaudio)
        ("rsound" ,rsound)
        ("shaderc" ,shaderc)
-       ("vulkan-icd-loader" ,vulkan-icd-loader)
+       ("vulkan-loader" ,vulkan-loader)
        ("waf" ,python-waf)
        ("wayland" ,wayland)
        ("wayland-protocols" ,wayland-protocols)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index ac9f6f2..62c5d50 100644 (file)
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -157,19 +157,19 @@ interpretation of the specifications for these languages.")
                      ;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.0.
                      license:asl2.0)))))
 
-(define-public vulkan-icd-loader
+(define-public vulkan-loader
   (package
-    (name "vulkan-icd-loader")
+    (name "vulkan-loader")
     (version "1.1.73.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
-             "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/"
+             "https://github.com/KhronosGroup/Vulkan-Loader/"
              "archive/sdk-" version ".tar.gz"))
        (sha256
         (base32
-         "1qb34j2zrc04fgs96m3k76vi4nx3sygbdcyg7pbwasr45cbdhsxb"))))
+         "0lvdpy6ybx5h7w15m9s2n9q3167q618clra2k7yi2cbm397ci4hn"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ;FIXME: 23/39 tests fail.  Try "tests/run_all_tests.sh".

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index d9346e2..f602f3d 100644 (file)
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -285,7 +285,7 @@ integrate Windows applications into your desktop.")
               ("python" ,python)
               ("sdl2" ,sdl2)
               ("util-linux" ,util-linux) ; for hexdump
-              ("vulkan-icd-loader" ,vulkan-icd-loader)
+              ("vulkan-loader" ,vulkan-loader)
               ("wine-staging-patchset-data" ,wine-staging-patchset-data)
               ,@(package-inputs wine)))
     (arguments