diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-09-18 21:00:59 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-09-18 21:00:59 +0800 |
| commit | ade655194660a3337092c2bf298c436f745a1ec1 (patch) | |
| tree | c243254c07737ba76dda4e470e59288ac10efd47 /emulators/ppsspp | |
| parent | 6f68c0da321bc5e95d133248b69dec796e3676c8 (diff) | |
| download | freebsd-ports-gnome-ade655194660a3337092c2bf298c436f745a1ec1.tar.gz freebsd-ports-gnome-ade655194660a3337092c2bf298c436f745a1ec1.tar.zst freebsd-ports-gnome-ade655194660a3337092c2bf298c436f745a1ec1.zip | |
emulators/ppsspp: update to 1.3
Changes: http://ppsspp.org/#news
Diffstat (limited to 'emulators/ppsspp')
| -rw-r--r-- | emulators/ppsspp/Makefile | 4 | ||||
| -rw-r--r-- | emulators/ppsspp/distinfo | 13 | ||||
| -rw-r--r-- | emulators/ppsspp/files/patch-no-joystick | 53 | ||||
| -rw-r--r-- | emulators/ppsspp/files/patch-system-libpng16 | 11 |
4 files changed, 20 insertions, 61 deletions
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 5463c2576da9..f7e8c7220fdb 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -2,7 +2,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.2.2 +DISTVERSION?= 1.3 PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands @@ -23,7 +23,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard:DEFAULT,lang Kingcom:ext_armips GH_PROJECT= ${PORTNAME}-lang:lang armips:ext_armips -GH_TAGNAME?= 16a50e3:lang 9b225d9:ext_armips +GH_TAGNAME?= cdf4a8d:lang 1ffab37:ext_armips CONFLICTS_INSTALL?= ${PORTNAME}-devel-[0-9]* diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo index 7f22dc0dafe4..af7c391997ef 100644 --- a/emulators/ppsspp/distinfo +++ b/emulators/ppsspp/distinfo @@ -1,8 +1,9 @@ +TIMESTAMP = 1473519574 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.2.2_GH0.tar.gz) = 3992b9e91e601a91c1adb32f4832d06bc9069ef673163e1af904d1baf8688d38 -SIZE (hrydgard-ppsspp-v1.2.2_GH0.tar.gz) = 15136858 -SHA256 (hrydgard-ppsspp-lang-16a50e3_GH0.tar.gz) = aab8ef19179fd3f5ba53d13a957b40c9896ab2f1a7cd35f94d357c79a8612fcd -SIZE (hrydgard-ppsspp-lang-16a50e3_GH0.tar.gz) = 230285 -SHA256 (Kingcom-armips-9b225d9_GH0.tar.gz) = 76dd401235f1ff8624d1f6302f5f725676eedbba39fd54ad4a19ac4c7af81fdd -SIZE (Kingcom-armips-9b225d9_GH0.tar.gz) = 145559 +SHA256 (hrydgard-ppsspp-v1.3_GH0.tar.gz) = ada81d1bdbb0ec7d1395d3473602087767bb2deb2a8b015ddcfd1f5d08609a52 +SIZE (hrydgard-ppsspp-v1.3_GH0.tar.gz) = 15384301 +SHA256 (hrydgard-ppsspp-lang-cdf4a8d_GH0.tar.gz) = 32ddb92389fef5b9244e70f183d2977a28d95ac5db74b56eb66383f2bc70b157 +SIZE (hrydgard-ppsspp-lang-cdf4a8d_GH0.tar.gz) = 249259 +SHA256 (Kingcom-armips-1ffab37_GH0.tar.gz) = ebfcc89e2bc983330fa5131ecbd324812f4679c9f04134ffea8f2658780a1c64 +SIZE (Kingcom-armips-1ffab37_GH0.tar.gz) = 146794 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> |