Index: branches/2018Q2/emulators/ppsspp/Makefile
===================================================================
--- branches/2018Q2/emulators/ppsspp/Makefile	(revision 472319)
+++ branches/2018Q2/emulators/ppsspp/Makefile	(revision 472320)
@@ -1,92 +1,93 @@
 # $FreeBSD$
 
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
 DISTVERSION?=	1.5.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 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+=	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:1e3e4a0: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
 
 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
 SUB_FILES=	pkg-message
 PORTDATA=	assets ${PORTNAME}
 
 DESKTOP_ENTRIES="PPSSPP" \
 		"" \
 		"${PORTNAME}" \
 		"${PORTNAME} %f" \
 		"Game;Emulator;" \
 		""
 
 OPTIONS_DEFINE=	OLDJOY
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_SINGLE_GUI}
 
 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
 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
 
 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
 
 .include <bsd.port.mk>
Index: branches/2018Q2/emulators/ppsspp/distinfo
===================================================================
--- branches/2018Q2/emulators/ppsspp/distinfo	(revision 472319)
+++ branches/2018Q2/emulators/ppsspp/distinfo	(revision 472320)
@@ -1,17 +1,19 @@
 TIMESTAMP = 1512481911
 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-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 (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 (c783e7761c2a.patch) = 588701f2e5ef299dad9ec820716791bfa2261f17516bae1d884138d58b64c872
 SIZE (c783e7761c2a.patch) = 1272
+SHA256 (7a7c655615a4.patch) = 48d1ab7f59a2f2fdf7b53b55844d146639f8e638b9a92e92e6d75df56ffea66f
+SIZE (7a7c655615a4.patch) = 1035
Index: branches/2018Q2/emulators/ppsspp/files/pkg-message.in
===================================================================
--- branches/2018Q2/emulators/ppsspp/files/pkg-message.in	(revision 472319)
+++ branches/2018Q2/emulators/ppsspp/files/pkg-message.in	(revision 472320)
@@ -1,7 +1,6 @@
 Known issues:
-- Videos are garbled since multimedia/ffmpeg update to 3.2, see #9026
 - %%DATADIR%%/assets/gamecontrollerdb.txt cannot be used
   as is because SDL_JoystickGetGUID is a stub on FreeBSD. Create the
   file using controllermap (or antimicro) then check with testgamecontroller
   it's detected (pay attention to guid). If you have trouble making it
   work try OLDJOY option for v1.3 behavior.
Index: branches/2018Q2/emulators/ppsspp-qt5/Makefile
===================================================================
--- branches/2018Q2/emulators/ppsspp-qt5/Makefile	(revision 472319)
+++ branches/2018Q2/emulators/ppsspp-qt5/Makefile	(revision 472320)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-qt5
 
 MASTERDIR=	${.CURDIR}/../ppsspp
 
 OPTIONS_SLAVE=	QT5
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 472319)
+++ branches/2018Q2	(revision 472320)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r472312,472319