[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: dolphin-emu: Update to commit a974540.
From: |
guix-commits |
Subject: |
01/01: gnu: dolphin-emu: Update to commit a974540. |
Date: |
Thu, 5 Sep 2019 02:23:14 -0400 (EDT) |
rhelling pushed a commit to branch master
in repository guix.
commit 2b332c51dbee8a63eb3eb3dde993321800340fd0
Author: Rutger Helling <address@hidden>
Date: Wed Sep 4 20:23:18 2019 +0200
gnu: dolphin-emu: Update to commit a974540.
* gnu/packages/emulators.scm (dolphin-emu): Update to commit a974540.
[source]: Delete unneeded MoltenVK map.
[arguments]: Properly hardcode libvulkan path.
---
gnu/packages/emulators.scm | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 3b2b543..9ff1cd4 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -119,8 +119,8 @@
;; Building from recent Git because the official 5.0 release no longer builds.
(define-public dolphin-emu
- (let ((commit "24718c1a389e4f51db974575cd15c372485b92e2")
- (revision "6"))
+ (let ((commit "a9745400ec5cea7e55d94955afbdc44d1a4982d1")
+ (revision "7"))
(package
(name "dolphin-emu")
(version (git-version "5.0" revision commit))
@@ -140,13 +140,13 @@
(string-append "Externals/" dir)))
'("LZO" "OpenAL" "Qt" "SFML" "curl" "ffmpeg"
"gettext" "hidapi" "libpng" "libusb" "mbedtls"
- "miniupnpc" "zlib"))
+ "miniupnpc" "MoltenVK" "zlib"))
;; Clean up source.
(for-each delete-file (find-files "."
".*\\.(bin|dsy|exe|jar|rar)$"))
#t))
(sha256
(base32
- "1d92rhnw307j3m6swk6bycb8fyc7vw2hfgakd5hpsc4qw65vxfq8"))))
+ "0ic08ii4vlqlmk2wkfc99jiy6nji2wfq56r7slj23wgvhznnaabk"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f
@@ -174,7 +174,11 @@
(copy-file "font_western.bin"
"../Data/Sys/GC/font_western.bin")
(chdir "..")
(substitute*
"Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
- (("libvulkan.so") libvulkan))
+ (("\"vulkan\", 1") (string-append "\"vulkan\"")))
+ (substitute*
"Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
+ (("\"vulkan\"") (string-append "\"" libvulkan
"\"")))
+ (substitute*
"Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
+
(("Common::DynamicLibrary::GetVersionedFilename") ""))
#t))))
;; The FindGTK2 cmake script only checks hardcoded directories for