me
/
guix
Archived
1
0
Fork 0

gnu: retroarch: Update to 1.9.11.

* gnu/packages/emulators.scm (retroarch): Update to 1.9.11.
* gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.path: Adjust to latest source.
master
宋文武 2021-10-14 19:28:34 +08:00
parent cb20039445
commit e2a021a745
No known key found for this signature in database
GPG Key ID: D415BF253B515976
2 changed files with 20 additions and 16 deletions

View File

@ -1432,7 +1432,7 @@ as RetroArch.")
(define-public retroarch
(package
(name "retroarch")
(version "1.9.4")
(version "1.9.11")
(source
(origin
(method git-fetch)
@ -1441,7 +1441,7 @@ as RetroArch.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1wky28y52nsjmannks3y1hbjgw0dvqh85gxrllr98f9y7kvk1cvf"))
(base32 "0hd77kw1f655s40qcz1righdhd9czqyy40rf7gigdag1bkchdx6z"))
(patches
(search-patches "retroarch-LIBRETRO_DIRECTORY.patch"))))
(build-system gnu-build-system)

View File

@ -1,32 +1,36 @@
From f308dc91660954ab88bb41868c0b9809592923e6 Mon Sep 17 00:00:00 2001
From 4c02c080475c9d08dbed98dd64ecca337aa359ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Sat, 20 Feb 2021 20:37:39 +0800
Subject: [PATCH] Allow set libretro_directory via environment variable
---
retroarch.c | 9 +++++++++
1 file changed, 9 insertions(+)
retroarch.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/retroarch.c b/retroarch.c
index 6a88c3108e..6807c12b5b 100644
index 8a0461c816..cbf11d8b6a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -36038,6 +36038,15 @@ static void retroarch_parse_input_and_config(
#endif
config_load(&p_rarch->g_extern);
@@ -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 */
+ if (getenv("LIBRETRO_DIRECTORY")) {
+ {
+ settings_t *settings = p_rarch->configuration_settings;
+ retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL);
+ configuration_set_string(settings,
+ settings->paths.directory_libretro,
+ getenv("LIBRETRO_DIRECTORY"));
+ 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.30.0
2.33.0