From 63d69215e476a94a31eba2626db07cb25a4fec2c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 28 Sep 2020 22:59:59 +0200 Subject: gnu: scummvm: Update to 2.2.0. * gnu/packages/emulators.scm (scummvm): Update to 2.2.0. [arguments]: Remove unnecessary phase. [inputs]: Add fribidi. --- gnu/packages/emulators.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index d0d581c4db..a130aea88e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1327,34 +1327,20 @@ multi-system game/emulator system.") (define-public scummvm (package (name "scummvm") - (version "2.1.2") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "http://www.scummvm.org/frs/scummvm/" version "/scummvm-" version ".tar.xz")) (sha256 - (base32 "1c4fz1nfg0nqnqx9iipayhzcsiqdmfxm2i95nw9dbhshhsdnrhf4")))) + (base32 "11vknasm5dna2vqr6gk343qynh7nhsq3kf60zayarn1vb5z6as8l")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;require "git" #:configure-flags (list "--enable-release") ;for optimizations #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-build - ;; XXX: The following works around a build failure introduced when - ;; Fluidsynth was updated to version 2.1. It has been applied - ;; upstream as 68758a879e0c8ecc0d40962516d4e808aa4e15e5 and can be - ;; removed once this commit makes it into a release. - (lambda _ - (substitute* "audio/softsynth/fluidsynth.cpp" - (("#include ") "") - (("#include \"common/scummsys.h\"") "#include \"config.h\"") - (("#include \"common/config-manager.h\"" line) - (string-append "#include \n" - "#include \"common/scummsys.h\"\n" - line))) - #t)) (replace 'configure ;; configure does not work followed by both "SHELL=..." and ;; "CONFIG_SHELL=..."; set environment variables instead @@ -1374,6 +1360,7 @@ multi-system game/emulator system.") ("faad2" ,faad2) ("fluidsynth" ,fluidsynth) ("freetype" ,freetype) + ("fribidi" ,fribidi) ("liba52" ,liba52) ("libflac" ,flac) ("libjpeg-turbo" ,libjpeg-turbo) -- cgit v1.2.3 From 9380b0a0752d7b922a664e6d96899047cb2f2811 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 28 Sep 2020 23:01:40 +0200 Subject: gnu: Add missing module. * gnu/packages/emulators.scm: Add missing module. --- gnu/packages/emulators.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index a130aea88e..601d8dd4a6 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fribidi) #:use-module (gnu packages game-development) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) -- cgit v1.2.3 From e7cacc91e66105d5ffe70420d201bcf8adc2a765 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 27 Sep 2020 14:37:24 +0200 Subject: gnu: ppsspp: Update to 1.10.3. * gnu/packages/emulators.scm (ppsspp): Update to 1.10.3. [snippet]: Update the snippet, that strips glslang from build. [inputs]: Update lang. Signed-off-by: Efraim Flashner --- gnu/packages/emulators.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 601d8dd4a6..f18a01e36e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1890,7 +1890,7 @@ framework based on QEMU.") (define-public ppsspp (package (name "ppsspp") - (version "1.10") + (version "1.10.3") (source (origin (method git-fetch) @@ -1898,7 +1898,7 @@ framework based on QEMU.") (url "https://github.com/hrydgard/ppsspp") (commit (string-append "v" version)))) (sha256 - (base32 "02yx1w0ygclnmdl0imsvgj24lkzi55wvxkf47q617j0jgrqhy8yl")) + (base32 "0znxlbj6cfw7gn0naay0mzhc0k5saw8nrwpspcn7gap1023p06w2")) (file-name (git-file-name name version)) (patches (search-patches "ppsspp-disable-upgrade-and-gold.patch")) @@ -1949,7 +1949,7 @@ framework based on QEMU.") " spirv-cross-reflect spirv-cross-util"))) (substitute* "ext/CMakeLists.txt" (("add_subdirectory\\(glew\\)") "") - (("add_subdirectory\\(glslang\\)") "") + (("add_subdirectory\\(glslang( [A-Z_]*)*\\)") "") (("add_subdirectory\\(snappy\\)") "") (("add_subdirectory\\(SPIRV-Cross-build\\)") "")) ;; Finally, we can delete the bundled sources. @@ -1992,14 +1992,14 @@ framework based on QEMU.") ;; TODO: unbundle armips. ("armips-source" ,(package-source armips)) ("lang" - ,(let ((commit "d184ba2b607a03435be579406b816c90add334e6")) + ,(let ((commit "1c64b8fbd3cb6bd87935eb53f302f7de6f86e209")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/hrydgard/ppsspp-lang") (commit commit))) (sha256 - (base32 "0s003x6247nx09qd6a1jz1l2hsk5d6k1zmh8mg3m6hjjhvbvd9j9")) + (base32 "0rprn3yd8xfrvi0fm62sgpqa8n73jk7zmlscp8cp0h2fawqpiamd")) (file-name (git-file-name "ppsspp-lang" commit))))) ("tests" ,(let ((commit "328b839c7243e7f733f9eae88d059485e3d808e7")) -- cgit v1.2.3 From 8d0bc58f2bbf1458365a99a500f5f90b224f1ca4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Oct 2020 16:14:28 +0200 Subject: gnu: mame: Update to 0.225. * gnu/packages/emulators.scm (mame): Update to 0.225. --- 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 f18a01e36e..cf48b20675 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1385,7 +1385,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.224") + (version "0.225") (source (origin (method git-fetch) @@ -1394,7 +1394,7 @@ play them on systems for which they were never designed!") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "0dpg4hz2f1wlp0rmk5c5xq57fy0sblh97z3l66p814wkgzap4bhx")) + (base32 "1n61v1yqmc69399khcm8gdabqaz8rwwj822m8vm5mbyxnw92icqg")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3