From 905e10cd9c0e20d741d5739825914bba53292b0d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 19 Feb 2023 09:59:38 +0100 Subject: gnu: scummvm: Update to 2.7.0. * gnu/packages/emulators.scm (scummvm): Update to 2.7.0. --- 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 25439ceadf..aa9e82c25c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1561,14 +1561,14 @@ (define-public wasm4 (define-public scummvm (package (name "scummvm") - (version "2.6.1") + (version "2.7.0") (source (origin (method url-fetch) (uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version "/scummvm-" version ".tar.xz")) (sha256 - (base32 "1s8psdn3a3hqvvfgmlfxrqqdw8hbr0zyrvirzsnzh6yxmgpvkbwg")))) + (base32 "14wrrzai25mh8qra3lsfibx8z6f96cqbnmsfh9kyhkvpc7yiyjs4")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From 5dd0a6214fe936fb282e39ddc8d4b6ba84bbb25d Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 11 Mar 2023 21:21:26 +0800 Subject: gnu: retroarch: Update to 1.15.0. * gnu/packages/emulators.scm (retroarch): Update to 1.15.0. [source]: Remove upstreamed patch. [arguments]<#:phases>: Remove not needed changes for 'true' and 'zlib'. Remove "--disable-builtinminiupnpc" from configure flags. Add "--disable-builtinzlib" to configure flags. [inputs]: Remove miniupnpc, which is not used any more. * gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/emulators.scm | 16 ++-------- .../patches/retroarch-LIBRETRO_DIRECTORY.patch | 36 ---------------------- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 4a662efc3c..bfb114b3f1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1805,7 +1805,6 @@ dist_patch_DATA = \ %D%/packages/patches/racket-zuo-bin-sh.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \ - %D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch \ %D%/packages/patches/r-mixedpower-r2power.patch \ %D%/packages/patches/rng-tools-revert-build-randstat.patch \ %D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index aa9e82c25c..6934fe2f91 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1420,7 +1420,7 @@ (define-public libretro-lowresnx (define-public retroarch (package (name "retroarch") - (version "1.9.11") + (version "1.15.0") (source (origin (method git-fetch) @@ -1429,9 +1429,7 @@ (define-public retroarch (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hd77kw1f655s40qcz1righdhd9czqyy40rf7gigdag1bkchdx6z")) - (patches - (search-patches "retroarch-LIBRETRO_DIRECTORY.patch")))) + (base32 "1ii31mc7wfd386rzyxqk8nmx5a13f9iqz47991z4zx0d8gqcchzg")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1449,13 +1447,6 @@ (define-public retroarch (substitute* "gfx/common/wayland/generate_wayland_protos.sh" (("/usr/local/share/wayland-protocols") (string-append wayland-protocols "/share/wayland-protocols"))) - (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") - (("") "")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. @@ -1469,7 +1460,7 @@ (define-public retroarch ;; Non-free software are available through the core updater, ;; disable it. See . "--disable-update_cores" - "--disable-builtinminiupnpc"))))))) + "--disable-builtinzlib"))))))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg-4) @@ -1480,7 +1471,6 @@ (define-public retroarch ("libxrandr" ,libxrandr) ("libxv" ,libxv) ("mesa" ,mesa) - ("miniupnpc" ,miniupnpc) ("openal" ,openal) ("pulseaudio" ,pulseaudio) ("python" ,python) diff --git a/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch b/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch deleted file mode 100644 index ffa75918b8..0000000000 --- a/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4c02c080475c9d08dbed98dd64ecca337aa359ae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= -Date: Sat, 20 Feb 2021 20:37:39 +0800 -Subject: [PATCH] Allow set libretro_directory via environment variable - ---- - retroarch.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/retroarch.c b/retroarch.c -index 8a0461c816..cbf11d8b6a 100644 ---- a/retroarch.c -+++ b/retroarch.c -@@ -17603,7 +17603,18 @@ static bool retroarch_parse_input_and_config( - p_rarch->configuration_settings->bools.log_to_file, - p_rarch->configuration_settings->bools.log_to_file_timestamp, - p_rarch->configuration_settings->paths.log_dir); -- -+ -+ /* Override settings via environment variables */ -+ { -+ settings_t *settings = p_rarch->configuration_settings; -+ char *value = getenv("LIBRETRO_DIRECTORY"); -+ if (value != NULL) -+ { -+ retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL); -+ configuration_set_string(settings, settings->paths.directory_libretro, value); -+ } -+ } -+ - /* Second pass: All other arguments override the config file */ - optind = 1; - --- -2.33.0 - -- cgit v1.2.3