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'.
This commit is contained in:
Rutger Helling 2018-06-06 09:59:15 +02:00
parent 7ea56cdec0
commit e6fcf903ec
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
5 changed files with 13 additions and 13 deletions

View File

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

View File

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

View File

@ -1119,7 +1119,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("rsound" ,rsound) ("rsound" ,rsound)
("shaderc" ,shaderc) ("shaderc" ,shaderc)
("vulkan-icd-loader" ,vulkan-icd-loader) ("vulkan-loader" ,vulkan-loader)
("waf" ,python-waf) ("waf" ,python-waf)
("wayland" ,wayland) ("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols) ("wayland-protocols" ,wayland-protocols)

View File

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

View File

@ -285,7 +285,7 @@ integrate Windows applications into your desktop.")
("python" ,python) ("python" ,python)
("sdl2" ,sdl2) ("sdl2" ,sdl2)
("util-linux" ,util-linux) ; for hexdump ("util-linux" ,util-linux) ; for hexdump
("vulkan-icd-loader" ,vulkan-icd-loader) ("vulkan-loader" ,vulkan-loader)
("wine-staging-patchset-data" ,wine-staging-patchset-data) ("wine-staging-patchset-data" ,wine-staging-patchset-data)
,@(package-inputs wine))) ,@(package-inputs wine)))
(arguments (arguments