From 2593d3f2efd6b755ac1db6159053629657fbc332 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 11 Nov 2021 18:32:00 +1000 Subject: [PATCH] PPSSPP: bump version --- ...1.11.3.patchset => ppsspp-1.12.3.patchset} | 212 +++++++++--------- ...spp-1.11.3.recipe => ppsspp-1.12.3.recipe} | 17 +- 2 files changed, 118 insertions(+), 111 deletions(-) rename games-emulation/ppsspp/patches/{ppsspp-1.11.3.patchset => ppsspp-1.12.3.patchset} (73%) rename games-emulation/ppsspp/{ppsspp-1.11.3.recipe => ppsspp-1.12.3.recipe} (86%) diff --git a/games-emulation/ppsspp/patches/ppsspp-1.11.3.patchset b/games-emulation/ppsspp/patches/ppsspp-1.12.3.patchset similarity index 73% rename from games-emulation/ppsspp/patches/ppsspp-1.11.3.patchset rename to games-emulation/ppsspp/patches/ppsspp-1.12.3.patchset index ca58c16c7..f18bbf746 100644 --- a/games-emulation/ppsspp/patches/ppsspp-1.11.3.patchset +++ b/games-emulation/ppsspp/patches/ppsspp-1.12.3.patchset @@ -1,14 +1,14 @@ -From 10bc7bc9486a5bfb3e1d4fd004b01d3dda5f3dec Mon Sep 17 00:00:00 2001 +From fef734ec818cbeeb06db8d0b8581bd958230de68 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 28 Feb 2021 20:30:33 +1000 +Date: Thu, 11 Nov 2021 18:31:01 +1000 Subject: Fixes for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index f71e066..aae4a10 100644 +index 169aafa..12b91f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -86,7 +86,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android") +@@ -97,7 +97,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android") endif() # We only support Vulkan on Unix, macOS (by MoltenVK), Android and Windows. @@ -17,7 +17,7 @@ index f71e066..aae4a10 100644 set(VULKAN ON) endif() -@@ -137,7 +137,7 @@ option(USE_SYSTEM_LIBZIP "Dynamically link against system libzip" ${USE_SYSTEM_L +@@ -156,7 +156,7 @@ option(USE_SYSTEM_LIBPNG "Dynamically link against system libpng" ON) option(USE_ASAN "Use address sanitizer" OFF) option(USE_UBSAN "Use undefined behaviour sanitizer" OFF) @@ -26,7 +26,7 @@ index f71e066..aae4a10 100644 if(USING_X11_VULKAN) message("Using X11 for Vulkan") add_definitions(-DVK_USE_PLATFORM_XLIB_KHR) -@@ -1113,7 +1113,7 @@ add_library(native STATIC +@@ -1254,7 +1254,7 @@ add_library(native STATIC ext/jpge/jpge.h ) @@ -35,7 +35,7 @@ index f71e066..aae4a10 100644 set(RT_LIB rt) endif() -@@ -1131,6 +1131,8 @@ if(ANDROID) +@@ -1272,6 +1272,8 @@ if(ANDROID) target_link_libraries(native log EGL OpenSLES) elseif(WIN32) target_link_libraries(native ws2_32 winmm) @@ -44,7 +44,18 @@ index f71e066..aae4a10 100644 elseif(${CMAKE_SYSTEM_NAME} MATCHES "^(DragonFly|FreeBSD|NetBSD)$") target_link_libraries(native execinfo) endif() -@@ -1855,12 +1857,15 @@ if(FFmpeg_FOUND) +@@ -1974,8 +1976,8 @@ if(ANDROID) + endif() + endif() + +-set(CoreExtraLibs ${CoreExtraLibs} armips libzstd_static) +-include_directories(ext/zstd/lib) ++set(CoreExtraLibs ${CoreExtraLibs} armips zstd) ++#include_directories(ext/zstd/lib) + + # needed for VK_USE_PLATFORM_XCB_KHR only + #if(VULKAN AND NOT WIN32) +@@ -2014,12 +2016,15 @@ if(FFmpeg_FOUND) endif() # Discord integration @@ -61,7 +72,7 @@ index f71e066..aae4a10 100644 if(USE_MINIUPNPC) set (MINIUPNPC_VERSION 2.1) # used by miniupnpcstrings.h.cmake set (MINIUPNPC_API_VERSION 17) -@@ -1931,6 +1936,7 @@ if(USE_MINIUPNPC) +@@ -2089,6 +2094,7 @@ if(USE_MINIUPNPC) endif() endif() endif() @@ -69,7 +80,7 @@ index f71e066..aae4a10 100644 setup_target_project(${CoreLibName} Core) -@@ -2053,6 +2059,10 @@ set(WindowsFiles +@@ -2204,6 +2210,10 @@ set(WindowsFiles list(APPEND LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT}) @@ -93,11 +104,26 @@ index 3a5d8ac..f68142f 100644 # ifdef __OpenBSD__ #define bswap16 swap16 #define bswap32 swap32 +diff --git a/Common/Thread/ThreadUtil.cpp b/Common/Thread/ThreadUtil.cpp +index a2016e2..ebfe3cb 100644 +--- a/Common/Thread/ThreadUtil.cpp ++++ b/Common/Thread/ThreadUtil.cpp +@@ -30,8 +30,10 @@ + #include + #include + #include ++#ifndef __HAIKU__ + #include + #endif ++#endif + + #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__) + #include diff --git a/Core/Config.cpp b/Core/Config.cpp -index 1c53e8e..c1758bc 100644 +index 305098f..e7b9b7c 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp -@@ -534,7 +534,7 @@ static ConfigSetting cpuSettings[] = { +@@ -619,7 +619,7 @@ static ConfigSetting cpuSettings[] = { static int DefaultInternalResolution() { // Auto on Windows and Linux, 2x on large screens, 1x elsewhere. @@ -106,7 +132,7 @@ index 1c53e8e..c1758bc 100644 return 0; #else int longestDisplaySide = std::max(System_GetPropertyInt(SYSPROP_DISPLAY_XRES), System_GetPropertyInt(SYSPROP_DISPLAY_YRES)); -@@ -761,7 +761,11 @@ static ConfigSetting graphicsSettings[] = { +@@ -858,7 +858,11 @@ static ConfigSetting graphicsSettings[] = { ReportedConfigSetting("InternalResolution", &g_Config.iInternalResolution, &DefaultInternalResolution, true, true), ReportedConfigSetting("AndroidHwScale", &g_Config.iAndroidHwScale, &DefaultAndroidHwScale), ReportedConfigSetting("HighQualityDepth", &g_Config.bHighQualityDepth, true, true, true), @@ -118,7 +144,7 @@ index 1c53e8e..c1758bc 100644 ReportedConfigSetting("FrameSkipType", &g_Config.iFrameSkipType, 0, true, true), ReportedConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, false, true, true), ConfigSetting("FrameRate", &g_Config.iFpsLimit1, 0, true, true), -@@ -772,10 +776,17 @@ static ConfigSetting graphicsSettings[] = { +@@ -869,10 +873,18 @@ static ConfigSetting graphicsSettings[] = { #endif // Most low-performance (and many high performance) mobile GPUs do not support aniso anyway so defaulting to 4 is fine. @@ -126,9 +152,9 @@ index 1c53e8e..c1758bc 100644 + ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 0, true, true), +#else ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 4, true, true), -- +#endif - ReportedConfigSetting("VertexDecCache", &g_Config.bVertexCache, &DefaultVertexCache, true, true), + + ReportedConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, true, true), +#ifdef __HAIKU__ + ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, true, true, true), +#else @@ -137,7 +163,7 @@ index 1c53e8e..c1758bc 100644 ReportedConfigSetting("TextureSecondaryCache", &g_Config.bTextureSecondaryCache, false, true, true), ReportedConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, false), -@@ -810,7 +821,11 @@ static ConfigSetting graphicsSettings[] = { +@@ -907,7 +919,11 @@ static ConfigSetting graphicsSettings[] = { ConfigSetting("ShaderChainRequires60FPS", &g_Config.bShaderChainRequires60FPS, false, true, true), ReportedConfigSetting("MemBlockTransferGPU", &g_Config.bBlockTransferGPU, true, true, true), @@ -150,19 +176,19 @@ index 1c53e8e..c1758bc 100644 ConfigSetting("GfxDebugOutput", &g_Config.bGfxDebugOutput, false, false, false), diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp -index dda1f66..8ce8b22 100644 +index ba92142..5950dd8 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp -@@ -2013,7 +2013,7 @@ int setUDPConnReset(int udpsock, bool enabled) { +@@ -2053,7 +2053,7 @@ int setUDPConnReset(int udpsock, bool enabled) { return -1; } --#if !defined(TCP_KEEPIDLE) -+#if !defined(TCP_KEEPIDLE) && !defined(__HAIKU__) +-#if !defined(TCP_KEEPIDLE) && !PPSSPP_PLATFORM(SWITCH) ++#if !defined(TCP_KEEPIDLE) && !PPSSPP_PLATFORM(SWITCH) && !defined(__HAIKU__) #define TCP_KEEPIDLE TCP_KEEPALIVE //TCP_KEEPIDLE on Linux is equivalent to TCP_KEEPALIVE on macOS #endif // VS 2017 compatibility -@@ -2032,12 +2032,14 @@ int setSockKeepAlive(int sock, bool keepalive, const int keepinvl, const int kee +@@ -2073,12 +2073,14 @@ int setSockKeepAlive(int sock, bool keepalive, const int keepinvl, const int kee if (result == 0 && keepalive) { if (getsockopt(sock, SOL_SOCKET, SO_TYPE, (char*)&optval, (socklen_t*)&optlen) == 0 && optval == SOCK_STREAM) { optlen = sizeof(optval); @@ -177,7 +203,20 @@ index dda1f66..8ce8b22 100644 +#endif } } + #endif // !PPSSPP_PLATFORM(SWITCH) +diff --git a/Core/Instance.cpp b/Core/Instance.cpp +index b8ecfd8..6ddd9eb 100644 +--- a/Core/Instance.cpp ++++ b/Core/Instance.cpp +@@ -81,7 +81,7 @@ static bool UpdateInstanceCounter(void (*callback)(volatile InstanceInfo *)) { + UnmapViewOfFile(buf); + return result; +-#elif PPSSPP_PLATFORM(ANDROID) || defined(__LIBRETRO__) || PPSSPP_PLATFORM(SWITCH) ++#elif PPSSPP_PLATFORM(ANDROID) || defined(__LIBRETRO__) || PPSSPP_PLATFORM(SWITCH) || defined(__HAIKU__) + // TODO: replace shm_open & shm_unlink with ashmem or android-shmem + return false; + #else diff --git a/Core/Util/PortManager.h b/Core/Util/PortManager.h index a4c7df6..78bcf01 100644 --- a/Core/Util/PortManager.h @@ -196,10 +235,10 @@ index a4c7df6..78bcf01 100644 #include #include diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp -index 98b56fe..a175b4b 100644 +index f0f74f9..d42eed0 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp -@@ -209,7 +209,7 @@ void LaunchBrowser(const char *url) { +@@ -210,7 +210,7 @@ void LaunchBrowser(const char *url) { #elif defined(_WIN32) std::wstring wurl = ConvertUTF8ToWString(url); ShellExecute(NULL, L"open", wurl.c_str(), NULL, NULL, SW_SHOWNORMAL); @@ -208,7 +247,7 @@ index 98b56fe..a175b4b 100644 std::string command = std::string("open ") + url; system(command.c_str()); #else -@@ -232,7 +232,7 @@ void LaunchMarket(const char *url) { +@@ -233,7 +233,7 @@ void LaunchMarket(const char *url) { #elif defined(_WIN32) std::wstring wurl = ConvertUTF8ToWString(url); ShellExecute(NULL, L"open", wurl.c_str(), NULL, NULL, SW_SHOWNORMAL); @@ -217,7 +256,7 @@ index 98b56fe..a175b4b 100644 std::string command = std::string("open ") + url; system(command.c_str()); #else -@@ -250,7 +250,7 @@ void LaunchEmail(const char *email_address) { +@@ -251,7 +251,7 @@ void LaunchEmail(const char *email_address) { #elif defined(_WIN32) std::wstring mailto = std::wstring(L"mailto:") + ConvertUTF8ToWString(email_address); ShellExecute(NULL, L"open", mailto.c_str(), NULL, NULL, SW_SHOWNORMAL); @@ -226,7 +265,7 @@ index 98b56fe..a175b4b 100644 std::string command = std::string("open mailto:") + email_address; system(command.c_str()); #else -@@ -269,6 +269,8 @@ std::string System_GetProperty(SystemProperty prop) { +@@ -270,6 +270,8 @@ std::string System_GetProperty(SystemProperty prop) { return "SDL:Windows"; #elif __linux__ return "SDL:Linux"; @@ -235,9 +274,9 @@ index 98b56fe..a175b4b 100644 #elif __APPLE__ return "SDL:macOS"; #elif PPSSPP_PLATFORM(SWITCH) -@@ -489,6 +491,16 @@ int main(int argc, char *argv[]) { - nxlinkStdio(); - #endif // HAVE_LIBNX +@@ -487,6 +489,16 @@ int main(int argc, char *argv[]) { + } + } +#ifdef __HAIKU__ + char *binpath = realpath(argv[0], NULL); @@ -249,25 +288,25 @@ index 98b56fe..a175b4b 100644 + } +#endif + - glslang::InitializeProcess(); - - #if PPSSPP_PLATFORM(RPI) + #ifdef HAVE_LIBNX + socketInitializeDefault(); + nxlinkStdio(); diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp -index f7b7b13..9addbc7 100644 +index 4bb1c42..3547fea 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp -@@ -507,6 +507,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch - g_Config.memStickDirectory = memstickDir + "/"; - } - } +@@ -559,6 +559,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch + #elif PPSSPP_PLATFORM(SWITCH) + g_Config.memStickDirectory = g_Config.internalDataDirectory / "config/ppsspp"; + g_Config.flash0Directory = g_Config.internalDataDirectory / "assets/flash0"; +#elif defined(__HAIKU__) -+ g_Config.memStickDirectory = getenv("HOME") + std::string("/config/settings/ppsspp/"); -+ g_Config.flash0Directory = File::GetExeDirectory() + "/assets/flash0/"; - #elif defined(IOS) - g_Config.memStickDirectory = user_data_path; - g_Config.flash0Directory = std::string(external_dir) + "/flash0/"; ++ g_Config.memStickDirectory = Path(getenv("HOME")) / "/config/settings/ppsspp/"; ++ g_Config.flash0Directory = File::GetExeDirectory() / "/assets/flash0/"; + #elif !PPSSPP_PLATFORM(WINDOWS) + std::string config; + if (getenv("XDG_CONFIG_HOME") != NULL) diff --git a/cmake/Modules/FindFFmpeg.cmake b/cmake/Modules/FindFFmpeg.cmake -index 648c0ba..03bcac6 100644 +index 648c0ba..cf5bd49 100644 --- a/cmake/Modules/FindFFmpeg.cmake +++ b/cmake/Modules/FindFFmpeg.cmake @@ -33,7 +33,6 @@ set(_FFmpeg_ALL_COMPONENTS @@ -290,69 +329,11 @@ index 648c0ba..03bcac6 100644 ${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 ) -diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt -index 16b4adb..92c723d 100644 ---- a/ext/CMakeLists.txt -+++ b/ext/CMakeLists.txt -@@ -17,6 +17,6 @@ add_subdirectory(glslang EXCLUDE_FROM_ALL) - add_subdirectory(snappy) - add_subdirectory(udis86) - add_subdirectory(SPIRV-Cross-build) --if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO) -+if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO AND NOT HAIKU) - add_subdirectory(discord-rpc-build) - endif() --- -2.30.0 - - -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 - - -diff --git a/Core/Instance.cpp b/Core/Instance.cpp -index 4353641..d611078 100644 ---- a/Core/Instance.cpp -+++ b/Core/Instance.cpp -@@ -79,7 +79,7 @@ static bool UpdateInstanceCounter(void (*callback)(volatile InstanceInfo *)) { - UnmapViewOfFile(buf); - - return result; --#elif PPSSPP_PLATFORM(ANDROID) || defined(__LIBRETRO__) -+#elif PPSSPP_PLATFORM(ANDROID) || defined(__LIBRETRO__) || defined(__HAIKU__) - // TODO: replace shm_open & shm_unlink with ashmem or android-shmem - return false; - #else --- -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 @@ -361,6 +342,29 @@ index 03bcac6..cf5bd49 100644 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index 3597ca1..2a258e6 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -8,7 +8,7 @@ endif() + set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "let's not build binaries we don't need" FORCE) + set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON CACHE BOOL "let's not use exceptions" FORCE) + set(ENABLE_SPVREMAPPER OFF CACHE BOOL "we don't need spvremapper" FORCE) +-set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "we don't need zstd programs" FORCE) ++#set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "we don't need zstd programs" FORCE) + + # This is really a workaround for an NDK 20 compiler issue (PPSSPP issue #12105), but shouldn't hurt. + if(ANDROID) +@@ -19,7 +19,7 @@ add_subdirectory(glslang EXCLUDE_FROM_ALL) + add_subdirectory(snappy) + add_subdirectory(udis86) + add_subdirectory(SPIRV-Cross-build) +-if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO) ++if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO AND NOT HAIKU) + add_subdirectory(discord-rpc-build) + endif() +-add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL) ++#add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL) diff --git a/ext/cityhash/city.h b/ext/cityhash/city.h index 94499ce..1b80a5e 100644 --- a/ext/cityhash/city.h @@ -378,5 +382,5 @@ index 94499ce..1b80a5e 100644 typedef std::pair uint128; -- -2.30.0 +2.30.2 diff --git a/games-emulation/ppsspp/ppsspp-1.11.3.recipe b/games-emulation/ppsspp/ppsspp-1.12.3.recipe similarity index 86% rename from games-emulation/ppsspp/ppsspp-1.11.3.recipe rename to games-emulation/ppsspp/ppsspp-1.12.3.recipe index 830c88ca2..ec6e68e6a 100644 --- a/games-emulation/ppsspp/ppsspp-1.11.3.recipe +++ b/games-emulation/ppsspp/ppsspp-1.12.3.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2012-2021 PPSSPP Project" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/hrydgard/ppsspp/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="503f046fa68e4be24d08822b0aa2280e653ad513d9a12c77a59809467b95c516" +CHECKSUM_SHA256="c9458ab1946d7d665465f69aafdf8598179852fefdcd7aef9050f7278193bec5" SOURCE_FILENAME="ppsspp-$portVersion.tar.gz" SOURCE_DIR="ppsspp-$portVersion" srcGitRev_2="7885552b208493a6a0f21663770c446c3ba65576" @@ -15,19 +15,19 @@ SOURCE_URI_2="https://github.com/Kingcom/armips/archive/$srcGitRev_2.tar.gz" CHECKSUM_SHA256_2="f8a03906135fb6f2932b80b7ef5991f39ccac46b36ec3690776fb38c69775c3d" SOURCE_FILENAME_2="armips-$srcGitRev_2.tar.gz" SOURCE_DIR_2="armips-$srcGitRev_2" -srcGitRev_3="d0850f875ec392a130ccf00018dab458b546f27c" +srcGitRev_3="dc11adde23c455a24e13dd54de9b4ede8bdd7db8" SOURCE_URI_3="https://github.com/hrydgard/glslang/archive/$srcGitRev_3.tar.gz" -CHECKSUM_SHA256_3="699e177e0022f17c204e3542bbf7fcb6843923095968edc1ebbc5124e85a2bdf" +CHECKSUM_SHA256_3="32edc362238d5b1136b2b40b0abdeef5a832e599554d2fcf75d7b08e4b0ed0bb" SOURCE_FILENAME_3="glslang-$srcGitRev_3.tar.gz" SOURCE_DIR_3="glslang-$srcGitRev_3" -srcGitRev_4="a1f7c8dc8ea2f94443951ee27003bffa562c1f13" +srcGitRev_4="9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1" SOURCE_URI_4="https://github.com/KhronosGroup/SPIRV-Cross/archive/$srcGitRev_4.tar.gz" -CHECKSUM_SHA256_4="456b1e2a75a8e82985ce22f4707570c7aa1fc50d4119cba1a641e8b233ecde26" +CHECKSUM_SHA256_4="9423aebd6ea4251c6ea736f0291066eb2b99b6f923151edd1a78ce9c29b46757" SOURCE_FILENAME_4="SPIRV-Cross-$srcGitRev_4.tar.gz" SOURCE_DIR_4="SPIRV-Cross-$srcGitRev_4" -srcGitRev_5="6bd5b4bc983917ea8402f73c726b46e36f3de0b4" +srcGitRev_5="52d180df0f4e7eee18e8e4846826806f10b16dcb" SOURCE_URI_5="https://github.com/hrydgard/ppsspp-lang/archive/$srcGitRev_5.tar.gz" -CHECKSUM_SHA256_5="b6e9fe4a7daa2dd8d4f3cc74cbafc5382f7df90303af3a3c18d25ec4492d8899" +CHECKSUM_SHA256_5="3cbe1fe0438d780da3572927495df3e77560e4c3e9eb51f1ee38ba938138556f" SOURCE_FILENAME_5="ppsspp-lang-$srcGitRev_5.tar.gz" SOURCE_DIR_5="ppsspp-lang-$srcGitRev_5" PATCHES="ppsspp-$portVersion.patchset" @@ -56,6 +56,7 @@ REQUIRES=" lib:libsnappy$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libzip$secondaryArchSuffix + lib:libzstd$secondaryArchSuffix " BUILD_REQUIRES=" @@ -74,6 +75,7 @@ BUILD_REQUIRES=" devel:libsnappy$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libzip$secondaryArchSuffix + devel:libzstd$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake @@ -96,6 +98,7 @@ BUILD() cd build cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_SYSTEM_SNAPPY=ON \ -DUSE_SYSTEM_LIBZIP=ON \