Update RetroArch to 1.9.4

3 files changed, 84 insertions, 102 deletions

diff --git a/libre/retroarch/PKGBUILD b/libre/retroarch/PKGBUILD
index 7dd6da06a..cb53b3b27 100644
--- a/libre/retroarch/PKGBUILD
+++ b/libre/retroarch/PKGBUILD
@@ -8,7 +8,7 @@
 #  - removed updated urls (libre.patch)
 
 pkgname=retroarch
-pkgver=1.8.5
+pkgver=1.9.4
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='Reference frontend for the libretro API'
@@ -61,19 +61,18 @@ optdepends=(
   'libxinerama: X11 support'
   'libxrandr: X11 support'
   'python: retroarch-cg2glsl'
+  'retroarch-assets-ozone: Ozone menu assets'
   'retroarch-assets-xmb: XMB menu assets'
   'wayland: Wayland support'
 )
 backup=(etc/retroarch.cfg)
 source=(
-  git+https://github.com/libretro/RetroArch.git#tag=8bcd74bf42f486c37e243a80e29bc214b2b6b205
-  retroarch-config.patch
+  git+https://github.com/libretro/RetroArch.git#tag=c226bd87f47b3fdec642216fcaf6edc651e30eb4
   libre.patch
 )
 sha256sums=(
   SKIP
-  7857cff30c45721b66666828ca9edbb2923817c6c64591be3f58fe019277103e
-  fc6944ad6bf742c4abf5db69b228a5de8aa5a909a89d227844b90b8d8b817245
+  f99c89de06fff346608c24d43e34cf6ae24a4a7b70c717abbe71f67682df1352
 )
 
 pkgver() {
@@ -85,7 +84,6 @@ pkgver() {
 prepare() {
   cd RetroArch
 
-  patch -Np1 -i ../retroarch-config.patch
   patch -Np1 -i ${srcdir}/libre.patch
 }
 
diff --git a/libre/retroarch/libre.patch b/libre/retroarch/libre.patch
index ac72c5a04..0389f35f3 100644
--- a/libre/retroarch/libre.patch
+++ b/libre/retroarch/libre.patch
@@ -1,10 +1,7 @@
 diff --git a/config.def.h b/config.def.h
-index e77894d5d3..885f7c87ea 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -1121,98 +1121,98 @@ static const bool enable_device_vibration    = false;
+@@ -1393,96 +1393,95 @@
  #endif
- 
+
  #if defined(HAKCHI)
 -#define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/"
 +#define DEFAULT_BUILDBOT_SERVER_URL ""
@@ -40,6 +37,9 @@ index e77894d5d3..885f7c87ea 100644
  #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
 -#define DEFAULT_BUILDBOT_SERVER_URL "http://bot.libretro.com/nightly/apple/osx/x86/latest/"
 +#define DEFAULT_BUILDBOT_SERVER_URL ""
+ #elif defined(__aarch64__)
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/arm64/latest/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #else
 -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/"
 +#define DEFAULT_BUILDBOT_SERVER_URL ""
@@ -113,72 +113,107 @@ index e77894d5d3..885f7c87ea 100644
  #endif
  #elif defined(WIIU)
 -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(HAVE_LIBNX)
+-#elif defined(HAVE_LIBNX)
 -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/"
 +#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__CELLOS_LV2__) && defined(DEX_BUILD)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__CELLOS_LV2__) && defined(ODE_BUILD)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/"
 +#define DEFAULT_BUILDBOT_SERVER_URL ""
+ #elif defined(_3DS)
+-#define DEFAULT_BUILDBOT_SERVER_URL envIsHomebrew() ? "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/3dsx/" : "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/cia/"
++#define DEFAULT_BUILDBOT_SERVER_URL envIsHomebrew() ? "" : ""
  #else
- #define DEFAULT_BUILDBOT_SERVER_URL ""
+-#define DEFAULT_BUILDBOT_SERVER_URL ""
++#define DEFAULT_BUILDBOT_SERVER_URL "" ""
  #endif
- 
+
 -#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL "http://buildbot.libretro.com/assets/"
 +#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL ""
- 
+
  #define DEFAULT_DISCORD_APP_ID "475456035851599874"
- 
+
 diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
-index 9fe207e8b0..11405115ad 100644
---- a/frontend/drivers/platform_darwin.m
-+++ b/frontend/drivers/platform_darwin.m
-@@ -459,7 +459,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
-     char assets_zip_path[PATH_MAX_LENGTH];
- #if TARGET_OS_IOS
-     if (major > 8)
--       strlcpy(g_defaults.path.buildbot_server_url, "http://buildbot.libretro.com/nightly/apple/ios9/latest/", sizeof(g_defaults.path.buildbot_server_url));
-+       strlcpy(g_defaults.path.buildbot_server_url, "", sizeof(g_defaults.path.buildbot_server_url));
+@@ -475,7 +475,7 @@
+        int major, minor;
+        get_ios_version(&major, &minor);
+        if (major > 8)
+-          strcpy_literal(g_defaults.path_buildbot_server_url, "http://buildbot.libretro.com/nightly/apple/ios9/latest/");
++          strcpy_literal(g_defaults.path_buildbot_server_url, "");
+     }
  #endif
- 
-     fill_pathname_join(assets_zip_path, bundle_path_buf, "assets.zip", sizeof(assets_zip_path));
+
 diff --git a/libretro-common/samples/net/net_http_test.c b/libretro-common/samples/net/net_http_test.c
-index 48e0354aa6..6dc8fc9702 100644
---- a/libretro-common/samples/net/net_http_test.c
-+++ b/libretro-common/samples/net/net_http_test.c
-@@ -37,7 +37,7 @@ int main(void)
+@@ -37,7 +37,7 @@
     if (!network_init())
        return -1;
- 
+
 -   http1 = net_http_new("http://buildbot.libretro.com/nightly/windows/x86_64/latest/mednafen_psx_libretro.dll.zip");
 +   http1 = net_http_new("");
- 
+
     while (!net_http_update(http1, &pos, &tot))
        printf("%.9lu / %.9lu        \r",pos,tot);
+
 diff --git a/retroarch.cfg b/retroarch.cfg
-index 2454b1bd62..810e432d5e 100644
---- a/retroarch.cfg
-+++ b/retroarch.cfg
-@@ -721,13 +721,13 @@
+@@ -650,7 +650,7 @@
+ # menu_show_online_updater = true
+
+ # If disabled, will hide the ability to update cores (and core info files) inside the menu.
+-# menu_show_core_updater = true
++menu_show_core_updater = false
+
+ # If disabled, the libretro core will keep running in the background when we
+ # are in the menu.
+@@ -729,13 +729,13 @@
  #### Core Updater
- 
+
  # URL to core update directory on buildbot.
 -# core_updater_buildbot_url = "http://buildbot.libretro.com"
 +core_updater_buildbot_url = ""
- 
+
  # URL to assets update directory on buildbot.
 -# core_updater_buildbot_assets_url = "http://buildbot.libretro.com/assets/"
 +core_updater_buildbot_assets_url = ""
- 
+
  # After downloading, automatically extract archives that the downloads are contained inside.
 -# core_updater_auto_extract_archive = true
 +core_updater_auto_extract_archive = false
- 
+
  #### Network
- 
+
+@@ -779,7 +779,7 @@
+
+ # Assets directory. This location is queried by default when menu interfaces try to look for
+ # loadable assets, etc.
+-# assets_directory =
++assets_directory = /usr/share/retroarch/assets
+
+ # Dynamic wallpapers directory. The place to store the wallpapers dynamically
+ # loaded by the menu depending on context.
+@@ -792,10 +792,10 @@
+ # rgui_browser_directory =
+
+ # Core directory for libretro core implementations.
+-# libretro_directory =
++libretro_directory = /usr/lib/libretro
+
+ # Core info directory for libretro core information.
+-# libretro_info_path =
++libretro_info_path = /usr/share/libretro/info
+
+ # Path to content database directory.
+ # content_database_path =
+@@ -807,13 +807,13 @@
+ # cheat_database_path =
+
+ # Defines a directory where CPU-based video filters are kept.
+-# video_filter_dir =
++video_filter_dir = /usr/lib/retroarch/filters/video
+
+ # Directory where DSP plugins are kept.
+-# audio_filter_dir =
++audio_filter_dir = /usr/lib/retroarch/filters/audio
+
+ # Defines a directory where shaders (Cg, CGP, GLSL) are kept for easy access.
+-# video_shader_dir =
++video_shader_dir = /usr/share/libretro/shaders
+
+ # Recording output directory. Where recordings are saved.
+ # recording_output_directory =
diff --git a/libre/retroarch/retroarch-config.patch b/libre/retroarch/retroarch-config.patch
deleted file mode 100644
index b944bcc7e..000000000
--- a/libre/retroarch/retroarch-config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -rupN RetroArch.orig/retroarch.cfg RetroArch/retroarch.cfg
---- RetroArch.orig/retroarch.cfg	2018-11-14 10:16:14.586946273 +0100
-+++ RetroArch/retroarch.cfg	2018-11-14 10:15:09.879807008 +0100
-@@ -625,7 +625,7 @@
- # menu_show_online_updater = true
- 
- # If disabled, will hide the ability to update cores (and core info files) inside the menu.
--# menu_show_core_updater = true
-+menu_show_core_updater = false
- 
- # If disabled, the libretro core will keep running in the background when we
- # are in the menu.
-@@ -754,7 +754,7 @@
- 
- # Assets directory. This location is queried by default when menu interfaces try to look for
- # loadable assets, etc.
--# assets_directory =
-+assets_directory = /usr/share/retroarch/assets
- 
- # Dynamic wallpapers directory. The place to store the wallpapers dynamically
- # loaded by the menu depending on context.
-@@ -767,10 +767,10 @@
- # rgui_browser_directory =
- 
- # Core directory for libretro core implementations.
--# libretro_directory =
-+libretro_directory = /usr/lib/libretro
- 
- # Core info directory for libretro core information.
--# libretro_info_path =
-+libretro_info_path = /usr/share/libretro/info
- 
- # Path to content database directory.
- # content_database_path =
-@@ -782,13 +782,13 @@
- # cheat_database_path =
- 
- # Defines a directory where CPU-based video filters are kept.
--# video_filter_dir =
-+video_filter_dir = /usr/lib/retroarch/filters/video
- 
- # Directory where DSP plugins are kept.
--# audio_filter_dir =
-+audio_filter_dir = /usr/lib/retroarch/filters/audio
- 
- # Defines a directory where shaders (Cg, CGP, GLSL) are kept for easy access.
--# video_shader_dir =
-+video_shader_dir = /usr/share/libretro/shaders
- 
- # Recording output directory. Where recordings are saved.
- # recording_output_directory =