diff options
Diffstat (limited to 'libre/retroarch')
| -rw-r--r-- | libre/retroarch/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/retroarch/libre.patch | 180 |
2 files changed, 25 insertions, 168 deletions
diff --git a/libre/retroarch/PKGBUILD b/libre/retroarch/PKGBUILD index bd1f86a90..697f7b341 100644 --- a/libre/retroarch/PKGBUILD +++ b/libre/retroarch/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183310 2016-07-19 19:43:45Z alucryd $ +# $Id: PKGBUILD 209903 2017-02-04 18:15:22Z alucryd $ # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org> # Contributor (Arch): Themaister <maister@archlinux.us> # Contributor (Arch): lifning <definelightning@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=retroarch -pkgver=1.3.6 +pkgver=1.4.1 pkgrel=1.parabola1 pkgdesc='Reference frontend for the libretro API, without nonfree software support, libretro-genesis-plus and libretro-snes9x recommendation' arch=('i686' 'x86_64' 'armv7h') @@ -38,7 +38,7 @@ source=("git+https://github.com/libretro/RetroArch.git#tag=v${pkgver}" sha256sums=('SKIP' 'SKIP' 'SKIP' - '1df45fe1e42b2494c0906856d08648325c4e854252b87ad975e8fa33504b8949') + '47a7d20d92cd9aa7d845465fd1b056f98f95fd93c4e001158a1e9ffd48dc872c') prepare() { cd RetroArch @@ -58,10 +58,10 @@ build() { --prefix='/usr' \ --disable-cg \ --disable-jack \ - --disable-oss + --disable-oss \ + --disable-sdl make make -C gfx/video_filters - make -C audio/audio_filters } package() { @@ -69,9 +69,8 @@ package() { make DESTDIR="${pkgdir}" install - install -dm 755 "${pkgdir}"/usr/lib/retroarch/filters/{audio,video} + install -dm 755 "${pkgdir}"/usr/lib/retroarch/filters/video install -m 644 gfx/video_filters/*.{filt,so} "${pkgdir}"/usr/lib/retroarch/filters/video/ - install -m 644 audio/audio_filters/*.{dsp,so} "${pkgdir}"/usr/lib/retroarch/filters/audio/ } # vim: ts=2 sw=2 et: diff --git a/libre/retroarch/libre.patch b/libre/retroarch/libre.patch index 244e3c58f..784cc499f 100644 --- a/libre/retroarch/libre.patch +++ b/libre/retroarch/libre.patch @@ -1,23 +1,8 @@ -diff --git a/README.md b/README.md -index d35f008..4f7b6c9 100644 ---- a/README.md -+++ b/README.md -@@ -16,10 +16,6 @@ interface to include support for emulators and/or game engines. libretro is comp - - [libretro API header](https://github.com/libretro/RetroArch/blob/master/libretro.h) - --## Binaries -- --Latest Windows binaries are currently hosted on the buildbot -(http://buildbot.libretro.com/). -- - ## Support - - To reach developers, either make an issue here on Github, make a thread on the [forum](http://www.libretro.com/forums/), diff --git a/config.def.h b/config.def.h -index 673b15a..ed102bf 100644 +index 0866e35bd..6dfb6d2bc 100644 --- a/config.def.h +++ b/config.def.h -@@ -792,33 +792,33 @@ static const bool ui_companion_enable = false; +@@ -924,35 +924,35 @@ static const bool ui_companion_enable = false; #if defined(ANDROID) #if defined(ANDROID_ARM) @@ -29,6 +14,9 @@ index 673b15a..ed102bf 100644 #else static char buildbot_server_url[] = ""; #endif + #elif defined(__QNX__) +-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/blackberry/latest/"; ++static char buildbot_server_url[] = ""; #elif defined(IOS) -static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/ios/latest/"; +static char buildbot_server_url[] = ""; @@ -47,7 +35,7 @@ index 673b15a..ed102bf 100644 #if defined(__x86_64__) -static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86_64/latest/"; +static char buildbot_server_url[] = ""; - #elif defined(__i386__) || defined(__i486__) || defined(__i686__) + #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[] = ""; #endif @@ -61,161 +49,31 @@ index 673b15a..ed102bf 100644 #else static char buildbot_server_url[] = ""; #endif -@@ -826,7 +826,7 @@ static char buildbot_server_url[] = ""; +@@ -960,6 +960,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[] = ""; - #ifndef IS_SALAMANDER - #include "intl/intl.h" -diff --git a/ctr/Makefile.cores b/ctr/Makefile.cores -index 1888027..c2f4f01 100644 ---- a/ctr/Makefile.cores -+++ b/ctr/Makefile.cores -@@ -30,19 +30,6 @@ else ifeq ($(LIBRETRO), nxengine) - APP_UNIQUE_ID = 0xBAC05 - APP_ICON = ctr/assets/nxengine.png - --else ifeq ($(LIBRETRO), genesis_plus_gx) -- APP_TITLE = Genesis Plus GX Libretro -- APP_PRODUCT_CODE = RARCH-GENPLUSGX -- APP_UNIQUE_ID = 0xBAC06 -- APP_ICON = ctr/assets/genesis_plus_gx.png -- --else ifeq ($(LIBRETRO), catsfc) -- APP_TITLE = CATSFC Libretro -- APP_PRODUCT_CODE = RARCH-CATSFC -- APP_UNIQUE_ID = 0xBAC07 -- APP_ICON = ctr/assets/catsfc.png -- APP_BANNER = ctr/assets/catsfc_banner.png -- - else ifeq ($(LIBRETRO), mednafen_wswan) - APP_TITLE = Mednafen wswan Libretro - APP_PRODUCT_CODE = RARCH-M-WSWAN -@@ -67,20 +54,6 @@ else ifeq ($(LIBRETRO), 2048) - APP_UNIQUE_ID = 0xBAC0B - APP_ICON = ctr/assets/2048.png - --else ifeq ($(LIBRETRO), picodrive) -- APP_TITLE = Picodrive Libretro -- APP_PRODUCT_CODE = RARCH-PICODRIVE -- APP_UNIQUE_ID = 0xBAC0C -- APP_ICON = ctr/assets/picodrive.png -- APP_BANNER = ctr/assets/picodrive_banner.png -- APP_USE_SVCHAX = 1 -- --else ifeq ($(LIBRETRO), snes9x_next) -- APP_TITLE = Snes9x Next Libretro -- APP_PRODUCT_CODE = RARCH-SNES9XNEXT -- APP_UNIQUE_ID = 0xBAC0D -- APP_ICON = ctr/assets/snes9x_next.png -- - else ifeq ($(LIBRETRO), mgba) - APP_TITLE = mGBA Libretro - APP_AUTHOR = Jeffrey Pfau -@@ -95,35 +68,6 @@ else ifeq ($(LIBRETRO), quicknes) - APP_UNIQUE_ID = 0xBAC0F - APP_ICON = ctr/assets/quicknes.png - --else ifeq ($(LIBRETRO), fb_alpha_neo) -- APP_TITLE = Neo Geo (FB Alpha) -- APP_AUTHOR = Team FB Alpha -- APP_PRODUCT_CODE = RARCH-FBANEOGEO -- APP_UNIQUE_ID = 0xBAC10 -- APP_ICON = ctr/assets/fb_alpha_neo.png -- APP_SYSTEM_MODE = 80MB -- --else ifeq ($(LIBRETRO), fb_alpha_cps1) -- APP_TITLE = Final Burn Alpha - CPS-1 -- APP_AUTHOR = Team FB Alpha -- APP_PRODUCT_CODE = RARCH-FBACPS1 -- APP_UNIQUE_ID = 0xBAC11 -- APP_ICON = ctr/assets/fb_alpha_cps1.png -- --else ifeq ($(LIBRETRO), fb_alpha_cps2) -- APP_TITLE = Final Burn Alpha - CPS-2 -- APP_AUTHOR = Team FB Alpha -- APP_PRODUCT_CODE = RARCH-FBACPS2 -- APP_UNIQUE_ID = 0xBAC12 -- APP_ICON = ctr/assets/fb_alpha_cps2.png -- APP_SYSTEM_MODE = 80MB -- --else ifeq ($(LIBRETRO), catsfc_plus) -- APP_TITLE = CATSFC Plus Libretro -- APP_PRODUCT_CODE = RARCH-CATSFCPLUS -- APP_UNIQUE_ID = 0xBAC13 -- APP_ICON = ctr/assets/catsfc_plus.png -- - else ifeq ($(LIBRETRO), mednafen_pce_fast) - APP_TITLE = Mednafen/Beetle PCE FAST - APP_AUTHOR = Ryphecha -@@ -139,47 +83,4 @@ else ifeq ($(LIBRETRO), pcsx_rearmed) - APP_ICON = ctr/assets/pcsx_rearmed.png - APP_USE_SVCHAX = 1 - --else ifeq ($(LIBRETRO), fmsx) -- APP_TITLE = fMSX -- APP_AUTHOR = Marat Fayzullin -- APP_PRODUCT_CODE = RARCH-FMSX -- APP_UNIQUE_ID = 0xBAC16 -- APP_ICON = ctr/assets/fmsx.png -- --else ifeq ($(LIBRETRO), fb_alpha) -- APP_TITLE = Final Burn Alpha -- APP_AUTHOR = Team FB Alpha -- APP_PRODUCT_CODE = RARCH-FBA -- APP_UNIQUE_ID = 0xBAC17 -- APP_BIG_TEXT_SECTION = 1 -- --else ifeq ($(LIBRETRO), mame2003) -- APP_TITLE = MAME-2003 -- APP_PRODUCT_CODE = RARCH-MAME2003 -- APP_UNIQUE_ID = 0xBAC18 -- APP_ICON = ctr/assets/mame.png -- APP_BIG_TEXT_SECTION = 1 -- --else ifeq ($(LIBRETRO), mame2000) -- APP_TITLE = MAME-2000 -- APP_PRODUCT_CODE = RARCH-MAME2000 -- APP_UNIQUE_ID = 0xBAC19 -- APP_ICON = ctr/assets/mame.png -- APP_BIG_TEXT_SECTION = 1 -- --else ifeq ($(LIBRETRO), pocketsnes) -- APP_TITLE = Pocket Snes -- APP_AUTHOR = various -- APP_PRODUCT_CODE = RARCH-POCKETSNES -- APP_UNIQUE_ID = 0xBAC1A -- APP_ICON = ctr/assets/pocketsnes.png -- APP_BANNER = ctr/assets/pocketsnes_banner.png -- --else ifeq ($(LIBRETRO), dosbox) -- APP_TITLE = DosBox -- APP_AUTHOR = various -- APP_PRODUCT_CODE = RARCH-DOSBOX -- APP_UNIQUE_ID = 0xBAC1B -- APP_ICON = ctr/assets/dosbox.png -- - endif + #endif diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m -index d38fc6f..509f170 100644 +index dfd8b448c..5d12fef83 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m -@@ -410,7 +410,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[], - - get_ios_version(&major, &minor); +@@ -396,7 +396,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) - 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)); fill_pathname_join(assets_zip_path, bundle_path_buf, "assets.zip", sizeof(assets_zip_path)); -diff --git a/libretro-common/net/test/net_http_test.c b/libretro-common/net/test/net_http_test.c -index e6940a5..0bdb771 100644 ---- a/libretro-common/net/test/net_http_test.c -+++ b/libretro-common/net/test/net_http_test.c +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) if (!network_init()) return -1; @@ -226,10 +84,10 @@ index e6940a5..0bdb771 100644 while (!net_http_update(http1, &pos, &tot)) printf("%.9lu / %.9lu \r",pos,tot); diff --git a/retroarch.cfg b/retroarch.cfg -index eed7864..20d6735 100644 +index 990783191..91e6f2c11 100644 --- a/retroarch.cfg +++ b/retroarch.cfg -@@ -683,13 +683,13 @@ +@@ -718,13 +718,13 @@ #### Core Updater # URL to core update directory on buildbot. @@ -240,7 +98,7 @@ index eed7864..20d6735 100644 -# core_updater_buildbot_assets_url = "http://buildbot.libretro.com/assets/" +core_updater_buildbot_assets_url = "" - # Automatically extract archives that the cores are contained in to the libretro cores directory. + # After downloading, automatically extract archives that the downloads are contained inside. -# core_updater_auto_extract_archive = true +core_updater_auto_extract_archive = false |