haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

ppsspp: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2023-07-17 23:19:29 +10:00
parent 5248be0f04
commit 0c409badd4
2 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
games-emulation/ppsspp/patches/ppsspp-1.14.4.patchset → games-emulation/ppsspp/patches/ppsspp-1.15.4.patchset
View File

@@ -1,11 +1,11 @@
From 30d1af3674a55370f5c293294f5f3e6045454518 Mon Sep 17 00:00:00 2001
From 02f40b6c7717c85e482ae3af11c850364148f15a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 22 Jan 2023 22:07:54 +1000
Subject: Fixes for Haiku
Date: Mon, 17 Jul 2023 21:02:15 +1000
Subject: Fix for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76aed46..d5cdf29 100644
index 053707f..f27e2e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
@@ -17,7 +17,7 @@ index 76aed46..d5cdf29 100644
set(VULKAN ON)
endif()
@@ -176,7 +176,7 @@ option(USE_SYSTEM_MINIUPNPC "Dynamically link against system miniUPnPc" ${USE_SY
@@ -171,7 +171,7 @@ option(USE_SYSTEM_MINIUPNPC "Dynamically link against system miniUPnPc" ${USE_SY
option(USE_ASAN "Use address sanitizer" OFF)
option(USE_UBSAN "Use undefined behaviour sanitizer" OFF)
@@ -26,7 +26,7 @@ index 76aed46..d5cdf29 100644
if(USING_X11_VULKAN)
message("Using X11 for Vulkan")
add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
@@ -1329,7 +1329,7 @@ add_library(native STATIC
@@ -1431,7 +1431,7 @@ add_library(native STATIC
ext/jpge/jpge.h
)
@@ -35,7 +35,7 @@ index 76aed46..d5cdf29 100644
set(RT_LIB rt)
endif()
@@ -1347,6 +1347,8 @@ if(ANDROID)
@@ -1449,6 +1449,8 @@ if(ANDROID)
target_link_libraries(native log EGL OpenSLES)
elseif(WIN32)
target_link_libraries(native ws2_32 winmm)
@@ -44,7 +44,7 @@ index 76aed46..d5cdf29 100644
elseif(${CMAKE_SYSTEM_NAME} MATCHES "^(DragonFly|FreeBSD|NetBSD)$")
target_link_libraries(native execinfo)
endif()
@@ -2075,8 +2077,8 @@ else()
@@ -2193,8 +2195,8 @@ else()
set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "we don't need zstd programs" FORCE)
set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "we don't use any old zstd files" FORCE)
add_subdirectory(ext/zstd/build/cmake EXCLUDE_FROM_ALL)
@@ -55,7 +55,7 @@ index 76aed46..d5cdf29 100644
endif()
target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash ${GlslangLibs}
@@ -2099,12 +2101,15 @@ if(FFmpeg_FOUND)
@@ -2217,12 +2219,15 @@ if(FFmpeg_FOUND)
endif()
# Discord integration
@@ -72,7 +72,7 @@ index 76aed46..d5cdf29 100644
if(USE_MINIUPNPC)
if(USE_SYSTEM_MINIUPNPC)
find_package(MINIUPNPC REQUIRED)
@@ -2181,6 +2186,7 @@ if(USE_MINIUPNPC)
@@ -2299,6 +2304,7 @@ if(USE_MINIUPNPC)
endif()
endif()
endif()
@@ -80,7 +80,7 @@ index 76aed46..d5cdf29 100644
setup_target_project(${CoreLibName} Core)
@@ -2297,6 +2303,10 @@ set(WindowsFiles
@@ -2416,6 +2422,10 @@ set(WindowsFiles
list(APPEND LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT})
@@ -105,10 +105,10 @@ index 3a5d8ac..f68142f 100644
#define bswap16 swap16
#define bswap32 swap32
diff --git a/Common/Thread/ThreadUtil.cpp b/Common/Thread/ThreadUtil.cpp
index 73eab75..833d0d7 100644
index 338dfa1..41c9175 100644
--- a/Common/Thread/ThreadUtil.cpp
+++ b/Common/Thread/ThreadUtil.cpp
@@ -31,8 +31,10 @@
@@ -57,8 +57,10 @@ void RegisterAttachDetach(AttachDetachFunc attach, AttachDetachFunc detach) {
#include <pthread.h>
#include <sys/types.h>
#include <unistd.h>
@@ -120,10 +120,10 @@ index 73eab75..833d0d7 100644
#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <pthread_np.h>
diff --git a/Core/Config.cpp b/Core/Config.cpp
index 4971f9a..591dd9b 100644
index 7ab6710..c99fbb0 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -646,7 +646,7 @@ static ConfigSetting cpuSettings[] = {
@@ -279,7 +279,7 @@ static const ConfigSetting cpuSettings[] = {
static int DefaultInternalResolution() {
// Auto on Windows and Linux, 2x on large screens, 1x elsewhere.
@@ -132,40 +132,40 @@ index 4971f9a..591dd9b 100644
return 0;
#else
if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_VR) {
@@ -889,7 +889,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),
@@ -528,7 +528,11 @@ static const ConfigSetting graphicsSettings[] = {
ConfigSetting("InternalResolution", &g_Config.iInternalResolution, &DefaultInternalResolution, CfgFlag::PER_GAME | CfgFlag::REPORT),
ConfigSetting("AndroidHwScale", &g_Config.iAndroidHwScale, &DefaultAndroidHwScale, CfgFlag::DEFAULT),
ConfigSetting("HighQualityDepth", &g_Config.bHighQualityDepth, true, CfgFlag::PER_GAME | CfgFlag::REPORT),
+#ifdef __HAIKU__
+ ReportedConfigSetting("FrameSkip", &g_Config.iFrameSkip, 2, true, true),
+ ConfigSetting("FrameSkip", &g_Config.iFrameSkip, 2, CfgFlag::PER_GAME | CfgFlag::REPORT),
+#else
ReportedConfigSetting("FrameSkip", &g_Config.iFrameSkip, 0, true, true),
ConfigSetting("FrameSkip", &g_Config.iFrameSkip, 0, CfgFlag::PER_GAME | CfgFlag::REPORT),
+#endif
ReportedConfigSetting("FrameSkipType", &g_Config.iFrameSkipType, 0, true, true),
ReportedConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, IsVREnabled(), true, true),
ConfigSetting("StereoRendering", &g_Config.bStereoRendering, false, true, true),
@@ -904,11 +908,19 @@ static ConfigSetting graphicsSettings[] = {
ConfigSetting("FrameSkipType", &g_Config.iFrameSkipType, 0, CfgFlag::PER_GAME | CfgFlag::REPORT),
ConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, IsVREnabled(), CfgFlag::PER_GAME | CfgFlag::REPORT),
ConfigSetting("StereoRendering", &g_Config.bStereoRendering, false, CfgFlag::PER_GAME),
@@ -542,11 +546,19 @@ static const ConfigSetting graphicsSettings[] = {
#endif
// Most low-performance (and many high performance) mobile GPUs do not support aniso anyway so defaulting to 4 is fine.
+#ifdef __HAIKU__
+ ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 0, true, true),
+ ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 0, CfgFlag::PER_GAME),
+#else
ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 4, true, true),
ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 4, CfgFlag::PER_GAME),
+#endif
ConfigSetting("MultiSampleLevel", &g_Config.iMultiSampleLevel, 0, true, true), // Number of samples is 1 << iMultiSampleLevel
ConfigSetting("MultiSampleLevel", &g_Config.iMultiSampleLevel, 0, CfgFlag::PER_GAME), // Number of samples is 1 << iMultiSampleLevel
ReportedConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, true, true),
ConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, CfgFlag::PER_GAME | CfgFlag::REPORT),
+#ifdef __HAIKU__
+ ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, true, true, true),
+ ConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, true, CfgFlag::PER_GAME | CfgFlag::REPORT),
+#else
ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, false, true, true),
ConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, false, CfgFlag::PER_GAME | CfgFlag::REPORT),
+#endif
ReportedConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, false),
ConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, CfgFlag::DONT_SAVE | CfgFlag::REPORT),
#ifndef MOBILE_DEVICE
diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
index 2a18f05..0ea29fb 100644
index fcf853e..c5648c0 100644
--- a/Core/HLE/proAdhoc.cpp
+++ b/Core/HLE/proAdhoc.cpp
@@ -2071,7 +2071,7 @@ int setUDPConnReset(int udpsock, bool enabled) {
@@ -192,7 +192,7 @@ index 2a18f05..0ea29fb 100644
+#endif
}
}
#endif // !PPSSPP_PLATFORM(SWITCH)
#endif // !PPSSPP_PLATFORM(SWITCH) && !PPSSPP_PLATFORM(OPENBSD)
diff --git a/Core/Instance.cpp b/Core/Instance.cpp
index b8ecfd8..6ddd9eb 100644
--- a/Core/Instance.cpp
@@ -207,37 +207,30 @@ index b8ecfd8..6ddd9eb 100644
return false;
#else
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index 4158600..457b678 100644
index d81157d..b711c94 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -228,7 +228,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);
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__HAIKU__)
std::string command = std::string("open ") + url;
system(command.c_str());
@@ -306,6 +306,9 @@ void System_LaunchUrl(LaunchUrlType urlType, const char *url) {
ShellExecute(NULL, L"open", wurl.c_str(), NULL, NULL, SW_SHOWNORMAL);
#elif defined(__APPLE__)
OSXOpenURL(url);
+#elif defined(__HAIKU__)
+ std::string command = std::string("open \"") + url + std::string("\"");
+ system(command.c_str());
#else
@@ -251,7 +251,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);
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__HAIKU__)
std::string command = std::string("open ") + url;
system(command.c_str());
std::string command = std::string("xdg-open ") + url;
int err = system(command.c_str());
@@ -325,6 +328,9 @@ void System_LaunchUrl(LaunchUrlType urlType, const char *url) {
#elif defined(__APPLE__)
std::string mailToURL = std::string("mailto:") + url;
OSXOpenURL(mailToURL.c_str());
+#elif defined(__HAIKU__)
+ std::string command = std::string("open mailto:") + url;
+ system(command.c_str());
#else
@@ -269,7 +269,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);
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__HAIKU__)
std::string command = std::string("open mailto:") + email_address;
system(command.c_str());
#else
@@ -288,6 +288,8 @@ std::string System_GetProperty(SystemProperty prop) {
std::string command = std::string("xdg-email ") + url;
int err = system(command.c_str());
@@ -344,6 +350,8 @@ std::string System_GetProperty(SystemProperty prop) {
return "SDL:Windows";
#elif __linux__
return "SDL:Linux";
@@ -246,7 +239,7 @@ index 4158600..457b678 100644
#elif __APPLE__
return "SDL:macOS";
#elif PPSSPP_PLATFORM(SWITCH)
@@ -524,6 +526,16 @@ int main(int argc, char *argv[]) {
@@ -609,6 +617,16 @@ int main(int argc, char *argv[]) {
}
}
@@ -264,10 +257,10 @@ index 4158600..457b678 100644
socketInitializeDefault();
nxlinkStdio();
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index a2215be..22a2997 100644
index 22c8543..97c420a 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -563,6 +563,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
@@ -519,6 +519,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";
@@ -315,10 +308,10 @@ index 648c0ba..cf5bd49 100644
NO_CMAKE_FIND_ROOT_PATH
)
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index ac16518..96ffb4a 100644
index e2b0f44..514a020 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -24,6 +24,6 @@ add_subdirectory(glslang EXCLUDE_FROM_ALL)
@@ -30,6 +30,6 @@ add_subdirectory(glslang EXCLUDE_FROM_ALL)
add_subdirectory(snappy)
add_subdirectory(udis86)
add_subdirectory(SPIRV-Cross-build)

2
games-emulation/ppsspp/ppsspp-1.14.4.recipe → games-emulation/ppsspp/ppsspp-1.15.4.recipe
View File

@@ -7,7 +7,7 @@ COPYRIGHT="2012-2023 PPSSPP Project"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/hrydgard/ppsspp/releases/download/v${portVersion}/ppsspp-${portVersion}.tar.xz"
CHECKSUM_SHA256="54ede41af569116d9c284f7b157d1449dcd13944675e60c2875bf3a3994f5dda"
CHECKSUM_SHA256="a20bd27b4cda811d6cd2182fbfcd16f7092d6a5d07fcbbd00cc7230530bdf68c"
SOURCE_FILENAME="ppsspp-$portVersion.tar.xz"
SOURCE_DIR="ppsspp-$portVersion"
PATCHES="ppsspp-$portVersion.patchset"