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

ppsspp: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2023-10-16 22:22:58 +10:00
parent 5fe5bb1194
commit 8d3c3380d6
2 changed files with 40 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
games-emulation/ppsspp/patches/ppsspp-1.15.4.patchset → games-emulation/ppsspp/patches/ppsspp-1.16.6.patchset
View File

@@ -1,14 +1,14 @@
From 19a5742fc19c0c7eebd98485d502ad531fd8861e Mon Sep 17 00:00:00 2001
From c1f0f7c6ea8cf3fc99e8834ea34579321fabfdcc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 17 Jul 2023 21:02:15 +1000
Date: Mon, 16 Oct 2023 21:45:07 +1000
Subject: Fix for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 053707f..f27e2e0 100644
index 2dfb26e..c331275 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
@@ -100,7 +100,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 053707f..f27e2e0 100644
set(VULKAN ON)
endif()
@@ -171,7 +171,7 @@ option(USE_SYSTEM_MINIUPNPC "Dynamically link against system miniUPnPc" ${USE_SY
@@ -174,7 +174,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)
@@ -25,8 +25,8 @@ index 053707f..f27e2e0 100644
+if(UNIX AND NOT (APPLE OR ANDROID OR HAIKU) AND VULKAN)
if(USING_X11_VULKAN)
message("Using X11 for Vulkan")
add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
@@ -1431,7 +1431,7 @@ add_library(native STATIC
find_package(X11)
@@ -1508,7 +1508,7 @@ add_library(native STATIC
ext/jpge/jpge.h
)
@@ -35,7 +35,7 @@ index 053707f..f27e2e0 100644
set(RT_LIB rt)
endif()
@@ -1449,6 +1449,8 @@ if(ANDROID)
@@ -1526,6 +1526,8 @@ if(ANDROID)
target_link_libraries(native log EGL OpenSLES)
elseif(WIN32)
target_link_libraries(native ws2_32 winmm)
@@ -44,7 +44,7 @@ index 053707f..f27e2e0 100644
elseif(${CMAKE_SYSTEM_NAME} MATCHES "^(DragonFly|FreeBSD|NetBSD)$")
target_link_libraries(native execinfo)
endif()
@@ -2193,8 +2195,8 @@ else()
@@ -2313,8 +2315,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 053707f..f27e2e0 100644
+# include_directories(ext/zstd/lib)
endif()
target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash ${GlslangLibs}
@@ -2217,12 +2219,15 @@ if(FFmpeg_FOUND)
target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash rcheevos ${GlslangLibs}
@@ -2341,12 +2343,15 @@ if(FFmpeg_FOUND)
endif()
# Discord integration
@@ -72,7 +72,7 @@ index 053707f..f27e2e0 100644
if(USE_MINIUPNPC)
if(USE_SYSTEM_MINIUPNPC)
find_package(MINIUPNPC REQUIRED)
@@ -2299,6 +2304,7 @@ if(USE_MINIUPNPC)
@@ -2423,6 +2428,7 @@ if(USE_MINIUPNPC)
endif()
endif()
endif()
@@ -80,7 +80,7 @@ index 053707f..f27e2e0 100644
setup_target_project(${CoreLibName} Core)
@@ -2416,6 +2422,10 @@ set(WindowsFiles
@@ -2548,6 +2554,10 @@ set(WindowsFiles
list(APPEND LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT})
@@ -89,7 +89,7 @@ index 053707f..f27e2e0 100644
+endif()
+
if(WIN32)
list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput d3d9 winmm dinput8 ole32 winspool ksuser mf mfplat mfreadwrite mfuuid shlwapi)
list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput d3d9 winmm dinput8 ole32 winspool ksuser mf uxtheme mfplat mfreadwrite mfuuid shlwapi)
#setup_target_project(${TargetBin} Windows)
diff --git a/Common/Swap.h b/Common/Swap.h
index 3a5d8ac..f68142f 100644
@@ -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 7ab6710..979f383 100644
index 7223678..d33ee40 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -279,7 +279,7 @@ static const ConfigSetting cpuSettings[] = {
@@ -318,7 +318,7 @@ static const ConfigSetting cpuSettings[] = {
static int DefaultInternalResolution() {
// Auto on Windows and Linux, 2x on large screens, 1x elsewhere.
@@ -132,7 +132,7 @@ index 7ab6710..979f383 100644
return 0;
#else
if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_VR) {
@@ -528,7 +528,11 @@ static const ConfigSetting graphicsSettings[] = {
@@ -573,7 +573,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 7ab6710..979f383 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),
@@ -542,11 +546,19 @@ static const ConfigSetting graphicsSettings[] = {
@@ -587,11 +591,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.
@@ -165,7 +165,7 @@ index 7ab6710..979f383 100644
#ifndef MOBILE_DEVICE
diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
index fcf853e..c5648c0 100644
index 9a1cfc9..9cafd46 100644
--- a/Core/HLE/proAdhoc.cpp
+++ b/Core/HLE/proAdhoc.cpp
@@ -2071,7 +2071,7 @@ int setUDPConnReset(int udpsock, bool enabled) {
@@ -207,10 +207,10 @@ index b8ecfd8..6ddd9eb 100644
return false;
#else
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index d81157d..b711c94 100644
index f8f454f..34ad0f8 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -306,6 +306,9 @@ void System_LaunchUrl(LaunchUrlType urlType, const char *url) {
@@ -375,6 +375,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 +220,7 @@ index d81157d..b711c94 100644
#else
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) {
@@ -394,6 +397,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 +230,7 @@ index d81157d..b711c94 100644
#else
std::string command = std::string("xdg-email ") + url;
int err = system(command.c_str());
@@ -344,6 +350,8 @@ std::string System_GetProperty(SystemProperty prop) {
@@ -413,6 +419,8 @@ std::string System_GetProperty(SystemProperty prop) {
return "SDL:Windows";
#elif __linux__
return "SDL:Linux";
@@ -239,7 +239,7 @@ index d81157d..b711c94 100644
#elif __APPLE__
return "SDL:macOS";
#elif PPSSPP_PLATFORM(SWITCH)
@@ -609,6 +617,16 @@ int main(int argc, char *argv[]) {
@@ -1137,6 +1145,16 @@ int main(int argc, char *argv[]) {
}
}
@@ -257,10 +257,10 @@ index d81157d..b711c94 100644
socketInitializeDefault();
nxlinkStdio();
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 22c8543..97c420a 100644
index 0c4a9ba..8cebce1 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -519,6 +519,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
@@ -516,6 +516,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,13 +308,13 @@ index 648c0ba..cf5bd49 100644
NO_CMAKE_FIND_ROOT_PATH
)
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index e2b0f44..514a020 100644
index 9bbb9b7..f3cdfc0 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -30,6 +30,6 @@ add_subdirectory(glslang EXCLUDE_FROM_ALL)
add_subdirectory(snappy)
add_subdirectory(udis86)
add_subdirectory(SPIRV-Cross-build)
@@ -34,6 +34,6 @@ add_subdirectory(rcheevos-build)
if(NOT HTTPS_NOT_AVAILABLE)
add_subdirectory(naett-build)
endif()
-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)
@@ -365,28 +365,5 @@ index aeecc38..34852f7 100644
#ifndef XXH_STATIC_ASSERT
# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */
--
2.37.3
From 8240f9ef740993ebf820ece05e9d253f2da505c3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 18 Jul 2023 19:31:40 +1000
Subject: Fix build for x86 arch
diff --git a/ext/cmake/cpu_features/CMakeLists.txt b/ext/cmake/cpu_features/CMakeLists.txt
index 31446d9..759f722 100644
--- a/ext/cmake/cpu_features/CMakeLists.txt
+++ b/ext/cmake/cpu_features/CMakeLists.txt
@@ -58,7 +58,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)")
set(PROCESSOR_IS_AARCH64 TRUE)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
set(PROCESSOR_IS_ARM TRUE)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)|(x86)")
set(PROCESSOR_IS_X86 TRUE)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
set(PROCESSOR_IS_POWER TRUE)
--
2.37.3
2.42.0

10
games-emulation/ppsspp/ppsspp-1.15.4.recipe → games-emulation/ppsspp/ppsspp-1.16.6.recipe
View File

@@ -5,9 +5,9 @@ Android or PC device."
HOMEPAGE="https://www.ppsspp.org/"
COPYRIGHT="2012-2023 PPSSPP Project"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/hrydgard/ppsspp/releases/download/v${portVersion}/ppsspp-${portVersion}.tar.xz"
CHECKSUM_SHA256="a20bd27b4cda811d6cd2182fbfcd16f7092d6a5d07fcbbd00cc7230530bdf68c"
CHECKSUM_SHA256="9782468b175abc89e5365a73d8848d660e39b596ec8da0238aad977c89cf5116"
SOURCE_FILENAME="ppsspp-$portVersion.tar.xz"
SOURCE_DIR="ppsspp-$portVersion"
PATCHES="ppsspp-$portVersion.patchset"
@@ -25,6 +25,8 @@ REQUIRES="
lib:libavcodec$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libglew$secondaryArchSuffix
lib:libGLU$secondaryArchSuffix
@@ -33,6 +35,7 @@ REQUIRES="
lib:libpng16$secondaryArchSuffix
lib:libSDL2_2.0$secondaryArchSuffix
lib:libSDL2_image_2.0$secondaryArchSuffix
lib:libSDL2_ttf_2.0$secondaryArchSuffix
lib:libsnappy$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libzip$secondaryArchSuffix
@@ -44,6 +47,8 @@ BUILD_REQUIRES="
devel:libavcodec$secondaryArchSuffix >= 58
devel:libavformat$secondaryArchSuffix >= 58
devel:libavutil$secondaryArchSuffix >= 56
devel:libfontconfig$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libglew$secondaryArchSuffix >= 2.2
devel:libGLU$secondaryArchSuffix
@@ -52,6 +57,7 @@ BUILD_REQUIRES="
devel:libpng16$secondaryArchSuffix
devel:libSDL2_2.0$secondaryArchSuffix
devel:libSDL2_image_2.0$secondaryArchSuffix
devel:libSDL2_ttf_2.0$secondaryArchSuffix
devel:libsnappy$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libzip$secondaryArchSuffix