diff options
-rw-r--r-- | libre/retroarch/PKGBUILD | 25 | ||||
-rw-r--r-- | libre/retroarch/libre.patch | 47 | ||||
-rw-r--r-- | libre/retroarch/retroarch-config.patch | 9 |
3 files changed, 31 insertions, 50 deletions
diff --git a/libre/retroarch/PKGBUILD b/libre/retroarch/PKGBUILD index 6ee8ea796..fe30cef9f 100644 --- a/libre/retroarch/PKGBUILD +++ b/libre/retroarch/PKGBUILD @@ -1,35 +1,36 @@ # $Id$ +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info> # 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> pkgname=retroarch -pkgver=1.7.0 -pkgrel=2.parabola1 +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' 'libusb' - 'libx11' 'libxcb' 'libxext' 'libxinerama' 'libxkbcommon' 'libxv' - 'libxxf86vm' 'mesa' 'openal' 'sdl2' 'wayland' 'zlib' +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') + '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' - 'retroarch-autoconfig-udev: udev joypad autoconfig') + '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=('b32fa4a37ff777e9fe45eeef7ccf2e4e06520dd268584034f687a494dc9f5af1' - '8dca43954d05ea1f989932fb26828b6e8325394eec070c4530dd21eab3f02c44' - '4877a7eb4b848f05db49e8c4a14a563a353aa42679faac94d891ff6351949aa7') +sha256sums=('a60c2244609bb87cdb56dd8e1020c3be757569b5246141328804ebc5574327ea' + '14f07b31d6bdb049dad62dd12597c292b8d2df5cb2803d15de00a7597d3081fd' + 'e8aa0c7a890c2e24012ecff4b7326bcf89214493ebf3138129aa7340585f3c62') prepare() { cd RetroArch-${pkgver} diff --git a/libre/retroarch/libre.patch b/libre/retroarch/libre.patch index d462c6666..220e60b16 100644 --- a/libre/retroarch/libre.patch +++ b/libre/retroarch/libre.patch @@ -1,8 +1,6 @@ -diff --git a/config.def.h b/config.def.h -index 0866e35bd..6dfb6d2bc 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -635,62 +635,62 @@ static const bool ui_companion_enable = false; +--- 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 @@ #if defined(ANDROID) #if defined(ANDROID_ARM) @@ -36,7 +34,7 @@ index 0866e35bd..6dfb6d2bc 100644 #endif #elif defined(_WIN32) && !defined(_XBOX) #if _MSC_VER == 1600 - #if defined(__x86_64__) + #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[] = ""; #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) @@ -50,7 +48,7 @@ index 0866e35bd..6dfb6d2bc 100644 -static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/"; +static char buildbot_server_url[] = ""; #else - #if defined(__x86_64__) + #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[] = ""; #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) @@ -75,30 +73,25 @@ index 0866e35bd..6dfb6d2bc 100644 -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[] = "http://libretro.xbins.org/libretro/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[] = "http://libretro.xbins.org/libretro/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[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/"; +static char buildbot_server_url[] = ""; #else static char buildbot_server_url[] = ""; #endif -@@ -695,6 +695,6 @@ static char buildbot_server_url[] = ""; - static char buildbot_server_url[] = ""; - #endif -static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/"; +static char buildbot_assets_server_url[] = ""; #endif -diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m -index dfd8b448c..5d12fef83 100644 ---- a/frontend/drivers/platform_darwin.m -+++ b/frontend/drivers/platform_darwin.m -@@ -413,7 +413,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[], +--- 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 char assets_zip_path[PATH_MAX_LENGTH]; if (major > 8) @@ -107,24 +100,20 @@ index dfd8b448c..5d12fef83 100644 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 92d1cdec0..aa4f53d7c 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) +--- 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 @@ if (!network_init()) return -1; -- http1 = net_http_new("http://buildbot.libretro.com/nightly/win-x86/latest/mednafen_psx_libretro.dll.zip"); +- 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 990783191..91e6f2c11 100644 ---- a/retroarch.cfg -+++ b/retroarch.cfg -@@ -738,13 +738,13 @@ +--- 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 @@ #### Core Updater # URL to core update directory on buildbot. diff --git a/libre/retroarch/retroarch-config.patch b/libre/retroarch/retroarch-config.patch index 33b4ecc00..4ef1f381b 100644 --- a/libre/retroarch/retroarch-config.patch +++ b/libre/retroarch/retroarch-config.patch @@ -47,15 +47,6 @@ # 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 |