From 3842baa07795ccc9d92ccda631998ffe5d15a6b0 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 29 Feb 2020 17:10:46 +0100 Subject: gnu: dxvk: Return #t in install-32 phase. * gnu/packages/wine.scm (dxvk)[arguments]: Return #t in install-32 phase. --- gnu/packages/wine.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/wine.scm') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 35defc326b..a96191422b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -607,7 +607,8 @@ Use @command{setup_dxvk} to install the required libraries to a Wine prefix.") (dxvk32 (assoc-ref inputs "dxvk32"))) (mkdir-p (string-append out "/lib32")) (copy-recursively (string-append dxvk32 "/lib") - (string-append out "/lib32")))))) + (string-append out "/lib32")) + #t)))) '()) (add-after 'install 'install-setup (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From adb1e3b6cfdd342d1ca95a7901a94543b2585f81 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 3 Mar 2020 10:26:11 +0100 Subject: gnu: dxvk: Update to 1.5.5. * gnu/packages/wine.scm (dxvk): Update to 1.5.5. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wine.scm') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index a96191422b..5eb813350b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -554,7 +554,7 @@ version)") ;; This package provides 32-bit dxvk libraries on 64-bit systems. (package (name "dxvk32") - (version "1.5.4") + (version "1.5.5") (home-page "https://github.com/doitsujin/dxvk/") (source (origin (method git-fetch) @@ -564,7 +564,7 @@ version)") (file-name (git-file-name name version)) (sha256 (base32 - "0yhxd5rnn5mcvcb2n062z9wqqwxjq5c0rzfbjz1z9ppznj8gn37i")))) + "1inl0qswgvbp0fs76md86ilqf9mbshkpjm8ga81khn9zd6v3fvan")))) (build-system meson-build-system) (arguments `(#:system "i686-linux" -- cgit v1.2.3 From d8104034bce470c5bbf929f53844124b09e9ea73 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 3 Mar 2020 17:26:37 +0100 Subject: gnu: wine: Update to 5.3. * gnu/packages/wine.scm (wine): Update to 5.3. [native-inputs]: Re-order inputs alphabetically. --- gnu/packages/wine.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'gnu/packages/wine.scm') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 5eb813350b..27de43aa25 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -76,21 +76,26 @@ (define-public wine (package (name "wine") - (version "5.0") + (version "5.3") (source (origin (method url-fetch) - (uri (string-append "https://dl.winehq.org/wine/source/" - (version-major+minor version) - "/wine-" version ".tar.xz")) + (uri (let ((dir (string-append + (version-major version) + (if (string-suffix? ".0" (version-major+minor version)) + ".0/" + ".x/"))))) + (string-append "https://dl.winehq.org/wine/source/" dir + "wine-" version ".tar.xz")) (sha256 - (base32 "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q")))) + (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("flex" ,flex) - ("bison" ,bison) - ("perl" ,perl))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) ("dbus" ,dbus) -- cgit v1.2.3 From 53b48447a71f3ffd36b3d973562a1a771691c396 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 3 Mar 2020 17:33:28 +0100 Subject: gnu: wine: Fix typo. * gnu/packages/wine.scm (wine): Fix typo. This is a followup to d8104034bce470c5bbf929f53844124b09e9ea73. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/wine.scm') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 27de43aa25..e16a4bbcaa 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -84,9 +84,9 @@ (version-major version) (if (string-suffix? ".0" (version-major+minor version)) ".0/" - ".x/"))))) - (string-append "https://dl.winehq.org/wine/source/" dir - "wine-" version ".tar.xz")) + ".x/")))) + (string-append "https://dl.winehq.org/wine/source/" dir + "wine-" version ".tar.xz"))) (sha256 (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv")))) (build-system gnu-build-system) -- cgit v1.2.3 From be54abc61d4193fe3bee4bd62cc33412a9314975 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 3 Mar 2020 19:23:17 +0100 Subject: gnu: wine-staging: Update to 5.3. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 5.3. (wine-staging): Update hash. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/wine.scm') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index e16a4bbcaa..541ef3cd7a 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -328,7 +328,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "5.0") + (version "5.3") (source (origin (method git-fetch) @@ -337,7 +337,7 @@ integrate Windows applications into your desktop.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "054m2glvav29qnlgr3p36kahyv3kbxzba82djzqpc7cmsrin0d3f")))) + (base32 "1mvhrvshyrj7lgjgka735z6j8idwd6j58bpg5nz1slgmlh1llrs6")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -387,7 +387,7 @@ integrate Windows applications into your desktop.") "/wine-" version ".tar.xz"))) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q")))) + (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) -- cgit v1.2.3