diff --git a/games-emulation/retroarch/patches/retroarch-1.7.4.patchset b/games-emulation/retroarch/patches/retroarch-1.7.4.patchset deleted file mode 100644 index 3eeb1d713..000000000 --- a/games-emulation/retroarch/patches/retroarch-1.7.4.patchset +++ /dev/null @@ -1,48 +0,0 @@ -From a8b885b119c3824f4ca71e1b5cfa8869436705db Mon Sep 17 00:00:00 2001 -From: Benjamin FRANCOIS -Date: Sat, 1 Sep 2018 07:29:49 +0000 -Subject: Added simple define to allow build on Haiku - - -diff --git a/deps/mbedtls/entropy_poll.c b/deps/mbedtls/entropy_poll.c -index a116e60..4a913aa 100644 ---- a/deps/mbedtls/entropy_poll.c -+++ b/deps/mbedtls/entropy_poll.c -@@ -44,7 +44,7 @@ - #if !defined(MBEDTLS_NO_PLATFORM_ENTROPY) - - #if !defined(unix) && !defined(__unix__) && !defined(__unix) && \ -- !defined(__APPLE__) && !defined(_WIN32) -+ !defined(__APPLE__) && !defined(_WIN32) & !defined(__HAIKU__) - #error "Platform entropy sources only work on Unix and Windows, see MBEDTLS_NO_PLATFORM_ENTROPY in config.h" - #endif - -diff --git a/deps/mbedtls/net_sockets.c b/deps/mbedtls/net_sockets.c -index 7877e94..5fdce10 100644 ---- a/deps/mbedtls/net_sockets.c -+++ b/deps/mbedtls/net_sockets.c -@@ -32,7 +32,7 @@ - #if defined(MBEDTLS_NET_C) - - #if !defined(unix) && !defined(__unix__) && !defined(__unix) && \ -- !defined(__APPLE__) && !defined(_WIN32) -+ !defined(__APPLE__) && !defined(_WIN32) & !defined(__HAIKU__) - #error "This module only works on Unix and Windows, see MBEDTLS_NET_C in config.h" - #endif - -diff --git a/deps/mbedtls/timing.c b/deps/mbedtls/timing.c -index a7c7ff0..f620d09 100644 ---- a/deps/mbedtls/timing.c -+++ b/deps/mbedtls/timing.c -@@ -39,7 +39,7 @@ - #if !defined(MBEDTLS_TIMING_ALT) - - #if !defined(unix) && !defined(__unix__) && !defined(__unix) && \ -- !defined(__APPLE__) && !defined(_WIN32) -+ !defined(__APPLE__) && !defined(_WIN32) && !defined(__HAIKU__) - #error "This module only works on Unix and Windows, see MBEDTLS_TIMING_C in config.h" - #endif - --- -2.16.4 - diff --git a/games-emulation/retroarch/retroarch-1.7.4.recipe b/games-emulation/retroarch/retroarch-1.7.5.recipe similarity index 91% rename from games-emulation/retroarch/retroarch-1.7.4.recipe rename to games-emulation/retroarch/retroarch-1.7.5.recipe index 91210c508..5d8a598b6 100644 --- a/games-emulation/retroarch/retroarch-1.7.4.recipe +++ b/games-emulation/retroarch/retroarch-1.7.5.recipe @@ -8,13 +8,14 @@ COPYRIGHT="2010-2018 The RetroArch Team" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/libretro/RetroArch/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="1c095076e2a9d2ec4e501176b3963ea2a831c1e5f025bb25386491272f14de40" +CHECKSUM_SHA256="89dae3646e4979b8685cae987eaa09816ac94bfb10d2636a2e7a8eede5fcbfa3" SOURCE_FILENAME="retroarch-$portVersion.tar.gz" SOURCE_DIR="RetroArch-$portVersion" -PATCHES="retroarch-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" +if [ "$targetArchitecture" = x86_gcc2 ]; then SECONDARY_ARCHITECTURES="x86" +fi GLOBAL_WRITABLE_FILES=" $relativeSettingsDir/retroarch.cfg auto-merge @@ -26,9 +27,8 @@ USER_SETTINGS_FILES=" PROVIDES=" retroarch$secondaryArchSuffix = $portVersion - app:retroarch$secondaryArchSuffix = $portVersion - cmd:retroarch$secondaryArchSuffix = $portVersion - cmd:retroarch_cg2glsl$secondaryArchSuffix = $portVersion + app:retroarch = $portVersion + app:retroarch_cg2glsl = $portVersion " REQUIRES=" haiku$secondaryArchSuffix