libre/retroarch: updated to 1.7.6

3 files changed, 160 insertions, 85 deletions

diff --git a/libre/retroarch/PKGBUILD b/libre/retroarch/PKGBUILD
index fe30cef9f..e0ef8bd52 100644
--- a/libre/retroarch/PKGBUILD
+++ b/libre/retroarch/PKGBUILD
@@ -1,46 +1,85 @@
-# $Id$
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org>
 # Contributor (Arch): Themaister <maister@archlinux.us>
 # Contributor (Arch): lifning <definelightning@gmail.com>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
+
+# rationale for inclusion in [libre]:
+#  - removed updated urls (libre.patch)
 
 pkgname=retroarch
-pkgver=1.7.3
-pkgrel=1.parabola1
-pkgdesc='Reference frontend for the libretro API, without nonfree software support, libretro-genesis-plus and libretro-snes9x recommendation'
-arch=('x86_64' 'i686' 'armv7h')
-url='http://www.libretro.com/'
-license=('GPL')
-groups=('libretro')
-depends=('alsa-lib' 'gcc-libs' 'glibc' 'libdrm' 'libgl' 'libpulse' 'libx11'
-         'libxcb' 'libxext' 'libxinerama' 'libxkbcommon' 'libxv' 'libxxf86vm'
-         'mesa' 'openal' 'qt5-base' 'sdl2' 'v4l-utils' 'wayland' 'zlib'
-         'libass.so' 'libavcodec.so' 'libavformat.so' 'libavutil.so'
-         'libfreetype.so' 'libswresample.so' 'libswscale.so' 'libudev.so'
-         'libusb-1.0.so')
-makedepends=('vulkan-icd-loader')
-optdepends=('libretro-overlays: Collection of overlays'
-            'libretro-shaders: Collection of shaders'
-            'python: retroarch-cg2glsl'
-            'retroarch-assets-xmb: XMB menu assets')
-backup=('etc/retroarch.cfg')
-source=("retroarch-${pkgver}.tar.gz::https://github.com/libretro/RetroArch/archive/v${pkgver}.tar.gz"
-        'retroarch-config.patch'
-        'libre.patch')
-sha256sums=('a60c2244609bb87cdb56dd8e1020c3be757569b5246141328804ebc5574327ea'
-            '14f07b31d6bdb049dad62dd12597c292b8d2df5cb2803d15de00a7597d3081fd'
-            'e8aa0c7a890c2e24012ecff4b7326bcf89214493ebf3138129aa7340585f3c62')
+pkgver=1.7.6
+pkgrel=2
+pkgrel+=.parabola1
+pkgdesc='Reference frontend for the libretro API'
+arch=(x86_64)
+arch+=(i686 armv7h)
+url=http://www.libretro.com/
+license=(GPL)
+groups=(libretro)
+depends=(
+  alsa-lib
+  libass.so
+  libavcodec.so
+  libavformat.so
+  libavutil.so
+  libdrm
+  libfreetype.so
+  libgl
+  libpulse
+  libswresample.so
+  libswscale.so
+  libudev.so
+  libusb-1.0.so
+  mesa
+  openal
+  qt5-base
+  sdl2
+  v4l-utils
+  zlib
+)
+makedepends=(
+  git
+  libx11
+  libxcb
+  libxext
+  libxinerama
+  libxkbcommon
+  libxrandr
+  libxv
+  libxxf86vm
+  vulkan-icd-loader
+  wayland
+  wayland-protocols
+)
+optdepends=(
+  'libretro-overlays: Collection of overlays'
+  'libretro-shaders: Collection of shaders'
+  'libxinerama: X11 support'
+  'libxrandr: X11 support'
+  'python: retroarch-cg2glsl'
+  'retroarch-assets-xmb: XMB menu assets'
+  'wayland: Wayland support'
+)
+backup=(etc/retroarch.cfg)
+source=(
+  git+https://github.com/libretro/RetroArch.git#tag=v${pkgver}
+  retroarch-config.patch
+  libre.patch
+)
+sha256sums=('SKIP'
+            '7857cff30c45721b66666828ca9edbb2923817c6c64591be3f58fe019277103e'
+            '0a2afb0e4f8e45b3366034e23ebbf980fa9cf9108d98fd167fda9e15a47c8452')
 
 prepare() {
-  cd RetroArch-${pkgver}
+  cd RetroArch
 
-  patch -Np0 -i ../retroarch-config.patch
+  patch -Np1 -i ../retroarch-config.patch
   patch -Np1 -i ${srcdir}/libre.patch
 }
 
 build() {
-  cd RetroArch-${pkgver}
+  cd RetroArch
 
   ./configure \
     --prefix='/usr' \
@@ -54,7 +93,7 @@ build() {
 }
 
 package() {
-  cd RetroArch-${pkgver}
+  cd RetroArch
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/libre/retroarch/libre.patch b/libre/retroarch/libre.patch
index 220e60b16..1660aba7b 100644
--- a/libre/retroarch/libre.patch
+++ b/libre/retroarch/libre.patch
@@ -1,17 +1,29 @@
---- RetroArch-1.7.3.orig/config.def.h	2018-05-03 22:45:22.000000000 -0500
-+++ RetroArch-1.7.3/config.def.h	2018-05-21 14:28:04.111728600 -0500
-@@ -686,66 +686,66 @@
+diff --git a/config.def.h b/config.def.h
+index 1515ab3fa9..4ecbd8cd9d 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;
  
- #if defined(ANDROID)
- #if defined(ANDROID_ARM)
+ #if defined(HAKCHI)
+-static char buildbot_server_url[] = "http://hakchicloud.com/Libretro_Cores/";
++static char 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[] = "";
+ #elif defined(ANDROID_ARM)
+-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi/";
++static char 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[] = "";
  #elif defined(ANDROID_X86)
 -static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86/";
 +static char 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[] = "";
  #else
  static char buildbot_server_url[] = "";
  #endif
@@ -33,7 +45,28 @@
 +static char buildbot_server_url[] = "";
  #endif
  #elif defined(_WIN32) && !defined(_XBOX)
- #if _MSC_VER == 1600
+ #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[] = "";
+ #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[] = "";
+ #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[] = "";
+ #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[] = "";
+ #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[] = "";
@@ -72,6 +105,9 @@
  #elif defined(WIIU)
 -static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/";
 +static char 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[] = "";
  #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[] = "";
@@ -88,11 +124,14 @@
 -static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/";
 +static char buildbot_assets_server_url[] = "";
  
- #endif
---- RetroArch-1.7.3.orig/frontend/drivers/platform_darwin.m	2018-05-03 22:45:22.000000000 -0500
-+++ RetroArch-1.7.3/frontend/drivers/platform_darwin.m	2018-05-21 14:29:16.531823443 -0500
-@@ -413,7 +413,7 @@
- #if TARGET_OS_IPHONE
+ static char default_discord_app_id[] = "475456035851599874";
+ 
+diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
+index e1367fc328..22d72ccc23 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
      char assets_zip_path[PATH_MAX_LENGTH];
      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));
