emulators/ppsspp: update to 1.8.0

Changes:	http://ppsspp.org/#news
Changes:	https://github.com/hrydgard/ppsspp/compare/v1.7.5...v1.8.0

4 files changed, 20 insertions, 36 deletions

diff --git a/emulators/ppsspp-devel/Makefile b/emulators/ppsspp-devel/Makefile
index f949bea49beb..ec24be05909d 100644
--- a/emulators/ppsspp-devel/Makefile
+++ b/emulators/ppsspp-devel/Makefile
@@ -10,15 +10,7 @@ GH_TUPLE=	hrydgard:glslang:9983f99e:glslang/ext/glslang \
 		KhronosGroup:SPIRV-Cross:be7425e:SPIRV/ext/SPIRV-Cross \
 		Kingcom:armips:v0.10.0-28-g7885552:armips/ext/armips
 
-CMAKE_OFF=	USE_DISCORD
-
 MASTERDIR=	${.CURDIR}/../ppsspp
 DISTINFO_FILE?=	${.CURDIR}/distinfo
 
-pre-patch:	slave-pre-patch
-slave-pre-patch:
-# Avoid copying entire ${PATCHDIR} just for removed code
-	@${REINPLACE_CMD} -e '/SIMULATOR/s/ARM_DEVICE/ARM/' \
-		${WRKSRC}/CMakeLists.txt
-
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index bb0c97a6f69b..0497d5d9b081 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
-DISTVERSION?=	1.7.5
-PORTREVISION?=	1
+DISTVERSION?=	1.8.0
+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
@@ -22,13 +22,10 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrydgard
-GH_TUPLE?=	hrydgard:glslang:29619b23:glslang/ext/glslang \
-		hrydgard:${PORTNAME}-lang:7ea29e4:lang/assets/lang \
+GH_TUPLE?=	hrydgard:glslang:9983f99e:glslang/ext/glslang \
+		hrydgard:${PORTNAME}-lang:18e0d46: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
+		Kingcom:armips:v0.10.0-28-g7885552:armips/ext/armips
 
 CONFLICTS_INSTALL=	${PORTNAME}-*
 
@@ -38,6 +35,7 @@ EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 USE_GL=		gl glew glu
 USE_SDL=	sdl2 # joystick
 CMAKE_ON=	USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP
+CMAKE_OFF=	USE_DISCORD
 SUB_FILES=	pkg-message
 PORTDATA=	assets ${PORTNAME}
 
diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo
index ae84872fbbdb..dd2082df1953 100644
--- a/emulators/ppsspp/distinfo
+++ b/emulators/ppsspp/distinfo
@@ -1,19 +1,13 @@
-TIMESTAMP = 1543931019
+TIMESTAMP = 1552550450
 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b
 SIZE (ppsspp.1) = 1598
-SHA256 (hrydgard-ppsspp-v1.7.5_GH0.tar.gz) = 85506e2db4e12e584fa3fc7aefe9ece039614ef2989ede8ff5489bfc04476842
-SIZE (hrydgard-ppsspp-v1.7.5_GH0.tar.gz) = 19487276
-SHA256 (hrydgard-glslang-29619b23_GH0.tar.gz) = d1779812444d1514701ae41e9f07ecf368a29a8ce43452ef17601494cd27e672
-SIZE (hrydgard-glslang-29619b23_GH0.tar.gz) = 2351816
-SHA256 (hrydgard-ppsspp-lang-7ea29e4_GH0.tar.gz) = a3af6e899de75fb3f8a354d1b0e20abd7119225fc68c83da56a59a2d4e19a27e
-SIZE (hrydgard-ppsspp-lang-7ea29e4_GH0.tar.gz) = 534957
+SHA256 (hrydgard-ppsspp-v1.8.0_GH0.tar.gz) = a7011feb0480a352d60e6a3c939d88d4d2e3a2e76620886b183aa2cb36f910de
+SIZE (hrydgard-ppsspp-v1.8.0_GH0.tar.gz) = 19636576
+SHA256 (hrydgard-glslang-9983f99e_GH0.tar.gz) = cf5cef6113b13461881c6d1a962900b4f2c1b9d53db723620034d1b61f9c4d4c
+SIZE (hrydgard-glslang-9983f99e_GH0.tar.gz) = 2493444
+SHA256 (hrydgard-ppsspp-lang-18e0d46_GH0.tar.gz) = 660424581e8c9c7d454534c696c2d4737336d7ef827ae65799eb3fb0926536ae
+SIZE (hrydgard-ppsspp-lang-18e0d46_GH0.tar.gz) = 537066
 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 (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
+SHA256 (Kingcom-armips-v0.10.0-28-g7885552_GH0.tar.gz) = 040a8d01b1c0e65b77ede9dd6713b6f6290346a29d300138454335362a396d6c
+SIZE (Kingcom-armips-v0.10.0-28-g7885552_GH0.tar.gz) = 197207
diff --git a/emulators/ppsspp/files/patch-no-egl b/emulators/ppsspp/files/patch-no-egl
index 962d800fc960..c965ceb3415d 100644
--- a/emulators/ppsspp/files/patch-no-egl
+++ b/emulators/ppsspp/files/patch-no-egl
@@ -1,14 +1,14 @@
 EGL hangs on X11 and doesn't build without GLESv2.
 https://github.com/hrydgard/ppsspp/issues/10626
 
---- CMakeLists.txt.orig	2017-12-05 13:51:51 UTC
+--- CMakeLists.txt.orig	2019-03-14 08:00:50 UTC
 +++ CMakeLists.txt
-@@ -56,12 +56,6 @@ include(ccache)
- # Remove soon?
- set(USE_FFMPEG ON)
+@@ -65,12 +65,6 @@ if(MINGW AND NOT DEFINED USE_SYSTEM_FFMPEG)
+ 	set(USE_SYSTEM_FFMPEG ON)
+ endif()
  
 -if(NOT ANDROID AND NOT IOS)
--	if(ARM OR SIMULATOR)
+-	if(ARM_DEVICE OR SIMULATOR)
 -		set(USING_EGL ON)
 -	endif()
 -endif()