diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 1f406bc8fd20..44c9fcb9f8b9 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -1,103 +1,104 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.16.6 +DISTVERSION?= 1.17.1 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/:.*//} MAINTAINER= ports@FreeBSD.org COMMENT= PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS WWW= https://www.ppsspp.org/ LICENSE= GPLv2+ # Bi-endian architectures default to big for some reason NOT_FOR_ARCHS= mips mips64 powerpc powerpc64 powerpcspe NOT_FOR_ARCHS_REASON= only little-endian is supported, see \ https://github.com/hrydgard/ppsspp/issues/8823 LIB_DEPENDS= libzip.so:archivers/libzip \ libsnappy.so:archivers/snappy \ libzstd.so:archivers/zstd \ libavcodec.so:multimedia/ffmpeg \ libminiupnpc.so:net/miniupnpc RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard GH_TUPLE?= hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \ google:cpu_features:v0.8.0-27-gfd4ffc1:cpu_features/ext/cpu_features \ + rtissera:libchdr:26d27ca:libchdr/ext/libchdr \ unknownbrackets:ppsspp-debugger:9776332:debugger/assets/debugger \ KhronosGroup:SPIRV-Cross:sdk-1.3.239.0:SPIRV/ext/SPIRV-Cross \ - Kingcom:armips:v0.11.0-188-g7bd1ec9:armips/ext/armips \ + Kingcom:armips:v0.11.0-195-ga8d71f0:armips/ext/armips \ Kingcom:filesystem:v1.3.2-12-g3f1c185:filesystem/ext/armips/ext/filesystem \ - RetroAchievements:rcheevos:v10.7.1-37-g24dc84c:rcheevos/ext/rcheevos \ + RetroAchievements:rcheevos:v11.0.0-26-ge7989c3:rcheevos/ext/rcheevos \ Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson CONFLICTS_INSTALL= ${PORTNAME}-* USES= cmake compiler:c++11-lib gl localbase:ldflags pkgconfig shared-mime-info EXCLUDE= libzip zlib EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} USE_GL= glew opengl CMAKE_ON= ${FFMPEG LIBZIP MINIUPNPC SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR CMAKE_OFF= USE_DISCORD LDFLAGS+= -Wl,--as-needed # ICE/SM/X11/Xext, Qt5Network SUB_FILES= pkg-message PORTDATA= assets DESKTOP_ENTRIES="PPSSPP" \ "" \ "${PORTNAME}" \ "${PORTNAME} %f" \ "Game;Emulator;" \ "" OPTIONS_DEFINE= VULKAN OPTIONS_DEFAULT=VULKAN OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= LIBRETRO QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${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_VARS= CONFLICTS_INSTALL= DESKTOP_ENTRIES= PLIST= PORTDATA= PKGMESSAGE= SUB_FILES= QT5_USES= elfctl qt:5 sdl QT5_USE= QT=qmake:build,buildtools:build,linguisttools:build,gui,multimedia,opengl,widgets QT5_USE+= SDL=sdl2 # audio, joystick QT5_CMAKE_BOOL= USING_QT_UI QT5_VARS= EXENAME=PPSSPPQt ELF_FEATURES=+wxneeded:PPSSPPQt SDL_CATEGORIES= wayland SDL_BUILD_DEPENDS= png>=1.6:graphics/png SDL_LIB_DEPENDS= libpng.so:graphics/png SDL_USES= elfctl sdl SDL_USE= SDL=sdl2 SDL_VARS= EXENAME=PPSSPPSDL ELF_FEATURES=+wxneeded:PPSSPPSDL VULKAN_DESC= Vulkan renderer VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader post-patch: @${REINPLACE_CMD} -e 's/Linux/${OPSYS}/' \ ${WRKSRC}/assets/gamecontrollerdb.txt @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/UI/NativeApp.cpp @${REINPLACE_CMD} -e 's/"unknown"/"${DISTVERSIONFULL}"/' \ ${WRKSRC}/git-version.cmake do-install-QT5-on do-install-SDL-on: ${MV} ${STAGEDIR}${PREFIX}/bin/${EXENAME} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \ ${STAGEDIR}${PREFIX}/share/man/man1 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 diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo index a99c6c6ea1ea..cdc57c2eb181 100644 --- a/emulators/ppsspp/distinfo +++ b/emulators/ppsspp/distinfo @@ -1,21 +1,23 @@ -TIMESTAMP = 1697106208 +TIMESTAMP = 1707052082 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.16.6_GH0.tar.gz) = d00de34506e030abae697ca19bc9d72ad5a9b34ee8292f008910944fb9a0fe37 -SIZE (hrydgard-ppsspp-v1.16.6_GH0.tar.gz) = 41517567 +SHA256 (hrydgard-ppsspp-v1.17.1_GH0.tar.gz) = dd65e7a317cd461386a1641ddf475686d8bdb2f408bdae910386d8b3ca6a8195 +SIZE (hrydgard-ppsspp-v1.17.1_GH0.tar.gz) = 41876096 SHA256 (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 8f002c902a5bc5a9d3c7e58b82ba2a6845ee08a01b756eaf4afefff806d109c7 SIZE (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 3689872 SHA256 (google-cpu_features-v0.8.0-27-gfd4ffc1_GH0.tar.gz) = 0bcb1a537b8fc184b9df9ddde9d15868efe7f651139ea84d3e20ac9900a43c60 SIZE (google-cpu_features-v0.8.0-27-gfd4ffc1_GH0.tar.gz) = 109044 +SHA256 (rtissera-libchdr-26d27ca_GH0.tar.gz) = 49e028fadd0640926da158408c9eafb22fc89ccb0de69c67b167ef0a11f6a0c5 +SIZE (rtissera-libchdr-26d27ca_GH0.tar.gz) = 4274377 SHA256 (unknownbrackets-ppsspp-debugger-9776332_GH0.tar.gz) = adc88664cb127b7797b03ffe07274096ac8ac037f143bf636b6208084c47e4d7 SIZE (unknownbrackets-ppsspp-debugger-9776332_GH0.tar.gz) = 810213 SHA256 (KhronosGroup-SPIRV-Cross-sdk-1.3.239.0_GH0.tar.gz) = a1695022880e7ef3c2d407647f79876045dc2a3ed012753adc71ead5cc5178ba SIZE (KhronosGroup-SPIRV-Cross-sdk-1.3.239.0_GH0.tar.gz) = 1707048 -SHA256 (Kingcom-armips-v0.11.0-188-g7bd1ec9_GH0.tar.gz) = 577ec512e9f400c94f018b17aa324aa0093c0e151d37d67f5754f6da1a996c2f -SIZE (Kingcom-armips-v0.11.0-188-g7bd1ec9_GH0.tar.gz) = 222958 +SHA256 (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 8a46d92b070de90cefcd89c2894344d040481e1cf6216b31f4a5e531254fed88 +SIZE (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 223306 SHA256 (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 9fa5a690e341bea1935a7f6b256e1bbd864abee988f834f10307f646dc38e604 SIZE (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 163401 -SHA256 (RetroAchievements-rcheevos-v10.7.1-37-g24dc84c_GH0.tar.gz) = 062412489cc63657d951404ede9e9060d9945c65728b12d171fba81b9af3bd04 -SIZE (RetroAchievements-rcheevos-v10.7.1-37-g24dc84c_GH0.tar.gz) = 610812 +SHA256 (RetroAchievements-rcheevos-v11.0.0-26-ge7989c3_GH0.tar.gz) = 9b1374b2c82c67850481dbee21946d5b4acb5c45d0284e85e58fa0e68f7d24f8 +SIZE (RetroAchievements-rcheevos-v11.0.0-26-ge7989c3_GH0.tar.gz) = 650457 SHA256 (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 45e801225dd7a8d09bde7e5a2dc52c18d630f07bbbec7587017ca19bac9446fe SIZE (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 1054127 diff --git a/emulators/ppsspp/files/patch-ffmpeg5 b/emulators/ppsspp/files/patch-ffmpeg5 index ac9b10457aff..4e9a92758ea0 100644 --- a/emulators/ppsspp/files/patch-ffmpeg5 +++ b/emulators/ppsspp/files/patch-ffmpeg5 @@ -1,105 +1,13 @@ https://github.com/hrydgard/ppsspp/issues/15308 ---- Core/AVIDump.cpp.orig 2023-01-03 10:14:31 UTC -+++ Core/AVIDump.cpp -@@ -91,7 +91,7 @@ bool AVIDump::CreateAVI() { - - bool AVIDump::CreateAVI() { - #ifdef USE_FFMPEG -- AVCodec *codec = nullptr; -+ const AVCodec *codec = nullptr; - - // Use gameID_EmulatedTimestamp for filename - std::string discID = g_paramSFO.GetDiscID(); ---- Core/HLE/sceAtrac.cpp.orig 2023-01-03 10:14:31 UTC -+++ Core/HLE/sceAtrac.cpp -@@ -123,6 +123,7 @@ extern "C" { - #ifdef USE_FFMPEG - - extern "C" { -+#include "libavcodec/avcodec.h" - #include "libavformat/avformat.h" - #include "libswresample/swresample.h" - #include "libavutil/samplefmt.h" ---- Core/HLE/sceMpeg.cpp.orig 2023-01-03 10:14:31 UTC -+++ Core/HLE/sceMpeg.cpp -@@ -108,6 +108,7 @@ extern "C" { - #ifdef USE_FFMPEG - - extern "C" { -+#include "libavcodec/avcodec.h" - #include "libavformat/avformat.h" - #include "libavutil/imgutils.h" - #include "libswscale/swscale.h" -@@ -801,7 +802,7 @@ static bool InitPmp(MpegContext * ctx){ - pmp_want_pix_fmt = AV_PIX_FMT_RGBA; - - // Create H264 video codec -- AVCodec * pmp_Codec = avcodec_find_decoder(AV_CODEC_ID_H264); -+ const AVCodec * pmp_Codec = avcodec_find_decoder(AV_CODEC_ID_H264); - if (pmp_Codec == NULL){ - ERROR_LOG(ME, "Can not find H264 codec, please update ffmpeg"); - return false; ---- Core/HW/MediaEngine.cpp.orig 2023-04-30 11:42:05 UTC -+++ Core/HW/MediaEngine.cpp -@@ -38,6 +38,10 @@ extern "C" { - #include "libavutil/imgutils.h" - #include "libswscale/swscale.h" - -+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 23, 100) -+ // private libavformat api (see demux.h in ffmpeg src tree) -+ void avpriv_stream_set_need_parsing(AVStream *st, enum AVStreamParseType type); -+#endif - } - #endif // USE_FFMPEG - -@@ -410,13 +414,19 @@ bool MediaEngine::addVideoStream(int streamNum, int st - #else - stream->request_probe = 0; - #endif -+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 23, 100) -+ avpriv_stream_set_need_parsing(stream, AVSTREAM_PARSE_FULL); -+#else - stream->need_parsing = AVSTREAM_PARSE_FULL; -+#endif - // We could set the width here, but we don't need to. - if (streamNum >= m_expectedVideoStreams) { - ++m_expectedVideoStreams; - } - -+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 33, 100) - m_codecsToClose.push_back(stream->codec); -+#endif - return true; - } - } -@@ -499,7 +509,7 @@ bool MediaEngine::setVideoStream(int streamNum, bool f - - AVStream *stream = m_pFormatCtx->streams[streamNum]; - #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100) -- AVCodec *pCodec = avcodec_find_decoder(stream->codecpar->codec_id); -+ const AVCodec *pCodec = avcodec_find_decoder(stream->codecpar->codec_id); - if (!pCodec) { - WARN_LOG_REPORT(ME, "Could not find decoder for %d", (int)stream->codecpar->codec_id); - return false; ---- Core/HW/SimpleAudioDec.cpp.orig 2023-01-03 10:14:31 UTC -+++ Core/HW/SimpleAudioDec.cpp -@@ -28,6 +28,7 @@ extern "C" { - #ifdef USE_FFMPEG - - extern "C" { -+#include "libavcodec/avcodec.h" - #include "libavformat/avformat.h" - #include "libswresample/swresample.h" - #include "libavutil/samplefmt.h" --- Core/HW/SimpleAudioDec.h.orig 2023-01-03 10:14:31 UTC +++ Core/HW/SimpleAudioDec.h @@ -78,7 +78,7 @@ class SimpleAudio { (private) int wanted_resample_freq; // wanted resampling rate/frequency AVFrame *frame_; - AVCodec *codec_; + const AVCodec *codec_; AVCodecContext *codecCtx_; SwrContext *swrCtx_;