gnu: dxvk: Update to 1.5.

* gnu/packages/wine.scm (dxvk): Update to 1.5.
This commit is contained in:
Pierre Neidhardt 2019-12-19 16:20:18 +01:00
parent a21b88f10c
commit f2c71f62dd
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F

View file

@ -44,6 +44,7 @@ (define-module (gnu packages wine)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
@ -549,7 +550,7 @@ (define dxvk32
;; This package provides 32-bit dxvk libraries on 64-bit systems. ;; This package provides 32-bit dxvk libraries on 64-bit systems.
(package (package
(name "dxvk32") (name "dxvk32")
(version "1.4.4") (version "1.5")
(home-page "https://github.com/doitsujin/dxvk/") (home-page "https://github.com/doitsujin/dxvk/")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -559,7 +560,7 @@ (define dxvk32
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0zr8hqyig18q4wp96cmfrkrgxxbgxida6k8cv6qbbldni29qy20w")))) "009p99jkskrmy186gsqrf0p3v9z3lskw51r4vdp35af057q26a6x"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:system "i686-linux" `(#:system "i686-linux"
@ -567,10 +568,14 @@ (define dxvk32
(string-append (assoc-ref %build-inputs "source") (string-append (assoc-ref %build-inputs "source")
"/build-wine32.txt")))) "/build-wine32.txt"))))
(native-inputs (native-inputs
`(("glslang" ,glslang) ;; Since 1.5 dxvk needs gcc-8.1. See
("wine" ,wine))) ;; https://github.com/doitsujin/dxvk/issues/1292#issuecomment-567067373.
(synopsis "Vulkan-based D3D11 and D3D10 implementation for Wine") `(("gcc" ,gcc-9)
(description "A Vulkan-based translation layer for Direct3D 10/11 which ("glslang" ,glslang)))
(inputs
`(("wine" ,wine-staging)))
(synopsis "Vulkan-based D3D9, D3D10 and D3D11 implementation for Wine")
(description "A Vulkan-based translation layer for Direct3D 9/10/11 which
allows running complex 3D applications with high performance using Wine. allows running complex 3D applications with high performance using Wine.
Use @command{setup_dxvk} to install the required libraries to a Wine prefix.") Use @command{setup_dxvk} to install the required libraries to a Wine prefix.")
@ -615,14 +620,15 @@ (define-public dxvk
("x86_64-linux" "../lib32") ("x86_64-linux" "../lib32")
(_ "../lib"))) (_ "../lib")))
(("x64") "../lib")))))))) (("x64") "../lib"))))))))
(native-inputs
`(("glslang" ,glslang)))
(inputs (inputs
`(("wine" ,(match (%current-system) `(("wine" ,(match (%current-system)
("x86_64-linux" wine64) ;; ("x86_64-linux" wine64)
("x86_64-linux" wine64-staging)
;; ("x86_64-linux" mingw-w64-x86_64)
(_ wine))) (_ wine)))
,@(match (%current-system) ,@(match (%current-system)
("x86_64-linux" ("x86_64-linux"
`(("dxvk32" ,dxvk32))) `(("dxvk32" ,dxvk32)))
(_ '())))) (_ '()))
))
(supported-systems '("i686-linux" "x86_64-linux")))) (supported-systems '("i686-linux" "x86_64-linux"))))