@@ -100,9 +139,11 @@
  
      fill_pathname_join(assets_zip_path, bundle_path_buf, "assets.zip", sizeof(assets_zip_path));
      
---- RetroArch-1.7.3.orig/libretro-common/samples/net/net_http_test.c	2018-05-03 22:45:22.000000000 -0500
-+++ RetroArch-1.7.3/libretro-common/samples/net/net_http_test.c	2018-05-21 14:29:54.836777185 -0500
-@@ -37,7 +37,7 @@
+diff --git a/libretro-common/samples/net/net_http_test.c b/libretro-common/samples/net/net_http_test.c
+index 448c6dbdde..7d0b6e33e5 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;
  
@@ -111,9 +152,11 @@
  
     while (!net_http_update(http1, &pos, &tot))
        printf("%.9lu / %.9lu        \r",pos,tot);
---- RetroArch-1.7.3.orig/retroarch.cfg	2018-05-03 22:45:22.000000000 -0500
-+++ RetroArch-1.7.3/retroarch.cfg	2018-05-21 14:31:29.215890062 -0500
-@@ -751,13 +751,13 @@
+diff --git a/retroarch.cfg b/retroarch.cfg
+index d2f0e5bdec..d215c22874 100644
+--- a/retroarch.cfg
++++ b/retroarch.cfg
+@@ -714,13 +714,13 @@
  #### Core Updater
  
  # URL to core update directory on buildbot.
diff --git a/libre/retroarch/retroarch-config.patch b/libre/retroarch/retroarch-config.patch
index 4ef1f381b..b944bcc7e 100644
--- a/libre/retroarch/retroarch-config.patch
+++ b/libre/retroarch/retroarch-config.patch
@@ -1,19 +1,16 @@
---- retroarch.cfg.orig	2017-11-21 16:40:48.000000000 +0100
-+++ retroarch.cfg	2017-12-22 21:37:14.020611669 +0100
-@@ -41,10 +41,10 @@
- # libretro_path = "/path/to/libretro.so"
- 
- # A directory for where to search for libretro core implementations.
--# libretro_directory =
-+libretro_directory = /usr/lib/libretro
+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
  
- # A directory for where to search for libretro core information.
--# libretro_info_path =
-+libretro_info_path = /usr/share/libretro/info
+ # 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
  
- # Sets log level for libretro cores (GET_LOG_INTERFACE).
- # If a log level issued by a libretro core is below libretro_log_level, it is ignored.
-@@ -104,7 +104,7 @@
+ # 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.
@@ -22,37 +19,33 @@
  
  # Dynamic wallpapers directory. The place to store the wallpapers dynamically
  # loaded by the menu depending on context.
-@@ -235,13 +235,13 @@
- # video_shader_enable = false
+@@ -767,10 +767,10 @@
+ # rgui_browser_directory =
  
- # Defines a directory where shaders (Cg, CGP, GLSL) are kept for easy access.
--# video_shader_dir =
-+video_shader_dir = /usr/share/libretro/shaders
+ # 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
  
- # CPU-based video filter. Path to a dynamic library.
- # video_filter =
+ # 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
  
- # Path to a font used for rendering messages. This path must be defined to enable fonts.
- # Do note that the _full_ path of the font is necessary!
-@@ -311,7 +311,7 @@ video_message_bgcolor_opacity = 1.0
- # audio_dsp_plugin =
- 
  # Directory where DSP plugins are kept.
 -# audio_filter_dir =
 +audio_filter_dir = /usr/lib/retroarch/filters/audio
  
- # Will sync (block) on audio. Recommended.
- # audio_sync = true
-@@ -662,7 +662,7 @@ video_message_bgcolor_opacity = 1.0
- # 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
+ # Defines a directory where shaders (Cg, CGP, GLSL) are kept for easy access.
+-# video_shader_dir =
++video_shader_dir = /usr/share/libretro/shaders
  
- # If disabled, the libretro core will keep running in the background when we
- # are in the menu.
+ # Recording output directory. Where recordings are saved.
+ # recording_output_directory =