From 202ec1b29e33416be219ca7a3144c9baf3040dff Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 16 Sep 2019 23:13:13 +1000 Subject: [PATCH] PPSSPP: fix build for secondary arch --- .../ppsspp/patches/ppsspp-1.8.0.patchset | 36 ++++++++++++++++--- games-emulation/ppsspp/ppsspp-1.8.0.recipe | 2 +- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/games-emulation/ppsspp/patches/ppsspp-1.8.0.patchset b/games-emulation/ppsspp/patches/ppsspp-1.8.0.patchset index 8c450727a..85497a82a 100644 --- a/games-emulation/ppsspp/patches/ppsspp-1.8.0.patchset +++ b/games-emulation/ppsspp/patches/ppsspp-1.8.0.patchset @@ -1,4 +1,4 @@ -From a816dbba1b7a1f74a1f8be1b815ec896359bb0f1 Mon Sep 17 00:00:00 2001 +From 5b7f4ce24787a92dfdd222505d8d678878794b1a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 4 Apr 2019 19:44:46 +1000 Subject: Fixes for Haiku @@ -196,7 +196,7 @@ index b259a6f..601ac45 100644 2.23.0 -From 76cfba09f1e6c34b7bb10949c8db22b8bcfc0502 Mon Sep 17 00:00:00 2001 +From 57b7dbc1602a8a615e19146e4486efc72a642c1e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 5 Sep 2019 22:00:26 +1000 Subject: Fix for endian @@ -219,7 +219,7 @@ index 3a5d8ac..f68142f 100644 2.23.0 -From 96c24d549b9d8caa90f6e18d96484ee5ae6993fd Mon Sep 17 00:00:00 2001 +From c7242d75b966ecdb7d918c601d50caa8e6637ed9 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 5 Sep 2019 22:00:41 +1000 Subject: Fix for ffmpeg 4.2 @@ -249,7 +249,7 @@ index a8c482d..a1b76e1 100644 2.23.0 -From 8205838ddc6c9de037406c2f45f5b7f91e59628f Mon Sep 17 00:00:00 2001 +From 275a5e462da4df6a48da133f704d3d8ee5255adb Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 5 Sep 2019 22:48:49 +1000 Subject: Resolve symlink @@ -290,3 +290,31 @@ index dd17922..19b8d51 100644 -- 2.23.0 + +From c8f32373f5cba6d2da7726fbbdbe39c7fadd4060 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 16 Sep 2019 22:48:18 +1000 +Subject: Use SupportDefs.h + + +diff --git a/ext/native/ext/cityhash/city.h b/ext/native/ext/cityhash/city.h +index 94499ce..e5249cc 100644 +--- a/ext/native/ext/cityhash/city.h ++++ b/ext/native/ext/cityhash/city.h +@@ -66,9 +66,13 @@ + #include + #include + ++#ifdef __HAIKU__ ++#include ++#else + typedef uint8_t uint8; + typedef uint32_t uint32; + typedef uint64_t uint64; ++#endif + typedef std::pair uint128; + + inline uint64 Uint128Low64(const uint128& x) { return x.first; } +-- +2.23.0 + diff --git a/games-emulation/ppsspp/ppsspp-1.8.0.recipe b/games-emulation/ppsspp/ppsspp-1.8.0.recipe index 0f9fb4a61..ebb318e61 100644 --- a/games-emulation/ppsspp/ppsspp-1.8.0.recipe +++ b/games-emulation/ppsspp/ppsspp-1.8.0.recipe @@ -5,7 +5,7 @@ Android or PC device." HOMEPAGE="https://www.ppsspp.org/" COPYRIGHT="2012-2019 PPSSPP Project" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/hrydgard/ppsspp/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="a7011feb0480a352d60e6a3c939d88d4d2e3a2e76620886b183aa2cb36f910de" SOURCE_FILENAME="ppsspp-$portVersion.tar.gz"