diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-25 10:02:57 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-25 16:05:49 -0400 |
commit | 49e30c7f54a9de3da54e4e588f2336abf32a3ddb (patch) | |
tree | 532c11644e1d51382976893a50112af29c6cd17d | |
parent | 68c6d6e664217aad892e0f754b9007290afceaeb (diff) |
[retroarch]: upgrade to v1.10.3
-rw-r--r-- | libre/retroarch/PKGBUILD | 39 | ||||
-rw-r--r-- | libre/retroarch/disable-auto-update.patch | 176 |
2 files changed, 186 insertions, 29 deletions
diff --git a/libre/retroarch/PKGBUILD b/libre/retroarch/PKGBUILD index 954cc32a5..a3e6bf840 100644 --- a/libre/retroarch/PKGBUILD +++ b/libre/retroarch/PKGBUILD @@ -12,42 +12,40 @@ pkgname=retroarch -pkgver=1.9.6 +pkgver=1.10.3 pkgrel=2 -pkgrel+=.parabola2 +pkgrel+=.parabola1 pkgdesc='Reference frontend for the libretro API' arch=(x86_64) -arch+=(i686 armv7h) +arch+=(armv7h i686) url=http://www.libretro.com/ license=(GPL) groups=(libretro) depends=( alsa-lib + ffmpeg flac libass.so - libavcodec.so - libavformat.so - libavutil.so libdrm libfreetype.so libgl libpulse - libswresample.so - libswscale.so libudev.so libusb-1.0.so mbedtls mesa - miniupnpc openal qt5-base sdl2 + spirv-tools v4l-utils zlib ) depends+=(libmbedcrypto.so) makedepends=( + gamemode git + libdecor libx11 libxcb libxext @@ -61,6 +59,8 @@ makedepends=( wayland-protocols ) optdepends=( + 'gamemode: GameMode support' + 'libdecor: Wayland decorations' 'libretro-overlays: Collection of overlays' 'libretro-shaders: Collection of shaders' 'libxinerama: X11 support' @@ -71,45 +71,36 @@ optdepends=( 'wayland: Wayland support' ) backup=(etc/retroarch.cfg) -_tag=4a6dc36b1cc026bf337537e2d7527a117727bb91 +_commit=9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 # tag v1.10.3 source=( - git+https://github.com/libretro/RetroArch.git#tag=${_tag} + git+https://github.com/libretro/RetroArch.git#commit=${_commit} retroarch-config.patch disable-auto-update.patch ) -sha256sums=( - SKIP - 7857cff30c45721b66666828ca9edbb2923817c6c64591be3f58fe019277103e - cb3915a5ada76e29abd2a8b2c06c8dc50909473b5c53ec112dffab87fcc585e1 -) +b2sums=('SKIP' + '5ecbe57126c7f9b66bdf189f0af2f1cec031cb68ea85bb9609847ba9beb0e720c902cd3330d7c286901a73e6c2e272c3f04166cf9a47bb6f80097f19dde8ce3a' + '40fb95bd303cd59731d2dfd68da40032affa4bdcd07c7a5831109141e2768e18571231589375c8d97397eefebe5bf1c086dc255be8179906226c6e6c995a4f84') pkgver() { cd RetroArch - git describe --tags | sed 's/^v//' } prepare() { cd RetroArch - patch -Np1 -i ../retroarch-config.patch - git cherry-pick -n 685948368e6b28b97e1b91bdfe5921519359a033 # FS#66843 echo "applying disable-auto-update.patch" - sed -i 's|\(#define DEFAULT_BUILDBOT_SERVER_URL\) ".*|\1 ""|' config.def.h - sed -i 's|\(#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL\) ".*|\1 ""|' config.def.h patch -Np1 -i ${srcdir}/disable-auto-update.patch } build() { cd RetroArch - ./configure \ --prefix=/usr \ --disable-builtinflac \ --disable-builtinmbedtls \ - --disable-builtinminiupnpc \ --disable-builtinzlib \ --disable-cg \ --disable-jack \ @@ -123,9 +114,7 @@ build() { package() { cd RetroArch - make DESTDIR="${pkgdir}" install - 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/ } diff --git a/libre/retroarch/disable-auto-update.patch b/libre/retroarch/disable-auto-update.patch index 82938faaf..b8832d274 100644 --- a/libre/retroarch/disable-auto-update.patch +++ b/libre/retroarch/disable-auto-update.patch @@ -1,8 +1,150 @@ +diff --git a/config.def.h b/config.def.h +index 49a2eacb94..5c502741cb 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -672,7 +672,7 @@ static const bool menu_show_shutdown = true; + #if defined(HAVE_LAKKA) || defined(VITA) + static const bool menu_show_core_updater = false; + #else +-static const bool menu_show_core_updater = true; ++static const bool menu_show_core_updater = false; + #endif + #ifdef HAVE_MIST + static const bool menu_show_core_manager_steam = true; +@@ -1561,96 +1561,96 @@ static const bool enable_device_vibration = false; + #endif + + #if defined(HAKCHI) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID) + #if defined(ANDROID_ARM_V7) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID_ARM) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID_AARCH64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID_X86) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID_X64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86_64/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #else + #define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #elif defined(__QNX__) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/blackberry/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(IOS) +-#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__) +-#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__) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://bot.libretro.com/nightly/apple/osx/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__aarch64__) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/arm64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #else +-#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) +-#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) +-#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) +-#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) +-#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) +-#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) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #elif _MSC_VER == 1400 +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif _MSC_VER == 1310 +-#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) +-#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) +-#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__) +-#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__) +-#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) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/armhf/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #else + #define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #elif defined(WIIU) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(HAVE_LIBNX) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(_3DS) + #define DEFAULT_BUILDBOT_SERVER_URL envIsHomebrew() ? "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/3dsx/" : "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/cia/" + #else + #define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + +-#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL "http://buildbot.libretro.com/assets/" ++#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL "" + + #define DEFAULT_DISCORD_APP_ID "475456035851599874" + diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m -index a5b01fb67e..6a66752926 100644 +index 6c5fdca400..6b0dcb3947 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m -@@ -475,7 +475,7 @@ static void frontend_darwin_get_env(int *argc, char *argv[], +@@ -460,7 +460,7 @@ static void frontend_darwin_get_env(int *argc, char *argv[], int major, minor; get_ios_version(&major, &minor); if (major > 8) @@ -24,11 +166,37 @@ index 48e0354aa6..6dc8fc9702 100644 while (!net_http_update(http1, &pos, &tot)) printf("%.9lu / %.9lu \r",pos,tot); +diff --git a/qb/config.params.sh b/qb/config.params.sh +index f457ae4263..e5c4e03c25 100644 +--- a/qb/config.params.sh ++++ b/qb/config.params.sh +@@ -139,9 +139,9 @@ HAVE_7ZIP=yes # Compile in 7z support + HAVE_FLAC=auto # Compile in flac support + HAVE_DR_MP3=yes # Compile in Dr. MP3 support + HAVE_BUILTINFLAC=auto # Bake in flac support +-HAVE_ONLINE_UPDATER=yes # Disable the online updater +-HAVE_UPDATE_CORES=yes # Disable downloading cores with online updater +-HAVE_UPDATE_ASSETS=yes # Disable downloading assets with online updater ++HAVE_ONLINE_UPDATER=no # Disable the online updater ++HAVE_UPDATE_CORES=no # Disable downloading cores with online updater ++HAVE_UPDATE_ASSETS=no # Disable downloading assets with online updater + HAVE_PRESERVE_DYLIB=no # Enable dlclose() for Valgrind support + HAVE_PARPORT=auto # Parallel port joypad support + HAVE_IMAGEVIEWER=yes # Built-in image viewer support. diff --git a/retroarch.cfg b/retroarch.cfg -index 21d91ab1ef..fa99900f4d 100644 +index 416c6c1abb..d574d637f6 100644 --- a/retroarch.cfg +++ b/retroarch.cfg -@@ -729,13 +729,13 @@ menu_show_core_updater = false +@@ -687,7 +687,7 @@ + #### Menu + + # If disabled, will hide 'Online Updater' inside the menu. +-# menu_show_online_updater = true ++menu_show_online_updater = false + + # If disabled, will hide the ability to update cores (and core info files) inside the menu. + menu_show_core_updater = false +@@ -769,13 +769,13 @@ menu_show_core_updater = false #### Core Updater # URL to core update directory on buildbot. |