libre/retroarch: updated to 1.7.0

3 files changed, 125 insertions, 24 deletions

diff --git a/libre/retroarch/PKGBUILD b/libre/retroarch/PKGBUILD
index 33c84cd52..6ee8ea796 100644
--- a/libre/retroarch/PKGBUILD
+++ b/libre/retroarch/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 215716 2017-03-11 19:59:39Z alucryd $
+# $Id$
 # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor (Arch): Themaister <maister@archlinux.us>
 # Contributor (Arch): lifning <definelightning@gmail.com>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
 
 pkgname=retroarch
-pkgver=1.5.0
+pkgver=1.7.0
 pkgrel=2.parabola1
 pkgdesc='Reference frontend for the libretro API, without nonfree software support, libretro-genesis-plus and libretro-snes9x recommendation'
-arch=('i686' 'x86_64' 'armv7h')
+arch=('x86_64' 'i686' 'armv7h')
 url='http://www.libretro.com/'
 license=('GPL')
 groups=('libretro')
@@ -18,28 +18,24 @@ depends=('alsa-lib' 'gcc-libs' 'glibc' 'libdrm' 'libgl' 'libpulse' 'libusb'
          'libass.so' 'libavcodec.so' 'libavformat.so' 'libavutil.so'
          'libfreetype.so' 'libswresample.so' 'libswscale.so' 'libudev.so')
 makedepends=('vulkan-icd-loader')
