diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-09-18 13:00:59 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-09-18 13:00:59 +0000 |
| commit | 7c46d8348463bbcb85c99f43b9ab13c83eb61667 (patch) | |
| tree | c243254c07737ba76dda4e470e59288ac10efd47 /emulators/ppsspp/files | |
| parent | net-mgmt/zabbix3-server: fix database selection (diff) | |
emulators/ppsspp: update to 1.3
Changes: http://ppsspp.org/#news
Diffstat (limited to 'emulators/ppsspp/files')
| -rw-r--r-- | emulators/ppsspp/files/patch-no-joystick | 53 | ||||
| -rw-r--r-- | emulators/ppsspp/files/patch-system-libpng16 | 11 |
2 files changed, 11 insertions, 53 deletions
diff --git a/emulators/ppsspp/files/patch-no-joystick b/emulators/ppsspp/files/patch-no-joystick deleted file mode 100644 index 60b398427645..000000000000 --- a/emulators/ppsspp/files/patch-no-joystick +++ /dev/null @@ -1,53 +0,0 @@ -commit 3fc255b -Author: Henrik Rydgård <hrydgard@gmail.com> -Date: Sat Jul 9 09:15:11 2016 +0200 - - Make it possible to run even if SDL was built with joystick disabled. Should fix #8851. ---- - ext/native/base/PCMain.cpp | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git ext/native/base/PCMain.cpp ext/native/base/PCMain.cpp -index cead0d7..00ec49a 100644 ---- ext/native/base/PCMain.cpp -+++ ext/native/base/PCMain.cpp -@@ -426,9 +426,13 @@ int main(int argc, char *argv[]) { - - net::Init(); - -+ bool joystick_enabled = true; - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0) { -- fprintf(stderr, "Unable to initialize SDL: %s\n", SDL_GetError()); -- return 1; -+ joystick_enabled = false; -+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) { -+ fprintf(stderr, "Unable to initialize SDL: %s\n", SDL_GetError()); -+ return 1; -+ } - } - - #ifdef __APPLE__ -@@ -659,7 +663,11 @@ int main(int argc, char *argv[]) { - // Audio must be unpaused _after_ NativeInit() - SDL_PauseAudio(0); - #ifndef _WIN32 -- joystick = new SDLJoystick(); -+ if (joystick_enabled) { -+ joystick = new SDLJoystick(); -+ } else { -+ joystick = nullptr; -+ } - #endif - EnableFZ(); - -@@ -848,7 +856,9 @@ int main(int argc, char *argv[]) { - break; - default: - #ifndef _WIN32 -- joystick->ProcessInput(event); -+ if (joystick) { -+ joystick->ProcessInput(event); -+ } - #endif - break; - } diff --git a/emulators/ppsspp/files/patch-system-libpng16 b/emulators/ppsspp/files/patch-system-libpng16 index 49ba2533067f..efc8393d8821 100644 --- a/emulators/ppsspp/files/patch-system-libpng16 +++ b/emulators/ppsspp/files/patch-system-libpng16 @@ -38,3 +38,14 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix #endif #include "png_load.h" +--- Core/TextureReplacer.cpp.orig 2016-05-03 00:47:54 UTC ++++ Core/TextureReplacer.cpp +@@ -16,7 +16,7 @@ + // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. + + #ifndef USING_QT_UI +-#include <libpng17/png.h> ++#include "png.h" + #endif + + #include <algorithm> |