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

PPSSPP: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2024-02-19 23:47:33 +10:00
parent 1e8dbde60e
commit b04c809c73
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
games-emulation/ppsspp/patches/ppsspp-1.16.6.patchset → games-emulation/ppsspp/patches/ppsspp-1.17.1.patchset
View File

@@ -1,11 +1,11 @@
From c1f0f7c6ea8cf3fc99e8834ea34579321fabfdcc Mon Sep 17 00:00:00 2001
From 7b8b9dee309369ace97073faf9770ab1776fd5b2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 16 Oct 2023 21:45:07 +1000
Date: Mon, 19 Feb 2024 23:32:42 +1000
Subject: Fix for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dfb26e..c331275 100644
index bfd5e69..f1c3c32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,7 +100,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
@@ -26,7 +26,7 @@ index 2dfb26e..c331275 100644
if(USING_X11_VULKAN)
message("Using X11 for Vulkan")
find_package(X11)
@@ -1508,7 +1508,7 @@ add_library(native STATIC
@@ -1523,7 +1523,7 @@ add_library(native STATIC
ext/jpge/jpge.h
)
@@ -35,7 +35,7 @@ index 2dfb26e..c331275 100644
set(RT_LIB rt)
endif()
@@ -1526,6 +1526,8 @@ if(ANDROID)
@@ -1541,6 +1541,8 @@ if(ANDROID)
target_link_libraries(native log EGL OpenSLES)
elseif(WIN32)
target_link_libraries(native ws2_32 winmm)
@@ -44,7 +44,7 @@ index 2dfb26e..c331275 100644
elseif(${CMAKE_SYSTEM_NAME} MATCHES "^(DragonFly|FreeBSD|NetBSD)$")
target_link_libraries(native execinfo)
endif()
@@ -2313,8 +2315,8 @@ else()
@@ -2334,8 +2336,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)
@@ -54,8 +54,8 @@ index 2dfb26e..c331275 100644
+# include_directories(ext/zstd/lib)
endif()
target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash rcheevos ${GlslangLibs}
@@ -2341,12 +2343,15 @@ if(FFmpeg_FOUND)
include_directories(ext/libchdr/include)
@@ -2367,12 +2369,15 @@ if(FFmpeg_FOUND)
endif()
# Discord integration
@@ -72,7 +72,7 @@ index 2dfb26e..c331275 100644
if(USE_MINIUPNPC)
if(USE_SYSTEM_MINIUPNPC)
find_package(MINIUPNPC REQUIRED)
@@ -2423,6 +2428,7 @@ if(USE_MINIUPNPC)
@@ -2449,6 +2454,7 @@ if(USE_MINIUPNPC)
endif()
endif()
endif()
@@ -80,7 +80,7 @@ index 2dfb26e..c331275 100644
setup_target_project(${CoreLibName} Core)
@@ -2548,6 +2554,10 @@ set(WindowsFiles
@@ -2574,6 +2580,10 @@ set(WindowsFiles
list(APPEND LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT})
@@ -120,10 +120,10 @@ index 338dfa1..41c9175 100644
#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <pthread_np.h>
diff --git a/Core/Config.cpp b/Core/Config.cpp
index 7223678..d33ee40 100644
index 008ef0c..7b6aa4b 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -318,7 +318,7 @@ static const ConfigSetting cpuSettings[] = {
@@ -354,7 +354,7 @@ static const ConfigSetting cpuSettings[] = {
static int DefaultInternalResolution() {
// Auto on Windows and Linux, 2x on large screens, 1x elsewhere.
@@ -132,7 +132,7 @@ index 7223678..d33ee40 100644
return 0;
#else
if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_VR) {
@@ -573,7 +573,11 @@ static const ConfigSetting graphicsSettings[] = {
@@ -615,7 +615,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),
@@ -144,7 +144,7 @@ index 7223678..d33ee40 100644
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),
@@ -587,11 +591,19 @@ static const ConfigSetting graphicsSettings[] = {
@@ -629,10 +633,17 @@ 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.
@@ -154,8 +154,7 @@ index 7223678..d33ee40 100644
ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 4, CfgFlag::PER_GAME),
+#endif
ConfigSetting("MultiSampleLevel", &g_Config.iMultiSampleLevel, 0, CfgFlag::PER_GAME), // Number of samples is 1 << iMultiSampleLevel
ConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, CfgFlag::PER_GAME | CfgFlag::REPORT),
-
+#ifdef __HAIKU__
+ ConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, true, CfgFlag::PER_GAME | CfgFlag::REPORT),
+#else
@@ -165,10 +164,10 @@ index 7223678..d33ee40 100644
#ifndef MOBILE_DEVICE
diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
index 9a1cfc9..9cafd46 100644
index 5c99439..946e895 100644
--- a/Core/HLE/proAdhoc.cpp
+++ b/Core/HLE/proAdhoc.cpp
@@ -2071,7 +2071,7 @@ int setUDPConnReset(int udpsock, bool enabled) {
@@ -2070,7 +2070,7 @@ int setUDPConnReset(int udpsock, bool enabled) {
return -1;
}
@@ -177,7 +176,7 @@ index 9a1cfc9..9cafd46 100644
#define TCP_KEEPIDLE TCP_KEEPALIVE //TCP_KEEPIDLE on Linux is equivalent to TCP_KEEPALIVE on macOS
#endif
// VS 2017 compatibility
@@ -2091,12 +2091,14 @@ int setSockKeepAlive(int sock, bool keepalive, const int keepinvl, const int kee
@@ -2090,12 +2090,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);
@@ -207,10 +206,10 @@ index b8ecfd8..6ddd9eb 100644
return false;
#else
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index f8f454f..34ad0f8 100644
index 50489bb..78c4734 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -375,6 +375,9 @@ void System_LaunchUrl(LaunchUrlType urlType, const char *url) {
@@ -374,6 +374,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);
@@ -220,7 +219,7 @@ index f8f454f..34ad0f8 100644
#else
std::string command = std::string("xdg-open ") + url;
int err = system(command.c_str());
@@ -394,6 +397,9 @@ void System_LaunchUrl(LaunchUrlType urlType, const char *url) {
@@ -393,6 +396,9 @@ void System_LaunchUrl(LaunchUrlType urlType, const char *url) {
#elif defined(__APPLE__)
std::string mailToURL = std::string("mailto:") + url;
OSXOpenURL(mailToURL.c_str());
@@ -230,7 +229,7 @@ index f8f454f..34ad0f8 100644
#else
std::string command = std::string("xdg-email ") + url;
int err = system(command.c_str());
@@ -413,6 +419,8 @@ std::string System_GetProperty(SystemProperty prop) {
@@ -412,6 +418,8 @@ std::string System_GetProperty(SystemProperty prop) {
return "SDL:Windows";
#elif __linux__
return "SDL:Linux";
@@ -239,7 +238,7 @@ index f8f454f..34ad0f8 100644
#elif __APPLE__
return "SDL:macOS";
#elif PPSSPP_PLATFORM(SWITCH)
@@ -1137,6 +1145,16 @@ int main(int argc, char *argv[]) {
@@ -1097,6 +1105,16 @@ int main(int argc, char *argv[]) {
}
}
@@ -257,10 +256,10 @@ index f8f454f..34ad0f8 100644
socketInitializeDefault();
nxlinkStdio();
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 0c4a9ba..8cebce1 100644
index 89ce32f..2e71d77 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -516,6 +516,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
@@ -486,6 +486,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";
@@ -308,10 +307,10 @@ index 648c0ba..cf5bd49 100644
NO_CMAKE_FIND_ROOT_PATH
)
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index 9bbb9b7..f3cdfc0 100644
index fe6b714..63b1f31 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -34,6 +34,6 @@ add_subdirectory(rcheevos-build)
@@ -34,7 +34,7 @@ add_subdirectory(rcheevos-build)
if(NOT HTTPS_NOT_AVAILABLE)
add_subdirectory(naett-build)
endif()
@@ -319,6 +318,7 @@ index 9bbb9b7..f3cdfc0 100644
+if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO AND NOT HAIKU)
add_subdirectory(discord-rpc-build)
endif()
diff --git a/ext/armips/ext/filesystem/include/ghc/filesystem.hpp b/ext/armips/ext/filesystem/include/ghc/filesystem.hpp
index 5cd76ae..0d0d5cb 100644
--- a/ext/armips/ext/filesystem/include/ghc/filesystem.hpp
@@ -365,5 +365,5 @@ index aeecc38..34852f7 100644
#ifndef XXH_STATIC_ASSERT
# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */
--
2.42.0
2.42.1

6
games-emulation/ppsspp/ppsspp-1.16.6.recipe → games-emulation/ppsspp/ppsspp-1.17.1.recipe
View File

@@ -3,11 +3,11 @@ DESCRIPTION="PPSSPP is a PSP (PlayStation Portable) emulator capable of playing
majority of the games made for Sony’s first portable console right on your favorite \
Android or PC device."
HOMEPAGE="https://www.ppsspp.org/"
COPYRIGHT="2012-2023 PPSSPP Project"
COPYRIGHT="2012-2024 PPSSPP Project"
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="1"
SOURCE_URI="https://github.com/hrydgard/ppsspp/releases/download/v${portVersion}/ppsspp-${portVersion}.tar.xz"
CHECKSUM_SHA256="9782468b175abc89e5365a73d8848d660e39b596ec8da0238aad977c89cf5116"
CHECKSUM_SHA256="23e0b8649cc8124b0c22a62d4d41b592b6bd4064bce8c09b0d4abce895e132ae"
SOURCE_FILENAME="ppsspp-$portVersion.tar.xz"
SOURCE_DIR="ppsspp-$portVersion"
PATCHES="ppsspp-$portVersion.patchset"