From patchwork Sat Jan 18 08:50:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37136 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5F40F27BBEA; Sat, 18 Jan 2025 08:52:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7899427BBE2 for ; Sat, 18 Jan 2025 08:52:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yz-0003RN-RP; Sat, 18 Jan 2025 03:52:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tZ4Ym-0003NA-76 for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tZ4Yl-0007ci-TS for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=1tCA9+eTgr83ngkp+5K3BKRoML1ecAz+VHE6rPfNNCY=; b=jrhBK1QeihSmDgn7i66qSRfXTV7Eg/46FHdPty2wJFKCwAVOQAShLeJ8XYk1cy2xt2v+tiQvHFCOupJuuXMIvezVxtL7DdEBKvLJBE4XoX2KCcuyduZKFogEyCOtfTtDhRe4sPmYQhfKdoZ+skfdIipfgSK4dAan6cRdqUZH/jqJru6RpHSooAzLYNnoMi4bt2EnM6JiUKqmzvYZo6hPfU6Vf5mwG/nEIqy2deXJG2jxSj/9F6tGhfwNK/PupmsneQDUnKQDe/nifocW7bPVrPqXPMsmwAbNgd6wE9cdKsU4X5NS0OopjFepN9eai1Mo+JzNd2mAsnnJcy1IZKnWfg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yl-00088X-CW; Sat, 18 Jan 2025 03:52:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 04/10] gnu: retroarch-minimal: Add new search paths for database and system files. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 18 Jan 2025 08:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719029431157 (code B ref 75619); Sat, 18 Jan 2025 08:52:03 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:34 +0000 Received: from localhost ([127.0.0.1]:40045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4YG-00086K-SC for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:33 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:42295) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4YB-00085K-EL for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:28 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2167141dfa1so52461255ad.1 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190281; x=1737795081; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1tCA9+eTgr83ngkp+5K3BKRoML1ecAz+VHE6rPfNNCY=; b=RdKGoCECtmKCelXrJVxKJXYJHDrvS/aLVoG/N3bmQmduJF6XDiutLgqcPFbd3oK6DT d4tDfBJAndopXgkbpUtPieqt5UpbbbOz3MXi6/kv+w0WJBsfD1zh9qQGbmey3LpelULB G+wB1473vSJW2HsqLJP9vzMwwrKs0ZylDVCPm+qeF/7XIubkH8LXw47KtiopACVBzbjI 0h6iocCok9QpoAdPeO9UVH4+8Aambcg0CSRf/V9nuUDsycwUl+h1hKtMilMv57n/5uZL iqGbdtP23sGjKE5OiduYLp8mUy2eb54tSYhJdIQmOnU2ZhuV6AFGMgZT7Pzfexq2jxSD 7nDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190281; x=1737795081; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1tCA9+eTgr83ngkp+5K3BKRoML1ecAz+VHE6rPfNNCY=; b=VaUvxmm5Kfe2Nmj0v7hozCfOBVDUIDlJaz4T4XexWwZpFHxrMJ3oGTFIy+dt02dVO4 yqcTXTIveggxGxItM9SbwqUzKFPftxybWOhBWHHtQRxqHp8xl7I86atZHspLpysIh0vq r0AXb2AqAuk7AjnmIJoUfZ3NXFY9DKa4u9lECocdBi/FLPpQjVP6FMnqklk/CCxkpo8a 6OBdrjzWrzuY/AgIzATR8sLZpKm5Nb0WUDsAAioiMzGxLqSClyjjrSZlzpxHcSH969he 2fm5S0Ume6zJHetBpEv9IuFr95q0umxbFAEhPyYysx1BwrFbHL21b0m4fSmspwF0+IwW 7yrQ== X-Gm-Message-State: AOJu0YyEwjNOWxewmPRITlHlN16BvAhNitDijoLG7jY9h2UIFyLCjoY5 It+Y+qNx/dVpAe+58q+h5FwpSUZVBM8mXKdw2LHFD5/l6Eu9eTZos8hZSYyFJlk= X-Gm-Gg: ASbGncvvRgDXOx3JJaQBd4ELoQlI8DaVAI5xU4XQVQojQ0lRyiYd3SfjMm1xf0515SW 5pgYYj3EYSlhmdsbkEcyP3fJKPA0OtI1vVXusCRgZKc/IQy/kpJLPuw6Up1l1m+oxCZeKkDLf9e Ilx/3lR0aQGah0IP06jTsDHbpXmqBSiWYqz+MyM8nqj/NJnEKCusPYP2IAqsylm/Y0yWhL6JD0C bVjAUt8NB1HaqfleWnusj7eqEImuaRQeJvHfgnwuBecqPuUOh1w1gu3C2rTWN63AdYfLm74jgyV FGp/bX20IaqD X-Google-Smtp-Source: AGHT+IGDCKk3quU4fdOq3s4yDYlv1BbE/SGErjgTlDC1JUeoft1/7Ih6aDLMLlpcpeaIkJPxsoqvrQ== X-Received: by 2002:a17:903:238e:b0:216:311e:b1c4 with SMTP id d9443c01a7336-21bf029e049mr185196115ad.4.1737190280793; Sat, 18 Jan 2025 00:51:20 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:20 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:48 +0900 Message-ID: <394ce53fdb1066c4aa9f711a27dc2b1c6312d106.1737190254.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This makes it possible to locate system files provided by libretro cores, as well as database files. * gnu/packages/patches/retroarch-improved-search-paths.patch: Extend patch. * gnu/packages/emulators.scm (retroarch-minimal) [native-search-paths]: Register new search paths for the LIBRETRO_DATABASE_DIRECTORY and LIBRETRO_SYSTEM_DIRECTORY variables. Change-Id: I48f9a92608c0e36922ce9dcc9bbb61d6ca915002 --- gnu/packages/emulators.scm | 8 ++ .../retroarch-improved-search-paths.patch | 127 ++++++++++++++---- 2 files changed, 108 insertions(+), 27 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 2486485805..28b8914902 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2632,6 +2632,14 @@ (define-public retroarch-minimal (variable "LIBRETRO_AUTOCONFIG_DIRECTORY") (separator #f) ;single entry (files '("share/libretro/autoconfig"))) + (search-path-specification + (variable "LIBRETRO_DATABASE_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/database/rdb"))) + (search-path-specification + (variable "LIBRETRO_SYSTEM_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/system"))) (search-path-specification (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY") (separator #f) ;single entry diff --git a/gnu/packages/patches/retroarch-improved-search-paths.patch b/gnu/packages/patches/retroarch-improved-search-paths.patch index 6fcd4745ac..037e73fa09 100644 --- a/gnu/packages/patches/retroarch-improved-search-paths.patch +++ b/gnu/packages/patches/retroarch-improved-search-paths.patch @@ -1,25 +1,22 @@ -Allows discovery of assets file via the LIBRETRO_ASSETS_DIRECTORY environment -variable. - -Upstream-status: https://github.com/libretro/RetroArch/pull/17054 - diff --git a/configuration.c b/configuration.c -index 5808a3f21c..0cc2909102 100644 +index 5808a3f21c..e1c56f2f1b 100644 --- a/configuration.c +++ b/configuration.c -@@ -3573,6 +3573,11 @@ static bool config_load_file(global_t *global, +@@ -3573,6 +3573,13 @@ static bool config_load_file(global_t *global, { unsigned i; char tmp_str[PATH_MAX_LENGTH]; + char* libretro_directory = NULL; + char* libretro_assets_directory = NULL; + char* libretro_autoconfig_directory = NULL; ++ char* libretro_database_directory = NULL; ++ char* libretro_system_directory = NULL; + char* libretro_video_filter_directory = NULL; + char* libretro_video_shader_directory = NULL; static bool first_load = true; bool without_overrides = false; unsigned msg_color = 0; -@@ -3848,12 +3853,6 @@ static bool config_load_file(global_t *global, +@@ -3848,12 +3855,6 @@ static bool config_load_file(global_t *global, strlcpy(path_settings[i].ptr, tmp_str, PATH_MAX_LENGTH); } @@ -32,7 +29,7 @@ index 5808a3f21c..0cc2909102 100644 #ifdef RARCH_CONSOLE if (conf) video_driver_load_settings(global, conf); -@@ -3861,6 +3860,20 @@ static bool config_load_file(global_t *global, +@@ -3861,6 +3862,32 @@ static bool config_load_file(global_t *global, /* Post-settings load */ @@ -45,15 +42,27 @@ index 5808a3f21c..0cc2909102 100644 + } + + libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY"); -+ if (libretro_autoconfig_directory) ++ if (libretro_autoconfig_directory) /* override configuration value */ + configuration_set_string(settings, + settings->paths.directory_autoconfig, + libretro_autoconfig_directory); ++ ++ libretro_database_directory = getenv("LIBRETRO_DATABASE_DIRECTORY"); ++ if (libretro_database_directory) /* override configuration value */ ++ configuration_set_string(settings, ++ settings->paths.path_content_database, ++ libretro_database_directory); ++ ++ libretro_system_directory = getenv("LIBRETRO_SYSTEM_DIRECTORY"); ++ if (libretro_system_directory) /* override configuration value */ ++ configuration_set_string(settings, ++ settings->paths.directory_system, ++ libretro_system_directory); + if ( (rarch_flags & RARCH_FLAGS_HAS_SET_USERNAME) && (override_username)) { -@@ -4032,15 +4045,27 @@ static bool config_load_file(global_t *global, +@@ -4032,15 +4059,27 @@ static bool config_load_file(global_t *global, *settings->paths.path_menu_wallpaper = '\0'; if (string_is_equal(settings->paths.path_rgui_theme_preset, "default")) *settings->paths.path_rgui_theme_preset = '\0'; @@ -85,18 +94,18 @@ index 5808a3f21c..0cc2909102 100644 #ifdef _3DS if (string_is_equal(settings->paths.directory_bottom_assets, "default")) diff --git a/docs/retroarch.6 b/docs/retroarch.6 -index 7478040e17..f864e0e0d5 100644 +index 7478040e17..f26a1219f0 100644 --- a/docs/retroarch.6 +++ b/docs/retroarch.6 @@ -1,6 +1,6 @@ .\" retroarch.6: -.TH "RETROARCH" "6" "November 1, 2011" "RETROARCH" "System Manager's Manual: retroarch" -+.TH "RETROARCH" "6" "September 28, 2024" "RETROARCH" "System Manager's Manual: retroarch" ++.TH "RETROARCH" "6" "January 18, 2025" "RETROARCH" "System Manager's Manual: retroarch" .SH NAME -@@ -239,3 +239,36 @@ Disables all kinds of content patching. +@@ -239,3 +239,48 @@ Disables all kinds of content patching. .TP \fB-D, --detach\fR Detach from the current console. This is currently only relevant for Microsoft Windows. @@ -123,6 +132,18 @@ index 7478040e17..f864e0e0d5 100644 +"joypad_autoconfig_dir" configuration file option. + +.TP ++\fBLIBRETRO_DATABASE_DIRECTORY\fR ++Specify the directory where RetroArch looks for database files, ++overriding the value of the "content_database_path" configuration file ++option. ++ ++.TP ++\fBLIBRETRO_SYSTEM_DIRECTORY\fR ++Specify the directory where RetroArch looks for system files, ++overriding the value of the "system_directory" configuration file ++option. ++ ++.TP +\fBLIBRETRO_VIDEO_FILTER_DIRECTORY\fR +Specify the directory where RetroArch looks for video filters, +overriding the value of the "video_filter_dir" configuration file @@ -134,21 +155,23 @@ index 7478040e17..f864e0e0d5 100644 +overriding the value of the "video_shader_dir" configuration file +option. diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c -index c157d355a1..ddf0b5ca87 100644 +index c157d355a1..bec65ca949 100644 --- a/frontend/drivers/platform_unix.c +++ b/frontend/drivers/platform_unix.c -@@ -1324,6 +1324,10 @@ static void frontend_unix_get_env(int *argc, +@@ -1324,6 +1324,12 @@ static void frontend_unix_get_env(int *argc, { unsigned i; const char* libretro_directory = getenv("LIBRETRO_DIRECTORY"); + const char* libretro_assets_directory = getenv("LIBRETRO_ASSETS_DIRECTORY"); + const char* libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY"); ++ const char* libretro_database_directory = getenv("LIBRETRO_DATABASE_DIRECTORY"); ++ const char* libretro_system_directory = getenv("LIBRETRO_SYSTEM_DIRECTORY"); + const char* libretro_video_filter_directory = getenv("LIBRETRO_VIDEO_FILTER_DIRECTORY"); + const char* libretro_video_shader_directory = getenv("LIBRETRO_VIDEO_SHADER_DIRECTORY"); #ifdef ANDROID int32_t major, minor, rel; char device_model[PROP_VALUE_MAX] = {0}; -@@ -1765,12 +1769,20 @@ static void frontend_unix_get_env(int *argc, +@@ -1765,12 +1771,20 @@ static void frontend_unix_get_env(int *argc, "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); else #endif @@ -174,7 +197,7 @@ index c157d355a1..ddf0b5ca87 100644 #ifdef ASSETS_DIR if (path_is_directory(ASSETS_DIR "/assets")) fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], -@@ -1778,7 +1790,10 @@ static void frontend_unix_get_env(int *argc, +@@ -1778,7 +1792,10 @@ static void frontend_unix_get_env(int *argc, "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); else #endif @@ -186,7 +209,7 @@ index c157d355a1..ddf0b5ca87 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], "/usr/local/share/retroarch", "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); -@@ -1838,7 +1853,11 @@ static void frontend_unix_get_env(int *argc, +@@ -1838,7 +1855,11 @@ static void frontend_unix_get_env(int *argc, "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER])); else #endif @@ -199,12 +222,21 @@ index c157d355a1..ddf0b5ca87 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER], "/usr/local/share/retroarch", "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER])); -@@ -1872,8 +1891,13 @@ static void frontend_unix_get_env(int *argc, +@@ -1870,10 +1891,20 @@ static void frontend_unix_get_env(int *argc, + "records_config", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT], base_path, "records", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path, - "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); +- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path, +- "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER], base_path, - "shaders", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER])); ++ if (!string_is_empty(libretro_database_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_DATABASE], ++ libretro_database_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); ++ else ++ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path, ++ "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); + if (!string_is_empty(libretro_video_shader_directory)) + strlcpy(g_defaults.dirs[DEFAULT_DIR_SHADER], + libretro_video_shader_directory, @@ -215,16 +247,34 @@ index c157d355a1..ddf0b5ca87 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], base_path, "cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS])); fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_OVERLAY], base_path, +@@ -1892,8 +1923,13 @@ static void frontend_unix_get_env(int *argc, + "saves", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], base_path, + "states", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); +- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], base_path, +- "system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ if (!string_is_empty(libretro_system_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_SYSTEM], ++ libretro_system_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ else ++ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], base_path, ++ "system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); + #endif + + #ifndef IS_SALAMANDER diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c -index 26ed25c04f..0cc9a9dc95 100644 +index 26ed25c04f..77d415f0e7 100644 --- a/frontend/drivers/platform_win32.c +++ b/frontend/drivers/platform_win32.c -@@ -565,24 +565,38 @@ static void frontend_win32_env_get(int *argc, char *argv[], +@@ -565,24 +565,45 @@ static void frontend_win32_env_get(int *argc, char *argv[], { const char *tmp_dir = getenv("TMP"); const char *libretro_directory = getenv("LIBRETRO_DIRECTORY"); + const char *libretro_assets_directory = getenv("LIBRETRO_ASSETS_DIRECTORY"); + const char* libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY"); ++ const char* libretro_database_directory = getenv("LIBRETRO_DATABASE_DIRECTORY"); ++ const char* libretro_system_directory = getenv("LIBRETRO_SYSTEM_DIRECTORY"); + const char* libretro_video_filter_directory = getenv("LIBRETRO_VIDEO_FILTER_DIRECTORY"); + const char* libretro_video_shader_directory = getenv("LIBRETRO_VIDEO_SHADER_DIRECTORY"); if (!string_is_empty(tmp_dir)) @@ -255,15 +305,22 @@ index 26ed25c04f..0cc9a9dc95 100644 + ":\\filters\\video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CHEATS], ":\\cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS])); - fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE], - ":\\database\\rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); +- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE], +- ":\\database\\rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); ++ if (!string_is_empty(libretro_database_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_DATABASE], ++ libretro_database_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); ++ else ++ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE], ++ ":\\database\\rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], - ":\\playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); + ":\\playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG], ":\\config\\record", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT], -@@ -605,12 +619,26 @@ static void frontend_win32_env_get(int *argc, char *argv[], +@@ -605,12 +626,26 @@ static void frontend_win32_env_get(int *argc, char *argv[], else fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE], ":\\cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); @@ -296,3 +353,19 @@ index 26ed25c04f..0cc9a9dc95 100644 fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], ":\\downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT], +@@ -619,8 +654,13 @@ static void frontend_win32_env_get(int *argc, char *argv[], + ":\\saves", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); + fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], + ":\\states", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); +- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SYSTEM], +- ":\\system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ if (!string_is_empty(libretro_system_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_SYSTEM], ++ libretro_system_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ else ++ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SYSTEM], ++ ":\\system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); + fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_LOGS], + ":\\logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS])); +