diff --git a/games-emulation/ppsspp/patches/ppsspp-1.11.2.patchset b/games-emulation/ppsspp/patches/ppsspp-1.11.2.patchset index a21221d6d..ca58c16c7 100644 --- a/games-emulation/ppsspp/patches/ppsspp-1.11.2.patchset +++ b/games-emulation/ppsspp/patches/ppsspp-1.11.2.patchset @@ -1,4 +1,4 @@ -From 046b349aca3f40dca346a7aae5a09c1752448ac0 Mon Sep 17 00:00:00 2001 +From 10bc7bc9486a5bfb3e1d4fd004b01d3dda5f3dec Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 28 Feb 2021 20:30:33 +1000 Subject: Fixes for Haiku @@ -311,7 +311,7 @@ index 16b4adb..92c723d 100644 2.30.0 -From 6a00c49d19d6bef87e6a201528a37bb1cba6ac0f Mon Sep 17 00:00:00 2001 +From 0fb58396e5cd386a8fbe44b542db4b387b8c865c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 28 Feb 2021 21:05:19 +1000 Subject: Disable mlock for haiku @@ -333,3 +333,50 @@ index 4353641..d611078 100644 -- 2.30.0 + +From eb656603be77ac73511673b899c320529afbaae4 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 28 Feb 2021 19:23:53 +0000 +Subject: Fix 32bit build + + +diff --git a/cmake/Modules/FindFFmpeg.cmake b/cmake/Modules/FindFFmpeg.cmake +index 03bcac6..cf5bd49 100644 +--- a/cmake/Modules/FindFFmpeg.cmake ++++ b/cmake/Modules/FindFFmpeg.cmake +@@ -66,7 +66,7 @@ function(find_ffmpeg LIBNAME) + ${FFMPEG_DIR}/include/lib${LIBNAME} + ${FFMPEG_DIR}/include/ffmpeg + ${FFMPEG_DIR}/include +- ${FFMPEG_DIR}/headers/x86 ++ ${FFMPEG_DIR}/headers/x86/${LIBNAME} + ${FFMPEG_DIR}/headers + NO_DEFAULT_PATH + NO_CMAKE_FIND_ROOT_PATH +@@ -75,6 +75,7 @@ function(find_ffmpeg LIBNAME) + ${FFMPEG_DIR} + ${FFMPEG_DIR}/lib + ${FFMPEG_DIR}/lib${LIBNAME} ++ ${FFMPEG_DIR}/lib/x86/${LIBNAME} + NO_DEFAULT_PATH + NO_CMAKE_FIND_ROOT_PATH + ) +diff --git a/ext/cityhash/city.h b/ext/cityhash/city.h +index 94499ce..1b80a5e 100644 +--- a/ext/cityhash/city.h ++++ b/ext/cityhash/city.h +@@ -67,7 +67,11 @@ + #include + + typedef uint8_t uint8; ++#if defined(__HAIKU__) ++#include ++#else + typedef uint32_t uint32; ++#endif // Haiku + typedef uint64_t uint64; + typedef std::pair uint128; + +-- +2.30.0 + diff --git a/games-emulation/ppsspp/ppsspp-1.11.2.recipe b/games-emulation/ppsspp/ppsspp-1.11.2.recipe index 09dd3a604..1fc2b0796 100644 --- a/games-emulation/ppsspp/ppsspp-1.11.2.recipe +++ b/games-emulation/ppsspp/ppsspp-1.11.2.recipe @@ -5,7 +5,7 @@ Android or PC device." HOMEPAGE="https://www.ppsspp.org/" COPYRIGHT="2012-2021 PPSSPP Project" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/hrydgard/ppsspp/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="0b70e4ae8000b0f8b2ef5e6110d406f6d2cbf8e597c1f594a643b10ce940ee6c" SOURCE_FILENAME="ppsspp-$portVersion.tar.gz" @@ -101,7 +101,6 @@ BUILD() -DUSE_SYSTEM_LIBZIP=ON \ -DUSE_MINIUPNPC=ON \ -DUSE_DISCORD=OFF \ - -DFFMPEG_DIR=/system/develop \ -DCMAKE_C_FLAGS="-D_BSD_SOURCE" \ -DCMAKE_CXX_FLAGS="-D_BSD_SOURCE" make $jobArgs