diff options
| -rw-r--r-- | emulators/ppsspp-qt5/Makefile | 2 | ||||
| -rw-r--r-- | emulators/ppsspp/Makefile | 22 | ||||
| -rw-r--r-- | emulators/ppsspp/distinfo | 12 | ||||
| -rw-r--r-- | emulators/ppsspp/files/extra-patch-old-joy | 11 |
4 files changed, 20 insertions, 27 deletions
diff --git a/emulators/ppsspp-qt5/Makefile b/emulators/ppsspp-qt5/Makefile index ce0f451bc9d5..e436926eb3db 100644 --- a/emulators/ppsspp-qt5/Makefile +++ b/emulators/ppsspp-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index f2580a48198a..e4ccd46e78ba 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -2,17 +2,14 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.5.4 -PORTREVISION?= 1 +DISTVERSION?= 1.6 +PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage DISTFILES= ${PORTNAME}.1:manpage EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 70c54a7d1ab1.patch:-p1 - MAINTAINER= jbeich@FreeBSD.org COMMENT= PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS @@ -26,7 +23,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard GH_TUPLE?= hrydgard:glslang:2edde666:glslang/ext/glslang \ - hrydgard:${PORTNAME}-lang:1e3e4a0:lang/assets/lang \ + hrydgard:${PORTNAME}-lang:c2c4ad9:lang/assets/lang \ KhronosGroup:SPIRV-Cross:90966d5:SPIRV/ext/SPIRV-Cross \ Kingcom:armips:v0.9-89-g8b4cada:armips/ext/armips \ Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat @@ -38,7 +35,7 @@ EXCLUDE= libzip zlib EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} USE_GL= gl glew glu USE_SDL= sdl2 # joystick -CMAKE_ON= USE_SYSTEM_FFMPEG +CMAKE_ON= USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP CMAKE_OFF= USING_EGL SUB_FILES= pkg-message PORTDATA= assets ${PORTNAME} @@ -53,9 +50,13 @@ DESKTOP_ENTRIES="PPSSPP" \ OPTIONS_DEFINE= OLDJOY OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= QT5 SDL -OPTIONS_SLAVE?= SDL +OPTIONS_SLAVE?= LIBRETRO SDL OPTIONS_EXCLUDE:= ${OPTIONS_SINGLE_GUI} +LIBRETRO_DESC= libretro core for games/retroarch +LIBRETRO_CMAKE_BOOL= LIBRETRO +LIBRETRO_PLIST_FILES= lib/libretro/${PORTNAME}_libretro.so +LIBRETRO_IMPLIES= SDL OLDJOY_DESC= Old joystick support with fixed button mappings (deprecated) OLDJOY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old-joy QT5_USE= QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets @@ -90,4 +91,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/icons/icon-512.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg +do-install-LIBRETRO-on: + ${MKDIR} ${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H} + ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/${LIBRETRO_PLIST_FILES:T} \ + ${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H} + .include <bsd.port.mk> diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo index 4fa4b632e1b7..18cc6b1dcfa5 100644 --- a/emulators/ppsspp/distinfo +++ b/emulators/ppsspp/distinfo @@ -1,17 +1,15 @@ -TIMESTAMP = 1512481911 +TIMESTAMP = 1527337592 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.5.4_GH0.tar.gz) = e739155f135f9b3e2e5ce85d0cc11028c4ad71a0078673abe3f908ac6875284a -SIZE (hrydgard-ppsspp-v1.5.4_GH0.tar.gz) = 19008538 +SHA256 (hrydgard-ppsspp-v1.6_GH0.tar.gz) = d5f7f10b0d39cd927c08bb296a22c9b724ce40f8cc0be17136ff845f33b7ffa5 +SIZE (hrydgard-ppsspp-v1.6_GH0.tar.gz) = 19472093 SHA256 (hrydgard-glslang-2edde666_GH0.tar.gz) = 9ab09c2aa5a89b2c32297358d25850bec56667aa28fdfe6986fbedd1ced28e78 SIZE (hrydgard-glslang-2edde666_GH0.tar.gz) = 1941913 -SHA256 (hrydgard-ppsspp-lang-1e3e4a0_GH0.tar.gz) = 9b4f7356c5e17de9910a70f82d7ea5593db6d8b05e369ca2d8095d371f1ca9c3 -SIZE (hrydgard-ppsspp-lang-1e3e4a0_GH0.tar.gz) = 347352 +SHA256 (hrydgard-ppsspp-lang-c2c4ad9_GH0.tar.gz) = 6ba8b1cf10686ae141ed7d87480b4907a702eb2479f4e4e196cb612d2206a39e +SIZE (hrydgard-ppsspp-lang-c2c4ad9_GH0.tar.gz) = 477345 SHA256 (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = de8bcf01e0a0c4107871fdc8b764771487052fedbe2990a369e7908d4a95c000 SIZE (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = 228783 SHA256 (Kingcom-armips-v0.9-89-g8b4cada_GH0.tar.gz) = c41aa68bd6798356af568509de4f298485f752f620caae35ff84d17ff798b227 SIZE (Kingcom-armips-v0.9-89-g8b4cada_GH0.tar.gz) = 191171 SHA256 (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = d86b5b4592047254c5118d0639e51d00869b3adc2f2c5419fdf29381ca42011e SIZE (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = 22286 -SHA256 (70c54a7d1ab1.patch) = bb8cda9414a11fd611c6214e3c46d30ad373b3f1a68b3c8afb60311e830ca1c6 -SIZE (70c54a7d1ab1.patch) = 1111 diff --git a/emulators/ppsspp/files/extra-patch-old-joy b/emulators/ppsspp/files/extra-patch-old-joy index e70948bb2861..a540671f3b07 100644 --- a/emulators/ppsspp/files/extra-patch-old-joy +++ b/emulators/ppsspp/files/extra-patch-old-joy @@ -464,14 +464,3 @@ https://github.com/hrydgard/ppsspp/commit/ac0052c6af92 + + int getDeviceIndex(int instanceId); }; ---- ext/native/base/PCMain.cpp.orig 2017-10-04 19:26:40 UTC -+++ ext/native/base/PCMain.cpp -@@ -428,7 +428,7 @@ int main(int argc, char *argv[]) { - NativeGetAppInfo(&app_name, &app_name_nice, &landscape, &version); - - bool joystick_enabled = true; -- if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER | SDL_INIT_AUDIO) < 0) { -+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0) { - joystick_enabled = false; - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) { - fprintf(stderr, "Unable to initialize SDL: %s\n", SDL_GetError()); |