haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-24 17:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

PPSSPP: add recipe for 1.6.3 version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2018-09-22 15:16:00 +10:00
parent dfecbc2117
commit dad17d62ea
3 changed files with 512 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

346
games-emulation/ppsspp/patches/ppsspp-1.6.3.patchset Normal file
View File

@@ -0,0 +1,346 @@
From 498bb436e9d4f9792e8926569e9820b1d55d9620 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 21 Sep 2018 22:38:59 +1000
Subject: Fixes for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e26ebe2..f0a080b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,8 +74,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
set(ANDROID ON)
endif()
+if(${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
+ set(HAIKU ON)
+endif()
+
# We only support Vulkan on Unix, Android and Windows.
-if(ANDROID OR WIN32 OR (UNIX AND NOT APPLE))
+if(ANDROID OR WIN32 OR (UNIX AND NOT APPLE AND NOT HAIKU))
set(VULKAN ON)
else()
add_definitions(-DNO_VULKAN)
@@ -123,7 +127,7 @@ option(USE_SYSTEM_LIBZIP "Dynamically link against system libzip" ${USE_SYSTEM_L
option(USE_WAYLAND_WSI "Set to ON to require Wayland support for Vulkan" ${USE_WAYLAND_WSI})
option(USE_ADDRESS_SANITIZER "Use Clang memory sanitizer" ${USE_ADDRESS_SANITIZER})
-if(UNIX AND NOT (APPLE OR ANDROID) AND VULKAN)
+if(UNIX AND NOT (APPLE OR ANDROID OR HAIKU) AND VULKAN)
add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
# add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
find_package(Wayland)
@@ -815,12 +819,20 @@ elseif(TARGET SDL2::SDL2)
set(TargetBin PPSSPPSDL)
# Require SDL
add_definitions(-DSDL)
- set(nativeExtra ${nativeExtra}
- SDL/SDLJoystick.h
- SDL/SDLJoystick.cpp
- SDL/SDLMain.cpp
- SDL/SDLGLGraphicsContext.cpp
- SDL/SDLVulkanGraphicsContext.cpp)
+ if(HAIKU)
+ set(nativeExtra ${nativeExtra}
+ SDL/SDLJoystick.h
+ SDL/SDLJoystick.cpp
+ SDL/SDLMain.cpp
+ SDL/SDLGLGraphicsContext.cpp)
+ else()
+ set(nativeExtra ${nativeExtra}
+ SDL/SDLJoystick.h
+ SDL/SDLJoystick.cpp
+ SDL/SDLMain.cpp
+ SDL/SDLGLGraphicsContext.cpp
+ SDL/SDLVulkanGraphicsContext.cpp)
+ endif()
set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
if(APPLE)
set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm)
@@ -882,13 +894,15 @@ set(THIN3D_PLATFORMS ext/native/thin3d/thin3d_gl.cpp
ext/native/thin3d/DataFormatGL.cpp
ext/native/thin3d/DataFormatGL.h)
-set(THIN3D_PLATFORMS ${THIN3D_PLATFORMS}
- ext/native/thin3d/thin3d_vulkan.cpp
- ext/native/thin3d/VulkanRenderManager.cpp
- ext/native/thin3d/VulkanRenderManager.h
- ext/native/thin3d/VulkanQueueRunner.cpp
- ext/native/thin3d/VulkanQueueRunner.h
- ext/native/thin3d/DataFormat.h)
+if(NOT HAIKU)
+ set(THIN3D_PLATFORMS ${THIN3D_PLATFORMS}
+ ext/native/thin3d/thin3d_vulkan.cpp
+ ext/native/thin3d/VulkanRenderManager.cpp
+ ext/native/thin3d/VulkanRenderManager.h
+ ext/native/thin3d/VulkanQueueRunner.cpp
+ ext/native/thin3d/VulkanQueueRunner.h
+ ext/native/thin3d/DataFormat.h)
+endif()
if(WIN32)
set(THIN3D_PLATFORMS ${THIN3D_PLATFORMS}
@@ -1071,6 +1085,8 @@ if(ANDROID)
target_link_libraries(native log EGL OpenSLES)
elseif(WIN32)
target_link_libraries(native ws2_32 winmm)
+elseif(HAIKU)
+ target_link_libraries(native network)
endif()
setup_target_project(native native)
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index 6517748..6bcb262 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -259,7 +259,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());
#else
@@ -277,7 +277,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());
#else
@@ -295,7 +295,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
@@ -314,6 +314,8 @@ std::string System_GetProperty(SystemProperty prop) {
return "SDL:Windows";
#elif __linux__
return "SDL:Linux";
+#elif __HAIKU__
+ return "SDL:Haiku";
#elif __APPLE__
return "SDL:OSX";
#else
@@ -455,6 +457,23 @@ int main(int argc, char *argv[]) {
}
}
+#ifdef __HAIKU__
+ char abs_exe_path[PATH_MAX];
+ char path_save[PATH_MAX];
+ char *p;
+
+ if(!(p = strrchr(argv[0], '/'))) {
+ getcwd(abs_exe_path, sizeof(abs_exe_path));
+ } else {
+ *p = '\0';
+ getcwd(path_save, sizeof(path_save));
+ chdir(argv[0]);
+ getcwd(abs_exe_path, sizeof(abs_exe_path));
+ chdir(path_save);
+ }
+ chdir(abs_exe_path);
+#endif
+
glslang::InitializeProcess();
#if PPSSPP_PLATFORM(RPI)
@@ -634,6 +653,7 @@ int main(int argc, char *argv[]) {
printf("GL init error '%s'\n", error_message.c_str());
}
graphicsContext = ctx;
+#ifndef __HAIKU__
} else if (g_Config.iGPUBackend == (int)GPUBackend::VULKAN) {
SDLVulkanGraphicsContext *ctx = new SDLVulkanGraphicsContext();
if (!ctx->Init(window, x, y, mode, &error_message)) {
@@ -647,6 +667,7 @@ int main(int argc, char *argv[]) {
} else {
graphicsContext = ctx;
}
+#endif
}
bool useEmuThread = g_Config.iGPUBackend == (int)GPUBackend::OPENGL;
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 7130c7d..d021b37 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -388,6 +388,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
// most sense.
g_Config.memStickDirectory = std::string(external_dir) + "/";
g_Config.flash0Directory = std::string(external_dir) + "/flash0/";
+#elif defined(__HAIKU__)
+ g_Config.memStickDirectory = "/boot/home/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/";
--
2.19.0
From 9d1b4021bb324e49785fc4176b3cfd69f91d92de Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 21 Sep 2018 22:39:43 +1000
Subject: Upstremed patchset for new ffmpeg support
diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp
index cf82e94..62832f6 100644
--- a/Core/HW/MediaEngine.cpp
+++ b/Core/HW/MediaEngine.cpp
@@ -455,6 +455,14 @@ bool MediaEngine::setVideoStream(int streamNum, bool force) {
return false;
}
AVCodecContext *m_pCodecCtx = m_pFormatCtx->streams[streamNum]->codec;
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57,33,100)
+ AVCodecParameters *m_pCodecPar = m_pFormatCtx->streams[streamNum]->codecpar;
+
+ // Update from deprecated public codec context
+ if (avcodec_parameters_from_context(m_pCodecPar, m_pCodecCtx) < 0) {
+ return false;
+ }
+#endif
// Find the decoder for the video stream
AVCodec *pCodec = avcodec_find_decoder(m_pCodecCtx->codec_id);
@@ -766,9 +774,8 @@ int MediaEngine::writeVideoImage(u32 bufferPtr, int frameWidth, int videoPixelMo
delete [] imgbuf;
}
-#ifndef MOBILE_DEVICE
CBreakPoints::ExecMemCheck(bufferPtr, true, videoImageSize, currentMIPS->pc);
-#endif
+
return videoImageSize;
#endif // USE_FFMPEG
return 0;
@@ -822,9 +829,7 @@ int MediaEngine::writeVideoImageWithRange(u32 bufferPtr, int frameWidth, int vid
writeVideoLineRGBA(imgbuf, data, width);
data += m_desWidth * sizeof(u32);
imgbuf += videoLineSize;
-#ifndef MOBILE_DEVICE
CBreakPoints::ExecMemCheck(bufferPtr + y * frameWidth * sizeof(u32), true, width * sizeof(u32), currentMIPS->pc);
-#endif
}
break;
@@ -834,9 +839,7 @@ int MediaEngine::writeVideoImageWithRange(u32 bufferPtr, int frameWidth, int vid
writeVideoLineABGR5650(imgbuf, data, width);
data += m_desWidth * sizeof(u16);
imgbuf += videoLineSize;
-#ifndef MOBILE_DEVICE
CBreakPoints::ExecMemCheck(bufferPtr + y * frameWidth * sizeof(u16), true, width * sizeof(u16), currentMIPS->pc);
-#endif
}
break;
@@ -846,9 +849,7 @@ int MediaEngine::writeVideoImageWithRange(u32 bufferPtr, int frameWidth, int vid
writeVideoLineABGR5551(imgbuf, data, width);
data += m_desWidth * sizeof(u16);
imgbuf += videoLineSize;
-#ifndef MOBILE_DEVICE
CBreakPoints::ExecMemCheck(bufferPtr + y * frameWidth * sizeof(u16), true, width * sizeof(u16), currentMIPS->pc);
-#endif
}
break;
@@ -858,9 +859,7 @@ int MediaEngine::writeVideoImageWithRange(u32 bufferPtr, int frameWidth, int vid
writeVideoLineABGR4444(imgbuf, data, width);
data += m_desWidth * sizeof(u16);
imgbuf += videoLineSize;
-#ifndef MOBILE_DEVICE
CBreakPoints::ExecMemCheck(bufferPtr + y * frameWidth * sizeof(u16), true, width * sizeof(u16), currentMIPS->pc);
-#endif
}
break;
@@ -954,9 +953,8 @@ int MediaEngine::getAudioSamples(u32 bufferPtr) {
if (!m_audioContext->Decode(audioFrame, frameSize, buffer, &outbytes)) {
ERROR_LOG(ME, "Audio (%s) decode failed during video playback", GetCodecName(m_audioType));
}
-#ifndef MOBILE_DEVICE
+
CBreakPoints::ExecMemCheck(bufferPtr, true, outbytes, currentMIPS->pc);
-#endif
}
return 0x2000;
--
2.19.0
From 5dcc808fa8bebf4d0edd18b4242e07186c5a0c2d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 22 Sep 2018 13:01:07 +1000
Subject: Tune default settings for Haiku
diff --git a/Core/Config.cpp b/Core/Config.cpp
index e2bde29..36b8e37 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -432,7 +432,7 @@ static int DefaultRenderingMode() {
static int DefaultInternalResolution() {
// Auto on Windows, 2x on large screens, 1x elsewhere.
-#if defined(USING_WIN_UI)
+#if defined(USING_WIN_UI) || defined(__HAIKU__)
return 0;
#else
int longestDisplaySide = std::max(System_GetPropertyInt(SYSPROP_DISPLAY_XRES), System_GetPropertyInt(SYSPROP_DISPLAY_YRES));
@@ -516,7 +516,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),
+#ifdef __HAIKU__
+ ReportedConfigSetting("FrameSkip", &g_Config.iFrameSkip, 1, true, true),
+#else
ReportedConfigSetting("FrameSkip", &g_Config.iFrameSkip, 0, true, true),
+#endif
ReportedConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, false, true, true),
ConfigSetting("FrameRate", &g_Config.iFpsLimit, 0, true, true),
ConfigSetting("FrameSkipUnthrottle", &g_Config.bFrameSkipUnthrottle, &DefaultFrameskipUnthrottle, true, false),
@@ -526,10 +530,17 @@ static ConfigSetting graphicsSettings[] = {
ReportedConfigSetting("ForceMaxEmulatedFPS", &g_Config.iForceMaxEmulatedFPS, 60, true, true),
// 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),
+#else
ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 4, true, true),
-
+#endif
ReportedConfigSetting("VertexDecCache", &g_Config.bVertexCache, &DefaultVertexCache, true, true),
+#ifdef __HAIKU__
+ ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, true, true, true),
+#else
ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, false, true, true),
+#endif
ReportedConfigSetting("TextureSecondaryCache", &g_Config.bTextureSecondaryCache, false, true, true),
ReportedConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, false),
@@ -563,7 +574,11 @@ static ConfigSetting graphicsSettings[] = {
ReportedConfigSetting("PostShader", &g_Config.sPostShaderName, "Off", true, true),
ReportedConfigSetting("MemBlockTransferGPU", &g_Config.bBlockTransferGPU, true, true, true),
+#ifdef __HAIKU__
+ ReportedConfigSetting("DisableSlowFramebufEffects", &g_Config.bDisableSlowFramebufEffects, true, true, true),
+#else
ReportedConfigSetting("DisableSlowFramebufEffects", &g_Config.bDisableSlowFramebufEffects, false, true, true),
+#endif
ReportedConfigSetting("FragmentTestCache", &g_Config.bFragmentTestCache, true, true, true),
ConfigSetting("GfxDebugOutput", &g_Config.bGfxDebugOutput, false, false, false),
--
2.19.0