From f89c14996ab89786cd6694eb888a1e4d22fed076 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sun, 12 Apr 2020 10:15:40 -0500
Subject: retroarch-1.8.5-1.parabola1: updating version

---
 libre/retroarch/PKGBUILD    |  32 ++++++---
 libre/retroarch/libre.patch | 163 +++++++++++++++++++++++---------------------
 2 files changed, 110 insertions(+), 85 deletions(-)

diff --git a/libre/retroarch/PKGBUILD b/libre/retroarch/PKGBUILD
index e0ef8bd52..7dd6da06a 100644
--- a/libre/retroarch/PKGBUILD
+++ b/libre/retroarch/PKGBUILD
@@ -8,8 +8,8 @@
 #  - removed updated urls (libre.patch)
 
 pkgname=retroarch
-pkgver=1.7.6
-pkgrel=2
+pkgver=1.8.5
+pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='Reference frontend for the libretro API'
 arch=(x86_64)
@@ -19,6 +19,7 @@ license=(GPL)
 groups=(libretro)
 depends=(
   alsa-lib
+  flac
   libass.so
   libavcodec.so
   libavformat.so
@@ -31,7 +32,9 @@ depends=(
   libswscale.so
   libudev.so
   libusb-1.0.so
+  mbedtls
   mesa
+  miniupnpc
   openal
   qt5-base
   sdl2
@@ -63,13 +66,21 @@ optdepends=(
 )
 backup=(etc/retroarch.cfg)
 source=(
-  git+https://github.com/libretro/RetroArch.git#tag=v${pkgver}
+  git+https://github.com/libretro/RetroArch.git#tag=8bcd74bf42f486c37e243a80e29bc214b2b6b205
   retroarch-config.patch
   libre.patch
 )
-sha256sums=('SKIP'
-            '7857cff30c45721b66666828ca9edbb2923817c6c64591be3f58fe019277103e'
-            '0a2afb0e4f8e45b3366034e23ebbf980fa9cf9108d98fd167fda9e15a47c8452')
+sha256sums=(
+  SKIP
+  7857cff30c45721b66666828ca9edbb2923817c6c64591be3f58fe019277103e
+  fc6944ad6bf742c4abf5db69b228a5de8aa5a909a89d227844b90b8d8b817245
+)
+
+pkgver() {
+  cd RetroArch
+
+  git describe --tags | sed 's/^v//'
+}
 
 prepare() {
   cd RetroArch
@@ -82,11 +93,16 @@ build() {
   cd RetroArch
 
   ./configure \
-    --prefix='/usr' \
+    --prefix=/usr \
+    --disable-builtinflac \
+    --disable-builtinmbedtls \
+    --disable-builtinminiupnpc \
+    --disable-builtinzlib \
     --disable-cg \
     --disable-jack \
     --disable-oss \
-    --disable-sdl
+    --disable-sdl \
+    --enable-dbus
   make
   make -C libretro-common/audio/dsp_filters
   make -C gfx/video_filters
diff --git a/libre/retroarch/libre.patch b/libre/retroarch/libre.patch
index 1660aba7b..ac72c5a04 100644
--- a/libre/retroarch/libre.patch
+++ b/libre/retroarch/libre.patch
@@ -1,146 +1,155 @@
 diff --git a/config.def.h b/config.def.h
-index 1515ab3fa9..4ecbd8cd9d 100644
+index e77894d5d3..885f7c87ea 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -787,92 +787,92 @@ static const unsigned midi_volume = 100;
- static const bool sustained_performance_mode = false;
+@@ -1121,98 +1121,98 @@ static const bool enable_device_vibration    = false;
+ #endif
  
  #if defined(HAKCHI)
--static char buildbot_server_url[] = "http://hakchicloud.com/Libretro_Cores/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #elif defined(ANDROID)
  #if defined(ANDROID_ARM_V7)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #elif defined(ANDROID_ARM)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #elif defined(ANDROID_AARCH64)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #elif defined(ANDROID_X86)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #elif defined(ANDROID_X64)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86_64/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86_64/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #else
- static char buildbot_server_url[] = "";
+ #define DEFAULT_BUILDBOT_SERVER_URL ""
  #endif
  #elif defined(__QNX__)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/blackberry/latest/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/blackberry/latest/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #elif defined(IOS)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/ios/latest/";
-+static char buildbot_server_url[] = "";
+-#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__)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/";
-+static char buildbot_server_url[] = "";
+-#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__)
--static char buildbot_server_url[] = "http://bot.libretro.com/nightly/apple/osx/x86/latest/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://bot.libretro.com/nightly/apple/osx/x86/latest/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #else
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86_64/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86_64/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/";
-+static char buildbot_server_url[] = "";
- #elif  defined(__arm__) || defined(_M_ARM)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #endif
  #elif _MSC_VER == 1400
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #elif _MSC_VER == 1310
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86_64/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86/latest/";
-+static char buildbot_server_url[] = "";
+-#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__)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/x86_64/latest/";
-+static char buildbot_server_url[] = "";
+-#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__)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/x86/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/armhf/latest/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/armhf/latest/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #else
- static char buildbot_server_url[] = "";
+ #define DEFAULT_BUILDBOT_SERVER_URL ""
  #endif
  #elif defined(WIIU)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #elif defined(HAVE_LIBNX)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/";
-+static char buildbot_server_url[] = "";
+-#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)
--static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/";
-+static char buildbot_server_url[] = "";
+-#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/"
++#define DEFAULT_BUILDBOT_SERVER_URL ""
  #else
- static char buildbot_server_url[] = "";
+ #define DEFAULT_BUILDBOT_SERVER_URL ""
  #endif
  
--static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/";
-+static char buildbot_assets_server_url[] = "";
+-#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL "http://buildbot.libretro.com/assets/"
++#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL ""
  
- static char default_discord_app_id[] = "475456035851599874";
+ #define DEFAULT_DISCORD_APP_ID "475456035851599874"
  
 diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
-index e1367fc328..22d72ccc23 100644
+index 9fe207e8b0..11405115ad 100644
 --- a/frontend/drivers/platform_darwin.m
 +++ b/frontend/drivers/platform_darwin.m
-@@ -433,7 +433,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
- #if TARGET_OS_IOS
+@@ -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));
+ #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 448c6dbdde..7d0b6e33e5 100644
+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)
@@ -153,10 +162,10 @@ index 448c6dbdde..7d0b6e33e5 100644
     while (!net_http_update(http1, &pos, &tot))
        printf("%.9lu / %.9lu        \r",pos,tot);
 diff --git a/retroarch.cfg b/retroarch.cfg
-index d2f0e5bdec..d215c22874 100644
+index 2454b1bd62..810e432d5e 100644
 --- a/retroarch.cfg
 +++ b/retroarch.cfg
-@@ -714,13 +714,13 @@
+@@ -721,13 +721,13 @@
  #### Core Updater
  
  # URL to core update directory on buildbot.
-- 
cgit v1.2.3