[retroarch]: wip upgrade to v1.9.6

4 files changed, 125 insertions, 233 deletions

diff --git a/libre/retroarch/PKGBUILD b/libre/retroarch/PKGBUILD
index cb53b3b27..954cc32a5 100644
--- a/libre/retroarch/PKGBUILD
+++ b/libre/retroarch/PKGBUILD
@@ -1,16 +1,20 @@
-# Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org>
-# Contributor (Arch): Themaister <maister@archlinux.us>
-# Contributor (Arch): lifning <definelightning@gmail.com>
+# Maintainer (arch): Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: Themaister <maister@archlinux.us>
+# Contributor: lifning <definelightning@gmail.com>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor: Nikita Epifanov <nikgreens@protonmail.com>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
 
 # rationale for inclusion in [libre]:
-#  - removed updated urls (libre.patch)
+#  - disable auto-updater/downloader
+
 
 pkgname=retroarch
-pkgver=1.9.4
-pkgrel=1
-pkgrel+=.parabola1
+pkgver=1.9.6
+pkgrel=2
+pkgrel+=.parabola2
 pkgdesc='Reference frontend for the libretro API'
 arch=(x86_64)
 arch+=(i686 armv7h)
@@ -41,6 +45,7 @@ depends=(
   v4l-utils
   zlib
 )
+depends+=(libmbedcrypto.so)
 makedepends=(
   git
   libx11
@@ -66,13 +71,16 @@ optdepends=(
   'wayland: Wayland support'
 )
 backup=(etc/retroarch.cfg)
+_tag=4a6dc36b1cc026bf337537e2d7527a117727bb91
 source=(
-  git+https://github.com/libretro/RetroArch.git#tag=c226bd87f47b3fdec642216fcaf6edc651e30eb4
-  libre.patch
+  git+https://github.com/libretro/RetroArch.git#tag=${_tag}
+  retroarch-config.patch
+  disable-auto-update.patch
 )
 sha256sums=(
   SKIP
-  f99c89de06fff346608c24d43e34cf6ae24a4a7b70c717abbe71f67682df1352
+  7857cff30c45721b66666828ca9edbb2923817c6c64591be3f58fe019277103e
+  cb3915a5ada76e29abd2a8b2c06c8dc50909473b5c53ec112dffab87fcc585e1
 )
 
 pkgver() {
@@ -84,7 +92,14 @@ pkgver() {
 prepare() {
   cd RetroArch
 
-  patch -Np1 -i ${srcdir}/libre.patch
+  patch -Np1 -i ../retroarch-config.patch
+
+  git cherry-pick -n 685948368e6b28b97e1b91bdfe5921519359a033 # FS#66843
+
+  echo "applying disable-auto-update.patch"
+  sed -i 's|\(#define DEFAULT_BUILDBOT_SERVER_URL\) ".*|\1 ""|'        config.def.h
+  sed -i 's|\(#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL\) ".*|\1 ""|' config.def.h
+  patch -Np1 -i ${srcdir}/disable-auto-update.patch
 }
 
 build() {
@@ -114,5 +129,3 @@ package() {
   install -Dm 644 libretro-common/audio/dsp_filters/*.{dsp,so} -t "${pkgdir}"/usr/lib/retroarch/filters/audio/
   install -Dm 644 gfx/video_filters/*.{filt,so} -t "${pkgdir}"/usr/lib/retroarch/filters/video/
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/libre/retroarch/disable-auto-update.patch b/libre/retroarch/disable-auto-update.patch
new file mode 100644
index 000000000..82938faaf
--- /dev/null
+++ b/libre/retroarch/disable-auto-update.patch
@@ -0,0 +1,47 @@
+diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
+index a5b01fb67e..6a66752926 100644
+--- a/frontend/drivers/platform_darwin.m
++++ b/frontend/drivers/platform_darwin.m
+@@ -475,7 +475,7 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
+        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
+ 
+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)
+    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 21d91ab1ef..fa99900f4d 100644
+--- a/retroarch.cfg
++++ b/retroarch.cfg
+@@ -729,13 +729,13 @@ menu_show_core_updater = false
+ #### 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
+ 
diff --git a/libre/retroarch/libre.patch b/libre/retroarch/libre.patch
deleted file mode 100644
index 0389f35f3..000000000
--- a/libre/retroarch/libre.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-@@ -1393,96 +1393,95 @@
- #endif
-
- #if defined(HAKCHI)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(ANDROID)
- #if defined(ANDROID_ARM_V7)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(ANDROID_ARM)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(ANDROID_AARCH64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(ANDROID_X86)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(ANDROID_X64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86_64/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #else
- #define DEFAULT_BUILDBOT_SERVER_URL ""
- #endif
- #elif defined(__QNX__)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/blackberry/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(IOS)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/ios/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(OSX)
- #if defined(__x86_64__)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #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 ""
- #endif
- #elif defined(_WIN32) && !defined(_XBOX)
- #if _MSC_VER >= 1910
- #ifndef __WINRT__
- #if defined(__x86_64__) || defined(_M_X64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x64/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__arm__) || defined(_M_ARM)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__aarch64__) || defined(_M_ARM64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm64/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #endif
- #else
- #if defined(__x86_64__) || defined(_M_X64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x64/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__arm__) || defined(_M_ARM)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__aarch64__) || defined(_M_ARM64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm64/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #endif
- #endif
- #elif _MSC_VER == 1600
- #if defined(__x86_64__) || defined(_M_X64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #endif
- #elif _MSC_VER == 1400
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif _MSC_VER == 1310
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #else
- #if defined(__x86_64__) || defined(_M_X64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86_64/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #endif
- #endif
- #elif defined(__linux__)
- #if defined(__x86_64__)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86_64/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #elif defined(__arm__) && __ARM_ARCH == 7 && defined(__ARM_PCS_VFP)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/armhf/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
- #else
- #define DEFAULT_BUILDBOT_SERVER_URL ""
- #endif
- #elif defined(WIIU)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/"
--#elif defined(HAVE_LIBNX)
--#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/"
-+#define DEFAULT_BUILDBOT_SERVER_URL ""
-+#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 "" ""
- #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
-@@ -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
-
-diff --git a/libretro-common/samples/net/net_http_test.c b/libretro-common/samples/net/net_http_test.c
-@@ -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
-@@ -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
new file mode 100644
index 000000000..b944bcc7e
--- /dev/null
+++ b/libre/retroarch/retroarch-config.patch
@@ -0,0 +1,51 @@
+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 =