From be4c63f48406006ded84511cf82f10b9f5400f7c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 31 Aug 2018 07:04:17 +0200 Subject: gnu: mame: Update to 0.201. * gnu/packages/emulators.scm (mame): Update to 0.201. [arguments]: Remove unnecessary fix. --- gnu/packages/emulators.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 141423d7bf..919392c72f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1175,7 +1175,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.200") + (version "0.201") (source (origin (method git-fetch) @@ -1185,7 +1185,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "0ddw8635hdm21lgpf13k1vhfywy3460rwciv93vrqmpkq2dvpmib")) + "00whiig4ld3d4fkl34q48vlf28ygvvp5g7fp0rb5n31ymhl4kajk")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -1211,17 +1211,6 @@ play them on systems for which they were never designed!") #:tests? #f ;no test in regular release #:phases (modify-phases %standard-phases - ;; Add missing include lines for "fmin" and "ceil" functions. - ;; Reported upstream. Will be fixed in 0.201. - (add-after 'unpack 'add-missing-include - (lambda _ - (substitute* "src/devices/cpu/mips/mips3.cpp" - (("#include \"ps2vu.h\"" all) - (string-append all "\n#include "))) - (substitute* "src/devices/cpu/mips/ps2vif1.cpp" - (("#include \"ps2vif1.h\"" all) - (string-append all "\n#include "))) - #t)) (delete 'configure) (add-after 'build 'build-documentation (lambda _ (invoke "make" "-C" "docs" "man" "info"))) -- cgit 1.4.1 From 0b6678cd441006d5cd65a8aa33f17458b3588a19 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 31 Aug 2018 08:24:38 +0200 Subject: gnu: retroarch: Update to 1.7.4. * gnu/packages/emulators.scm (retroarch): Update to 1.7.4. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 919392c72f..8e68c676ef 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1055,7 +1055,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.7.3") + (version "1.7.4") (source (origin (method url-fetch) @@ -1063,7 +1063,7 @@ emulation community. It provides highly accurate emulation.") version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1si78dbwbsq4i0r42q94nmlpaxdyqch113nxavdprf4vc1224356")))) + (base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit 1.4.1 From fefe17b0888b467383ea91fed73a9586295c49f0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 5 Sep 2018 10:19:25 +0200 Subject: gnu: dolphin-emu: Update to commit 5f0d825. * gnu/packages/emulators.scm (dolphin-emu): Update to commit 5f0d825. --- gnu/packages/emulators.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 8e68c676ef..e02339af62 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -117,8 +117,8 @@ ;; Building from recent Git because the official 5.0 release no longer builds. (define-public dolphin-emu - (let ((commit "806c1ee8f0ed824008185212bfab2658d400b576") - (revision "2")) + (let ((commit "5f0d825f40b8aabe13eaef32d44ab667ff8e8c28") + (revision "3")) (package (name "dolphin-emu") (version (git-version "5.0" revision commit)) @@ -144,7 +144,7 @@ #t)) (sha256 (base32 - "1sdc7rh6z7gjx4kxg18jrv7srfpx1vgf936zg5y43radnlscrh1j")))) + "0dh7mih16aif9ynbgcsn7n10f89g8d232i86xqfp2rijsdggcmzl")))) (build-system cmake-build-system) (arguments '(#:tests? #f -- cgit 1.4.1 From fade67ab756602bdeba508fbffa0e35234b58b9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 13 Sep 2018 18:39:22 +0300 Subject: gnu: retroarch: Use shared zlib. * gnu/packages/emulators.scm (retroarch)[arguments]: In custom 'configure phase, use our zlib instead of vendor's zlib. --- gnu/packages/emulators.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index e02339af62..f21c322814 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1079,6 +1079,11 @@ emulation community. It provides highly accurate emulation.") (("libvulkan.so") (string-append vulkan "/lib/libvulkan.so"))) (substitute* "qb/qb.libs.sh" (("/bin/true") (which "true"))) + ;; Use shared zlib. + (substitute* '("libretro-common/file/archive_file_zlib.c" + "libretro-common/streams/trans_stream_zlib.c" + "network/httpserver/httpserver.c") + (("") "")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. (zero? (system* -- cgit 1.4.1 From f21967a44bbd948846bdd1bbc370d3d0e3b52185 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 13 Sep 2018 18:40:02 +0300 Subject: gnu: retroarch: Fix building on armhf-linux. * gnu/packages/emulators.scm (retroarch)[arguments]: Add custom flags when building for armhf-linux. --- gnu/packages/emulators.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index f21c322814..782bff5b18 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1066,7 +1066,7 @@ emulation community. It provides highly accurate emulation.") (base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases (replace 'configure @@ -1086,10 +1086,14 @@ emulation community. It provides highly accurate emulation.") (("") "")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. - (zero? (system* - "./configure" - (string-append "--prefix=" out) - (string-append "--global-config-dir=" etc))))))))) + (invoke + "./configure" + ,@(if (string-prefix? "armhf" (or (%current-target-system) + (%current-system))) + '("--enable-neon" "--enable-floathard") + '()) + (string-append "--prefix=" out) + (string-append "--global-config-dir=" etc)))))))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg) -- cgit 1.4.1 From c4a3ea38850e97cdc12252440c7fa9cdefd5790f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 27 Sep 2018 09:50:01 +0200 Subject: gnu: mame: Update to 0.202. * gnu/packages/emulators.scm (mame): Update to 0.202. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 782bff5b18..443137f141 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1184,7 +1184,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.201") + (version "0.202") (source (origin (method git-fetch) @@ -1194,7 +1194,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "00whiig4ld3d4fkl34q48vlf28ygvvp5g7fp0rb5n31ymhl4kajk")) + "1v9gm124p65nbj678gfkcvwphp9qc15ky2p12ca6g3rllma94di5")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit 1.4.1 From 1fc346de4eb6881c087eae2c603a761b510e28f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:45:02 +0200 Subject: gnu: retroarch: Don't use unstable tarball. * gnu/packages/emulators.scm (retroarch)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/emulators.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 443137f141..a07ce29243 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1058,12 +1058,13 @@ emulation community. It provides highly accurate emulation.") (version "1.7.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libretro/RetroArch/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libretro/RetroArch.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w")))) + (base32 "1gagdwydj6kl3gzi9z1rjgrbjvi325f8159fdaryzf5gjj8avp8m")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit 1.4.1 From 689ca9ba23e8c5003cba5163235e9c5fb1206f16 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:56:12 +0200 Subject: gnu: retroarch: Update to 1.7.5. * gnu/packages/emulators.scm (retroarch): Update to 1.7.5. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index a07ce29243..438e9df1fc 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1055,7 +1055,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.7.4") + (version "1.7.5") (source (origin (method git-fetch) @@ -1064,7 +1064,7 @@ emulation community. It provides highly accurate emulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gagdwydj6kl3gzi9z1rjgrbjvi325f8159fdaryzf5gjj8avp8m")))) + (base32 "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit 1.4.1 From 124e9d6e0a6b3e0a5c230c79bdbbaf5bb345da42 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 31 Oct 2018 10:38:39 +0100 Subject: gnu: dolphin-emu: Update to commit 22ddd11. * gnu/packages/emulators.scm (dolphin-emu): Update to commit 22ddd11. [arguments]: Return #t with phase 'fixgcc7. --- gnu/packages/emulators.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 438e9df1fc..2304b74e40 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -117,8 +117,8 @@ ;; Building from recent Git because the official 5.0 release no longer builds. (define-public dolphin-emu - (let ((commit "5f0d825f40b8aabe13eaef32d44ab667ff8e8c28") - (revision "3")) + (let ((commit "22ddd11573fd8d3e43a879804e7a64e50928435d") + (revision "4")) (package (name "dolphin-emu") (version (git-version "5.0" revision commit)) @@ -144,7 +144,7 @@ #t)) (sha256 (base32 - "0dh7mih16aif9ynbgcsn7n10f89g8d232i86xqfp2rijsdggcmzl")))) + "01l6r8spaslqc73m3y7hfb2jx5a4848vdkman6x6w2arpb8bywzl")))) (build-system cmake-build-system) (arguments '(#:tests? #f @@ -153,7 +153,8 @@ (add-before 'configure 'fixgcc7 (lambda _ (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH"))) + (unsetenv "CPLUS_INCLUDE_PATH") + #t)) (add-before 'configure 'generate-fonts&hardcore-libvulkan-path (lambda* (#:key inputs outputs #:allow-other-keys) (let ((fontfile -- cgit 1.4.1 From e7039f10ecd428445e218ec5485efbb23f3ca447 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 1 Nov 2018 08:18:18 +0100 Subject: gnu: dolphin-emu: Use ffmpeg instead of ffmpeg@3.4. * gnu/packages/emulators.scm (dolphin-emu): Use ffmpeg instead of ffmpeg@3.4. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 2304b74e40..21a4cd55d5 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -196,7 +196,7 @@ ("bluez" ,bluez) ("curl" ,curl) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg-3.4) + ("ffmpeg" ,ffmpeg) ("font-wqy-microhei" ,font-wqy-microhei) ("freetype" ,freetype) ("glew" ,glew) -- cgit 1.4.1 From d7ca1899aa54ad02321e9ac1ff9de210ab9126b1 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 1 Nov 2018 09:07:16 +0100 Subject: gnu: mame: Update to 0.203. * gnu/packages/emulators.scm (mame): Update to 0.203. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 21a4cd55d5..232adfb081 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1186,7 +1186,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.202") + (version "0.203") (source (origin (method git-fetch) @@ -1196,7 +1196,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "1v9gm124p65nbj678gfkcvwphp9qc15ky2p12ca6g3rllma94di5")) + "19ccqc00024fbjyk0k5d9xljhwq7wsrp7phwm2jmn0h77mgdj844")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit 1.4.1