me
/
guix
Archived
1
0
Fork 0
Code

gnu: dolphin-emu: Enable Vulkan video backend. 

* gnu/packages/emulators.scm (dolphin-emu): Enable Vulkan video backend.
[inputs]: Add vulkan-icd-loader.
[arguments]: Rename 'generate-fonts to
'generate-fonts&hardcore-libvulkan-path. Hardcode libvulkan.so.
master
Rutger Helling 2018-02-23 10:13:40 +01:00
parent 6ac6055aa2
commit 6bebad7721
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/emulators.scm
View File

@ -143,11 +143,14 @@
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'generate-fonts (add-before 'configure 'generate-fonts&hardcore-libvulkan-path
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((fontfile (let ((fontfile
(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
(string-append (assoc-ref inputs "vulkan-icd-loader")
"/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 \
--cflags --libs) gc-font-tool.cpp -o gc-font-tool") --cflags --libs) gc-font-tool.cpp -o gc-font-tool")
@ -156,6 +159,8 @@
(copy-file "font_japanese.bin" "../Data/Sys/GC/font_japanese.bin") (copy-file "font_japanese.bin" "../Data/Sys/GC/font_japanese.bin")
(copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin") (copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin")
(chdir "..") (chdir "..")
(substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
(("libvulkan.so") libvulkan))
#t)))) #t))))
#:configure-flags #:configure-flags
@ -172,7 +177,6 @@
(assoc-ref %build-inputs "libx11") (assoc-ref %build-inputs "libx11")
"/lib/libX11.so") "/lib/libX11.so")
"-DX11_FOUND=1"))) "-DX11_FOUND=1")))
; TODO: Make Vulkan backend work.
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("gettext" ,gnu-gettext))) ("gettext" ,gnu-gettext)))
@ -207,6 +211,7 @@
("sfml" ,sfml) ("sfml" ,sfml)
("soil" ,soil) ("soil" ,soil)
("soundtouch" ,soundtouch) ("soundtouch" ,soundtouch)
("vulkan-icd-loader" ,vulkan-icd-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/")