-optdepends=('libretro-desmume: Nintendo DS core'
-            'libretro-gambatte: Nintendo Game Boy/Game Boy Color core'
-            'libretro-mgba: Nintendo Game Boy Advance core'
-            'libretro-mupen64plus: Nintendo 64 core'
-            'libretro-nestopia: Nintendo Entertainment System core'
-            'libretro-pcsx-rearmed: Sony PlayStation core'
-            'libretro-reicast: Sega Dreamcast core'
-            'libretro-yabause: Sega Saturn core'
-            'libretro-overlays: Collection of overlays'
+optdepends=('libretro-overlays: Collection of overlays'
             'libretro-shaders: Collection of shaders'
+            'python: retroarch-cg2glsl'
             'retroarch-assets-xmb: XMB menu assets'
             'retroarch-autoconfig-udev: udev joypad autoconfig')
 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=('5de6385d4a0031709ef133d04a8573309e1090f0fda2917678be8e1147576de5'
-            '47a7d20d92cd9aa7d845465fd1b056f98f95fd93c4e001158a1e9ffd48dc872c')
+sha256sums=('b32fa4a37ff777e9fe45eeef7ccf2e4e06520dd268584034f687a494dc9f5af1'
+            '8dca43954d05ea1f989932fb26828b6e8325394eec070c4530dd21eab3f02c44'
+            '4877a7eb4b848f05db49e8c4a14a563a353aa42679faac94d891ff6351949aa7')
 
 prepare() {
   cd RetroArch-${pkgver}
 
-  patch -p1 -i ${srcdir}/libre.patch
+  patch -Np0 -i ../retroarch-config.patch
+  patch -Np1 -i ${srcdir}/libre.patch
 }
 
 build() {
@@ -52,6 +48,7 @@ build() {
     --disable-oss \
     --disable-sdl
   make
+  make -C libretro-common/audio/dsp_filters
   make -C gfx/video_filters
 }
 
@@ -60,8 +57,8 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
-  install -dm 755 "${pkgdir}"/usr/lib/retroarch/filters/video
-  install -m 644 gfx/video_filters/*.{filt,so} "${pkgdir}"/usr/lib/retroarch/filters/video/
+  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/libre.patch b/libre/retroarch/libre.patch
index 784cc499f..d462c6666 100644
--- a/libre/retroarch/libre.patch
+++ b/libre/retroarch/libre.patch
@@ -2,12 +2,15 @@ diff --git a/config.def.h b/config.def.h
 index 0866e35bd..6dfb6d2bc 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -924,35 +924,35 @@ static const bool ui_companion_enable = false;
+@@ -635,62 +635,62 @@ static const bool ui_companion_enable = false;
  
  #if defined(ANDROID)
  #if defined(ANDROID_ARM)
 -static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/";
 +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[] = "";
@@ -32,13 +35,29 @@ index 0866e35bd..6dfb6d2bc 100644
 +static char buildbot_server_url[] = "";
  #endif
  #elif defined(_WIN32) && !defined(_XBOX)
+ #if _MSC_VER == 1600
+ #if defined(__x86_64__)
+-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/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-msvc2010/x86/latest/";
++static char 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[] = "";
+ #elif _MSC_VER == 1310
+-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/";
++static char buildbot_server_url[] = "";
+ #else
  #if defined(__x86_64__)
--static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86_64/latest/";
+-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/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/win-x86/latest/";
+-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86/latest/";
 +static char 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/";
@@ -46,10 +65,28 @@ index 0866e35bd..6dfb6d2bc 100644
  #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[] = "";
+ #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[] = "";
+ #else
+ static char 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[] = "";
+ #elif defined(__CELLOS_LV2__) && defined(DEX_BUILD)
+-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/dex-ps3/";
++static char buildbot_server_url[] = "";
+ #elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
+-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/cex-ps3/";
++static char buildbot_server_url[] = "";
+ #elif defined(__CELLOS_LV2__) && defined(ODE_BUILD)
+-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/ode-ps3/";
++static char buildbot_server_url[] = "";
  #else
  static char buildbot_server_url[] = "";
  #endif
-@@ -960,6 +960,6 @@ static char buildbot_server_url[] = "";
+@@ -695,6 +695,6 @@ static char buildbot_server_url[] = "";
  static char buildbot_server_url[] = "";
  #endif
  
@@ -61,7 +98,7 @@ diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darw
 index dfd8b448c..5d12fef83 100644
 --- a/frontend/drivers/platform_darwin.m
 +++ b/frontend/drivers/platform_darwin.m
-@@ -396,7 +396,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
+@@ -413,7 +413,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
  #if TARGET_OS_IPHONE
      char assets_zip_path[PATH_MAX_LENGTH];
      if (major > 8)
@@ -87,7 +124,7 @@ diff --git a/retroarch.cfg b/retroarch.cfg
 index 990783191..91e6f2c11 100644
 --- a/retroarch.cfg
 +++ b/retroarch.cfg
-@@ -718,13 +718,13 @@
+@@ -738,13 +738,13 @@
  #### Core Updater
  
  # URL to core update directory on buildbot.
diff --git a/libre/retroarch/retroarch-config.patch b/libre/retroarch/retroarch-config.patch
new file mode 100644
index 000000000..33b4ecc00
--- /dev/null
+++ b/libre/retroarch/retroarch-config.patch
@@ -0,0 +1,67 @@
+--- 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
+ 
+ # A directory for where to search for libretro core information.
+-# libretro_info_path =
++libretro_info_path = /usr/share/libretro/info
+ 
+ # 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 @@
+ 
+ # 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.
+@@ -235,13 +235,13 @@
+ # video_shader_enable = false
+ 
+ # Defines a directory where shaders (Cg, CGP, GLSL) are kept for easy access.
+-# video_shader_dir =
++video_shader_dir = /usr/share/libretro/shaders
+ 
+ # CPU-based video filter. Path to a dynamic library.
+ # video_filter =
+ 
+ # 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
+@@ -418,7 +418,7 @@ video_message_bgcolor_opacity = 1.0
+ # Input binds which are made explicit (input_playerN_*_btn/axis) will take priority over autoconfigs.
+ # Autoconfigs can be created with retroarch-joyconfig, manually, or with a frontend.
+ # Requires input_autodetect_enable to be enabled.
+-# joypad_autoconfig_dir =
++joypad_autoconfig_dir = /usr/share/retroarch/autoconfig
+ 
+ # Sets which libretro device is used for a user.
+ # Devices are indentified with a number.
+@@ -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
+ 
+ # If disabled, the libretro core will keep running in the background when we
+ # are in the menu.