Index: branches/2018Q4/emulators/ppsspp/Makefile =================================================================== --- branches/2018Q4/emulators/ppsspp/Makefile (revision 483768) +++ branches/2018Q4/emulators/ppsspp/Makefile (revision 483769) @@ -1,108 +1,104 @@ # $FreeBSD$ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.6.3 -PORTREVISION?= 3 +DISTVERSION?= 1.7.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/:.*//} -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= c783e7761c2a.patch:-p1 -PATCHFILES+= f2a75719d843.patch:-p1 -PATCHFILES+= 78a41980dfd7.patch:-p1 -PATCHFILES+= 7a7c655615a4.patch:-p1 - MAINTAINER= jbeich@FreeBSD.org COMMENT= PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS LICENSE= GPLv2+ LIB_DEPENDS= libzip.so:archivers/libzip \ libsnappy.so:archivers/snappy \ libavcodec.so:multimedia/ffmpeg RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard -GH_TUPLE?= hrydgard:glslang:2edde666:glslang/ext/glslang \ - hrydgard:${PORTNAME}-lang:1153a42: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 +GH_TUPLE?= hrydgard:glslang:29619b23:glslang/ext/glslang \ + hrydgard:${PORTNAME}-lang:f60be49:lang/assets/lang \ + KhronosGroup:SPIRV-Cross:be7425e:SPIRV/ext/SPIRV-Cross \ + Kingcom:armips:v0.10.0-22-g9efe336:armips/ext/armips \ + Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat \ + Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson \ + discordapp:discord-rpc:v3.3.0-15-g3d3ae71:discord_rpc/ext/discord-rpc CONFLICTS_INSTALL= ${PORTNAME}-* USES= cmake:outsource compiler:c++11-lib localbase:ldflags pkgconfig EXCLUDE= libzip zlib EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} USE_GL= gl glew glu USE_SDL= sdl2 # joystick CMAKE_ON= USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP SUB_FILES= pkg-message PORTDATA= assets ${PORTNAME} DESKTOP_ENTRIES="PPSSPP" \ "" \ "${PORTNAME}" \ "${PORTNAME} %f" \ "Game;Emulator;" \ "" OPTIONS_DEFINE= OLDJOY VULKAN OPTIONS_DEFAULT=VULKAN OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= QT5 SDL OPTIONS_SLAVE?= LIBRETRO 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_IMPLIES= SDL OLDJOY_DESC= Old joystick support with fixed button mappings (deprecated) OLDJOY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old-joy QT5_USES= qt:5 QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets QT5_CMAKE_BOOL= USING_QT_UI QT5_VARS= EXENAME=PPSSPPQt SDL_BUILD_DEPENDS= png>=1.6:graphics/png SDL_LIB_DEPENDS= libpng.so:graphics/png SDL_VARS= EXENAME=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"/"${GH_TAGNAME}"/' \ ${WRKSRC}/git-version.cmake do-install: # cmake doesn't pack assets into the app unlike qmake (cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDATA:N${PORTNAME}}" ${STAGEDIR}${DATADIR}) # Install the app alongside assets to avoid warnings with GetExeDirectory() ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${EXENAME} \ ${STAGEDIR}${DATADIR}/${PORTNAME} ${LN} -sf ../${DATADIR_REL}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 (cd ${WRKSRC}/icons && ${COPYTREE_SHARE} \ "hicolor" ${STAGEDIR}${PREFIX}/share/icons) ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${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 Index: branches/2018Q4/emulators/ppsspp/distinfo =================================================================== --- branches/2018Q4/emulators/ppsspp/distinfo (revision 483768) +++ branches/2018Q4/emulators/ppsspp/distinfo (revision 483769) @@ -1,23 +1,19 @@ -TIMESTAMP = 1528221521 +TIMESTAMP = 1541080274 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.6.3_GH0.tar.gz) = 366f8b3c545071d919e1f51a5c4e0da48ba55cf1c15ff8d78a90985b3d5e8eb3 -SIZE (hrydgard-ppsspp-v1.6.3_GH0.tar.gz) = 19477643 -SHA256 (hrydgard-glslang-2edde666_GH0.tar.gz) = 9ab09c2aa5a89b2c32297358d25850bec56667aa28fdfe6986fbedd1ced28e78 -SIZE (hrydgard-glslang-2edde666_GH0.tar.gz) = 1941913 -SHA256 (hrydgard-ppsspp-lang-1153a42_GH0.tar.gz) = a4a5a674fbfab8f19f0b420f9abbb2584dc45932deeb066ed4bdbdb8677787b2 -SIZE (hrydgard-ppsspp-lang-1153a42_GH0.tar.gz) = 477413 -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 (hrydgard-ppsspp-v1.7.1_GH0.tar.gz) = 4c325d585407f65b7b4012c407e3e2f246e57e821f780c3af12aa2874356f2bd +SIZE (hrydgard-ppsspp-v1.7.1_GH0.tar.gz) = 19484840 +SHA256 (hrydgard-glslang-29619b23_GH0.tar.gz) = d1779812444d1514701ae41e9f07ecf368a29a8ce43452ef17601494cd27e672 +SIZE (hrydgard-glslang-29619b23_GH0.tar.gz) = 2351816 +SHA256 (hrydgard-ppsspp-lang-f60be49_GH0.tar.gz) = 5dffccd8f5dcabcc37a8f7d3a634226f3591b79d8b483c6820720371e828dbbe +SIZE (hrydgard-ppsspp-lang-f60be49_GH0.tar.gz) = 534035 +SHA256 (KhronosGroup-SPIRV-Cross-be7425e_GH0.tar.gz) = a5a06eee313583289f697689a3b79579b6f3dc40c766520e905047dfa94aade1 +SIZE (KhronosGroup-SPIRV-Cross-be7425e_GH0.tar.gz) = 537750 +SHA256 (Kingcom-armips-v0.10.0-22-g9efe336_GH0.tar.gz) = 5cd6210447b4a03f22901304f8a19b77526908671bb6522621154267948ad865 +SIZE (Kingcom-armips-v0.10.0-22-g9efe336_GH0.tar.gz) = 197073 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 (c783e7761c2a.patch) = 588701f2e5ef299dad9ec820716791bfa2261f17516bae1d884138d58b64c872 -SIZE (c783e7761c2a.patch) = 1272 -SHA256 (f2a75719d843.patch) = 4a299603dd6c3f5143a7b2c455c948c7aa54af4ac60fcfd19b843fe7cf37db11 -SIZE (f2a75719d843.patch) = 1043 -SHA256 (78a41980dfd7.patch) = 9cfbc62c7e4f5a47ea88b854a83d3bd407a14f96c2b60bc3d190bdbc9266824b -SIZE (78a41980dfd7.patch) = 1577 -SHA256 (7a7c655615a4.patch) = 48d1ab7f59a2f2fdf7b53b55844d146639f8e638b9a92e92e6d75df56ffea66f -SIZE (7a7c655615a4.patch) = 1035 +SHA256 (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 45e801225dd7a8d09bde7e5a2dc52c18d630f07bbbec7587017ca19bac9446fe +SIZE (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 1054127 +SHA256 (discordapp-discord-rpc-v3.3.0-15-g3d3ae71_GH0.tar.gz) = fc329cac4553f0ff87ad488e9f8a318c73127a8b413e6de4fde9b562a88d8c5d +SIZE (discordapp-discord-rpc-v3.3.0-15-g3d3ae71_GH0.tar.gz) = 2107411 Index: branches/2018Q4/emulators/ppsspp/files/patch-CMakeLists.txt =================================================================== --- branches/2018Q4/emulators/ppsspp/files/patch-CMakeLists.txt (revision 483768) +++ branches/2018Q4/emulators/ppsspp/files/patch-CMakeLists.txt (nonexistent) @@ -1,23 +0,0 @@ -===> Building for ppsspp-qt5-1.4.2 -ninja: error: dependency cycle: cmake_object_order_depends_target_Core -> Core_autogen -> CMakeFiles/Core_autogen -> /wrkdirs/usr/ports/emulators/ppsspp-qt5/work/ppsspp-1.4.2/git-version.cpp -> cmake_object_order_depends_target_Core - -https://github.com/hrydgard/ppsspp/issues/9972 - ---- CMakeLists.txt.orig 2017-05-27 09:58:05 UTC -+++ CMakeLists.txt -@@ -1618,12 +1618,11 @@ endif() - - setup_target_project(${CoreLibName} Core) - --# Generate git-version.cpp at build time. --add_custom_target(GitVersion ALL -- DEPENDS something_that_never_exists) --add_custom_command(OUTPUT something_that_never_exists -+add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp - COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} - -P ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake) -+# Generate git-version.cpp at build time. -+add_custom_target(GitVersion DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp) - - set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp - PROPERTIES GENERATED TRUE) Property changes on: branches/2018Q4/emulators/ppsspp/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 =================================================================== --- branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 (revision 483768) +++ branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 (revision 483769) @@ -1,51 +1,62 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix ---- CMakeLists.txt.orig 2017-05-27 09:58:05 UTC +--- CMakeLists.txt.orig 2018-10-27 18:56:20 UTC +++ CMakeLists.txt -@@ -582,9 +582,10 @@ else() +@@ -663,9 +663,10 @@ else() set(LIBZIP_LIBRARY libzip) endif() -# FindPNG does a few things we don't want. So do it ourselves. Fixed to libpng17 -find_path(PNG_PNG_INCLUDE_DIR NAMES "libpng17/png.h") -find_library(PNG_LIBRARY NAMES png17 libpng17) +find_package(PkgConfig) +pkg_check_modules(PNG libpng>=1.6) +set(PNG_LIBRARY ${PNG_LIBRARIES}) +set(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS}) find_package(PackageHandleStandardArgs) find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR) if (PNG_FOUND) ---- Core/Screenshot.cpp.orig 2017-05-27 09:58:05 UTC +--- Core/Debugger/WebSocket/GPUBufferSubscriber.cpp.orig 2018-10-27 09:29:42 UTC ++++ Core/Debugger/WebSocket/GPUBufferSubscriber.cpp +@@ -17,7 +17,7 @@ + + #include + #ifndef USING_QT_UI +-#include ++#include "png.h" + #include + #endif + #include "data/base64.h" +--- Core/Screenshot.cpp.orig 2018-10-27 09:29:42 UTC +++ Core/Screenshot.cpp @@ -21,7 +21,7 @@ #ifdef USING_QT_UI #include #else -#include +#include "png.h" #include "ext/jpge/jpge.h" #endif ---- ext/native/image/png_load.cpp.orig 2017-05-27 09:58:05 UTC +--- Core/TextureReplacer.cpp.orig 2018-10-27 09:29:42 UTC ++++ Core/TextureReplacer.cpp +@@ -18,7 +18,7 @@ + #ifdef USING_QT_UI + #include + #else +-#include ++#include "png.h" + #endif + + #include +--- ext/native/image/png_load.cpp.orig 2018-10-27 09:29:42 UTC +++ ext/native/image/png_load.cpp @@ -5,7 +5,7 @@ #ifdef USING_QT_UI #include #else -#include "libpng17/png.h" +#include "png.h" #endif #include "png_load.h" ---- Core/TextureReplacer.cpp.orig 2017-05-27 09:58:05 UTC -+++ Core/TextureReplacer.cpp -@@ -16,7 +16,7 @@ - // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. - - #ifndef USING_QT_UI --#include -+#include "png.h" - #endif - - #include Index: branches/2018Q4/emulators/ppsspp-qt5/Makefile =================================================================== --- branches/2018Q4/emulators/ppsspp-qt5/Makefile (revision 483768) +++ branches/2018Q4/emulators/ppsspp-qt5/Makefile (revision 483769) @@ -1,12 +1,12 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp OPTIONS_SLAVE= QT5 # XXX https://github.com/hrydgard/ppsspp/blob/v1.6.3/Qt/QtMain.cpp#L533-L534 OPTIONS_EXCLUDE=VULKAN .include "${MASTERDIR}/Makefile" Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 483768) +++ branches/2018Q4 (revision 483769) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r483177,483768