Date: Fri, 2 Nov 2018 05:07:18 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483769 - in branches/2018Q4/emulators: ppsspp ppsspp-qt5 ppsspp/files Message-ID: <201811020507.wA257Id0046197@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Nov 2 05:07:18 2018 New Revision: 483769 URL: https://svnweb.freebsd.org/changeset/ports/483769 Log: MFH: r483177 r483768 emulators/ppsspp: update to 1.7.1 Changes: http://ppsspp.org/#news Changes: https://github.com/hrydgard/ppsspp/compare/v1.6.3...v1.7.1 Approved by: ports-secteam (miwi) Deleted: branches/2018Q4/emulators/ppsspp/files/patch-CMakeLists.txt Modified: branches/2018Q4/emulators/ppsspp-qt5/Makefile branches/2018Q4/emulators/ppsspp/Makefile branches/2018Q4/emulators/ppsspp/distinfo branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/emulators/ppsspp-qt5/Makefile ============================================================================== --- branches/2018Q4/emulators/ppsspp-qt5/Makefile Fri Nov 2 03:06:30 2018 (r483768) +++ branches/2018Q4/emulators/ppsspp-qt5/Makefile Fri Nov 2 05:07:18 2018 (r483769) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp Modified: branches/2018Q4/emulators/ppsspp/Makefile ============================================================================== --- branches/2018Q4/emulators/ppsspp/Makefile Fri Nov 2 03:06:30 2018 (r483768) +++ branches/2018Q4/emulators/ppsspp/Makefile Fri Nov 2 05:07:18 2018 (r483769) @@ -2,20 +2,14 @@ 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 @@ -28,11 +22,13 @@ 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}-* Modified: branches/2018Q4/emulators/ppsspp/distinfo ============================================================================== --- branches/2018Q4/emulators/ppsspp/distinfo Fri Nov 2 03:06:30 2018 (r483768) +++ branches/2018Q4/emulators/ppsspp/distinfo Fri Nov 2 05:07:18 2018 (r483769) @@ -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 Modified: branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 ============================================================================== --- branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 Fri Nov 2 03:06:30 2018 (r483768) +++ branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 Fri Nov 2 05:07:18 2018 (r483769) @@ -1,8 +1,8 @@ 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() @@ -16,7 +16,18 @@ Make build glue accept libpng 1.6.x and don't hardcode 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 <algorithm> + #ifndef USING_QT_UI +-#include <libpng17/png.h> ++#include "png.h" + #include <zlib.h> + #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 @@ -27,7 +38,18 @@ Make build glue accept libpng 1.6.x and don't hardcode #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 <QtGui/QImage> + #else +-#include <libpng17/png.h> ++#include "png.h" + #endif + + #include <algorithm> +--- 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 @@ -38,14 +60,3 @@ Make build glue accept libpng 1.6.x and don't hardcode #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 <libpng17/png.h> -+#include "png.h" - #endif - - #include <algorithm>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811020507.wA257Id0046197>