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

mgba: bump to 0.8.1 and fix config directory (#4765)

Browse Source 
* mgba: bump to 0.8.1 and fix config directory

* mgba; remove test dependencies
This commit is contained in:
Crestwave
2020-03-01 09:26:24 +08:00
committed by GitHub
parent 001bcbf9bd
commit 3161b95c46
2 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
games-emulation/mgba/mgba-0.7.1.recipe → games-emulation/mgba/mgba-0.8.1.recipe
View File

@@ -9,12 +9,13 @@ most accurate GBA emulator around.
Other goals include accurate enough emulation to provide a development \
environment for homebrew software, a good workflow for tool-assist runners, \
and a modern feature set for emulators that older emulators may not support."
HOMEPAGE="https://mgba.io"
COPYRIGHT="2013-2017 Jeffrey Pfau"
HOMEPAGE="https://mgba.io/"
COPYRIGHT="2013-2020 Jeffrey Pfau"
LICENSE="MPL v2.0"
REVISION="5"
REVISION="1"
SOURCE_URI="https://github.com/mgba-emu/mgba/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="665fbae8bcfaf3e3f4b83267ce5800b00b98f4bacbb36fc412e3829020019cf4"
CHECKSUM_SHA256="df136ea50c9cca380ab93e00fd8d87811e41a49a804c5b0e018babef0c490f13"
PATCHES="mgba-$portVersion.patch"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -45,7 +46,6 @@ REQUIRES="
# SDL1.2 checks if one already exists first, so it's OK.
lib:libSDL_1.2$secondaryArchSuffix
lib:libswscale$secondaryArchSuffix
lib:libswresample$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libzip$secondaryArchSuffix
"
@@ -65,7 +65,6 @@ BUILD_REQUIRES="
devel:libQt5Widgets$secondaryArchSuffix
devel:libSDL_1.2$secondaryArchSuffix
devel:libswscale$secondaryArchSuffix
devel:libswresample$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libzip$secondaryArchSuffix
"
@@ -80,12 +79,17 @@ BUILD_PREREQUIRES="
BUILD()
{
cmake . -GNinja -DBUILD_GL=OFF $cmakeDirArgs
cmake . $cmakeDirArgs \
-GNinja \
-DBUILD_GL=OFF \
-DBUILD_GLES2=OFF \
-DBUILD_GLES3=OFF \
-DUSE_DISCORD_RPC=OFF
ninja $jobArgs
}
INSTALL()
{
ninja install
addAppDeskbarSymlink $binDir/mgba-qt "mGBA"
addAppDeskbarSymlink "$binDir/mgba-qt" "mGBA"
}

42
games-emulation/mgba/patches/mgba-0.8.1.patch Normal file
View File

@@ -0,0 +1,42 @@
diff --git a/src/core/config.c b/src/core/config.c
index cd173dfb..9135e0fc 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -27,6 +27,10 @@
#include <mgba-util/platform/3ds/3ds-vfs.h>
#endif
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#endif
+
#define SECTION_NAME_MAX 128
struct mCoreConfigEnumerateData {
@@ -227,6 +231,12 @@ void mCoreConfigDirectory(char* out, size_t outLength) {
UNUSED(portable);
snprintf(out, outLength, "/%s", projectName);
FSUSER_CreateDirectory(sdmcArchive, fsMakePath(PATH_ASCII, out), 0);
+#elif defined(__HAIKU__)
+ UNUSED(portable);
+ char path[B_PATH_NAME_LENGTH];
+ find_directory(B_USER_SETTINGS_DIRECTORY, 0, false, path, B_PATH_NAME_LENGTH);
+ snprintf(out, outLength, "%s/%s", path, binaryName);
+ mkdir(out, 0755);
#else
getcwd(out, outLength);
strncat(out, PATH_SEP "portable.ini", outLength - strlen(out));
diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp
index c6a598ce..f19130dd 100644
--- a/src/platform/qt/InputController.cpp
+++ b/src/platform/qt/InputController.cpp
@@ -272,8 +272,8 @@ void InputController::setPreferredGamepad(uint32_t type, int index) {
return;
}
#ifdef BUILD_SDL
- char name[34] = {0};
#if SDL_VERSION_ATLEAST(2, 0, 0)
+ char name[34] = {0};
SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick), name, sizeof(name));
#else
const char* name = SDL_JoystickName(SDL_JoystickIndex(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick));