Index: head/emulators/ppsspp/Makefile
===================================================================
--- head/emulators/ppsspp/Makefile	(revision 409346)
+++ head/emulators/ppsspp/Makefile	(revision 409347)
@@ -1,102 +1,102 @@
 # $FreeBSD$
 
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
-DISTVERSION?=	1.1.1
+DISTVERSION?=	1.2.1
 PORTREVISION?=	0
 CATEGORIES=	emulators
 # XXX Get from Debian once #697821 lands
 MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/1/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
 DISTFILES=	${PORTNAME}.1:manpage
 EXTRACT_ONLY=	${DISTFILES:N*\:manpage:C/:.*//}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libzip.so:${PORTSDIR}/archivers/libzip \
 		libsnappy.so:${PORTSDIR}/archivers/snappy \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrydgard:DEFAULT,lang Kingcom:ext_armips
 GH_PROJECT=	${PORTNAME}-lang:lang armips:ext_armips
-GH_TAGNAME?=	c0db1fc:lang a0b878f:ext_armips
+GH_TAGNAME?=	b7da552:lang 9b225d9:ext_armips
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-[0-9]*
 
 USES=		compiler:c++11-lib localbase pkgconfig
 EXCLUDE=	glew snappy libzip zlib
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 USE_GL=		glew glu
 USE_SDL=	sdl2 # joystick
 CMAKE_ARGS=	-DUSE_SYSTEM_FFMPEG=on
 QMAKE_SOURCE_PATH=	${WRKSRC}/Qt/PPSSPPQt.pro
 QMAKE_ARGS=	CONFIG+="system_ffmpeg" LREL_TOOL="${LRELEASE}"
 NINJA_VERBOSE=	yes
 NO_INSTALL=	yes # ports/202949
 
 DESKTOP_ENTRIES="PPSSPP" \
 		"" \
 		"${PORTNAME}" \
 		"${PORTNAME} %f" \
 		"Game;Emulator;" \
 		""
 
 OPTIONS_DEFAULT=QT5
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	QT4 QT5 SDL
 
 QT4_USES=	qmake:outsource
 QT4_USE=	QT4=qmake_build,moc_build,rcc_build,uic_build,linguisttools_build,gui,opengl
 QT5_USES=	qmake:outsource
 QT5_USE=	QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets
 SDL_USES=	cmake:outsource ninja
 SDL_BUILD_DEPENDS=	png>=1.6:${PORTSDIR}/graphics/png
 SDL_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 SDL_VARS=	PORTDATA+="assets ${PORTNAME}"
 
 post-extract:
 # Convert USE_GITHUB groups to git-submodule(1) paths
 .for group in ${GH_PROJECT:C/.*://}
 	@${RMDIR} ${WRKSRC}/${group:S,_,/,g}
 	@${MV} ${WRKSRC_${group}} ${WRKSRC}/${group:S,_,/,g}
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
 		${WRKSRC}/UI/NativeApp.cpp
 	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \
 		${WRKSRC}/Qt/*.pr*
 	@${REINPLACE_CMD} \
 		-e 's/"unknown"/"${GH_TAGNAME}"/' \
 		-e 's/^\(VERSION =\).*/\1 ${GH_TAGNAME}/' \
 		${WRKSRC}/git-version.cmake \
 		${WRKSRC}/Qt/Settings.pri
 
 do-install-SDL-on:
 # cmake doesn't pack assets into the app unlike qmake
 # XXX Convert to ${PORTDATA:N${PORTNAME}} once fmake is EOL
 	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDATA:Nppsspp}" ${STAGEDIR}${DATADIR})
 # Install the app alongside assets to avoid warnings with GetExeDirectory()
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME:tu}* \
 		${STAGEDIR}${DATADIR}/${PORTNAME}
 	${LN} -sf ${DATADIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 do-install-SDL-off:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 
 post-install:
 	${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 	(cd ${WRKSRC}/assets/unix-icons && ${COPYTREE_SHARE} \
 		"hicolor" ${STAGEDIR}${PREFIX}/share/icons)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/assets/unix-icons/icon-512.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
 
 .include <bsd.port.mk>
Index: head/emulators/ppsspp/distinfo
===================================================================
--- head/emulators/ppsspp/distinfo	(revision 409346)
+++ head/emulators/ppsspp/distinfo	(revision 409347)
@@ -1,8 +1,8 @@
 SHA256 (ppsspp.1) = 8e335555393a6400c97d5f6d23798af801f88b909181bb5af676dfdcb4f8f8be
 SIZE (ppsspp.1) = 1507
-SHA256 (hrydgard-ppsspp-v1.1.1_GH0.tar.gz) = 4bcd1cc1b3b1f50f5ebbde8dfd47aceffebc07624c03ea651e80c87ce5f68cc8
-SIZE (hrydgard-ppsspp-v1.1.1_GH0.tar.gz) = 14771667
-SHA256 (hrydgard-ppsspp-lang-c0db1fc_GH0.tar.gz) = 0eb8e2a076e3d1920a76420e1f6d470d8b34a5eba227a744e0828fa7602192bd
-SIZE (hrydgard-ppsspp-lang-c0db1fc_GH0.tar.gz) = 214596
-SHA256 (Kingcom-armips-a0b878f_GH0.tar.gz) = 64623bbddda609f9692904e6b6823b1d2d4dd0149349f2be9edcc600bf12bafa
-SIZE (Kingcom-armips-a0b878f_GH0.tar.gz) = 136535
+SHA256 (hrydgard-ppsspp-v1.2.1_GH0.tar.gz) = 20c086b1f104a45a9aa2226342f7aaf58e569b6152527c7c87cb787a6c5834cd
+SIZE (hrydgard-ppsspp-v1.2.1_GH0.tar.gz) = 15062700
+SHA256 (hrydgard-ppsspp-lang-b7da552_GH0.tar.gz) = d268a3adad33e99f05262c71d7d8390e5ac104ad953972fc0068ba6d0d131e60
+SIZE (hrydgard-ppsspp-lang-b7da552_GH0.tar.gz) = 228103
+SHA256 (Kingcom-armips-9b225d9_GH0.tar.gz) = 76dd401235f1ff8624d1f6302f5f725676eedbba39fd54ad4a19ac4c7af81fdd
+SIZE (Kingcom-armips-9b225d9_GH0.tar.gz) = 145559
Index: head/emulators/ppsspp/files/patch-Core_Screenshot.cpp
===================================================================
--- head/emulators/ppsspp/files/patch-Core_Screenshot.cpp	(revision 409346)
+++ head/emulators/ppsspp/files/patch-Core_Screenshot.cpp	(nonexistent)
@@ -1,11 +0,0 @@
---- Core/Screenshot.cpp.orig	2015-02-26 20:05:06 UTC
-+++ Core/Screenshot.cpp
-@@ -18,7 +18,7 @@
- #ifdef USING_QT_UI
- #include <QtGui/QImage>
- #else
--#include <libpng17/png.h>
-+#include "png.h"
- #include "ext/jpge/jpge.h"
- #endif
- 

Property changes on: head/emulators/ppsspp/files/patch-Core_Screenshot.cpp
___________________________________________________________________
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: head/emulators/ppsspp/files/patch-CMakeLists.txt
===================================================================
--- head/emulators/ppsspp/files/patch-CMakeLists.txt	(revision 409346)
+++ head/emulators/ppsspp/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,16 +0,0 @@
---- CMakeLists.txt.orig	2015-02-26 20:05:06 UTC
-+++ CMakeLists.txt
-@@ -525,9 +527,10 @@ target_link_libraries(libzip ${ZLIB_LIBR
- include_directories(native/ext/libzip)
- set(LIBZIP_LIBRARY libzip)
- 
--# 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)

Property changes on: head/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: head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp
===================================================================
--- head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp	(revision 409346)
+++ head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp	(nonexistent)
@@ -1,37 +0,0 @@
---- ext/xbrz/xbrz.cpp.orig	2015-05-28 17:02:46 UTC
-+++ ext/xbrz/xbrz.cpp
-@@ -648,23 +648,21 @@ void scalePixel(const Kernel_3x3& ker,
- 		auto eq   = [&](uint32_t pix1, uint32_t pix2) { return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight_) < cfg.equalColorTolerance_; };
- 		auto dist = [&](uint32_t pix1, uint32_t pix2) { return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight_); };
- 
--		const bool doLineBlend = [&]() -> bool
--		{
-+		bool doLineBlend;
-+
- 			if (getBottomR(blend) >= BLEND_DOMINANT)
--				return true;
-+				doLineBlend = true;
- 
- 			//make sure there is no second blending in an adjacent rotation for this pixel: handles insular pixels, mario eyes
--			if (getTopR(blend) != BLEND_NONE && !eq(e, g)) //but support double-blending for 90° corners
--				return false;
--			if (getBottomL(blend) != BLEND_NONE && !eq(e, c))
--				return false;
--
-+			else if (getTopR(blend) != BLEND_NONE && !eq(e, g)) //but support double-blending for 90° corners
-+				doLineBlend = false;
-+			else if (getBottomL(blend) != BLEND_NONE && !eq(e, c))
-+				doLineBlend = false;
- 			//no full blending for L-shapes; blend corner only (handles "mario mushroom eyes")
--			if (!eq(e, i) && eq(g, h) && eq(h , i) && eq(i, f) && eq(f, c))
--				return false;
--
--			return true;
--		}();
-+			else if (!eq(e, i) && eq(g, h) && eq(h, i) && eq(i, f) && eq(f, c))
-+				doLineBlend = false;
-+			else
-+				doLineBlend = true;
- 
- 		const uint32_t px = dist(e, f) <= dist(e, h) ? f : h; //choose most similar color
- 

Property changes on: head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp
___________________________________________________________________
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: head/emulators/ppsspp/files/patch-ext_native_image_png__load.cpp
===================================================================
--- head/emulators/ppsspp/files/patch-ext_native_image_png__load.cpp	(revision 409346)
+++ head/emulators/ppsspp/files/patch-ext_native_image_png__load.cpp	(nonexistent)
@@ -1,11 +0,0 @@
---- ext/native/image/png_load.cpp.orig	2015-09-06 20:37:59 UTC
-+++ ext/native/image/png_load.cpp
-@@ -5,7 +5,7 @@
- #ifdef USING_QT_UI
- #include <QtGui/QImage>
- #else
--#include "libpng17/png.h"
-+#include "png.h"
- #endif
- 
- #include "png_load.h"

Property changes on: head/emulators/ppsspp/files/patch-ext_native_image_png__load.cpp
___________________________________________________________________
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: head/emulators/ppsspp/files/patch-system-libpng16
===================================================================
--- head/emulators/ppsspp/files/patch-system-libpng16	(nonexistent)
+++ head/emulators/ppsspp/files/patch-system-libpng16	(revision 409347)
@@ -0,0 +1,40 @@
+Make build glue accept libpng 1.6.x and don't hardcode suffix
+
+--- CMakeLists.txt.orig	2015-11-19 15:07:48 UTC
++++ CMakeLists.txt
+@@ -709,9 +709,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	2015-02-26 20:05:06 UTC
++++ Core/Screenshot.cpp
+@@ -18,7 +18,7 @@
+ #ifdef USING_QT_UI
+ #include <QtGui/QImage>
+ #else
+-#include <libpng17/png.h>
++#include "png.h"
+ #include "ext/jpge/jpge.h"
+ #endif
+ 
+--- ext/native/image/png_load.cpp.orig	2015-09-06 20:37:59 UTC
++++ ext/native/image/png_load.cpp
+@@ -5,7 +5,7 @@
+ #ifdef USING_QT_UI
+ #include <QtGui/QImage>
+ #else
+-#include "libpng17/png.h"
++#include "png.h"
+ #endif
+ 
+ #include "png_load.h"

Property changes on: head/emulators/ppsspp/files/patch-system-libpng16
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property