8 files changed, 51 insertions, 32 deletions

diff --git a/MOVED b/MOVED
index 56a48162eb53..150c045a45f4 100644
--- a/MOVED
+++ b/MOVED
@@ -7822,7 +7822,6 @@ net/linc||2015-09-27|Has expired: Last release in 2003, not used by anything any
 net/linc-reference||2015-09-27|Has expired: Last release in 2003, not used by anything anymore
 x11/xlogout||2015-09-27|Has expired: Useless cruft from 1989
 net/rubygem-amq-client||2015-10-01|Has expired: Deprecated by Upstream. It is part of net/rubygem-amqp codebase now
-emulators/ppsspp-devel|emulators/ppsspp|2015-10-06|Out of date: use emulators/ppsspp for now
 ports-mgmt/bpm||2015-10-10|No support for pkg
 www/moodle27||2015-10-11|Has expired: Please upgrade to moodle28 or moodle29
 graphics/epeg|devel/efl|2015-10-11|Has expired: Merged into devel/efl
diff --git a/emulators/Makefile b/emulators/Makefile
index 7b794898dead..4e0c68342e72 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -110,7 +110,9 @@
     SUBDIR += pipelight
     SUBDIR += playonbsd
     SUBDIR += ppsspp
+    SUBDIR += ppsspp-devel
     SUBDIR += ppsspp-qt5
+    SUBDIR += ppsspp-qt5-devel
     SUBDIR += py-gns3-converter
     SUBDIR += py-nova
     SUBDIR += py-unicorn
diff --git a/emulators/ppsspp-devel/Makefile b/emulators/ppsspp-devel/Makefile
new file mode 100644
index 000000000000..b68fcc67f813
--- /dev/null
+++ b/emulators/ppsspp-devel/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+DISTVERSION=	1.4.2-463
+DISTVERSIONSUFFIX=	-g11f8bcc8a
+PORTREVISION?=	0
+PKGNAMESUFFIX?=	-devel
+
+GH_TUPLE=	hrydgard:glslang:136b1e2d:glslang/ext/glslang \
+		hrydgard:${PORTNAME}-lang:c31a1d3:lang/assets/lang \
+		KhronosGroup:SPIRV-Cross:90966d5:SPIRV/ext/SPIRV-Cross \
+		Kingcom:armips:v0.9-26-g770365d:armips/ext/armips \
+		Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat
+
+MASTERDIR=	${.CURDIR}/../ppsspp
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
+.include "${MASTERDIR}/Makefile"
diff --git a/emulators/ppsspp-devel/distinfo b/emulators/ppsspp-devel/distinfo
new file mode 100644
index 000000000000..b172c1e8d0c9
--- /dev/null
+++ b/emulators/ppsspp-devel/distinfo
@@ -0,0 +1,15 @@
+TIMESTAMP = 1506755177
+SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b
+SIZE (ppsspp.1) = 1598
+SHA256 (hrydgard-ppsspp-v1.4.2-463-g11f8bcc8a_GH0.tar.gz) = 1cafca6b9c83d20b4adb961095de208a6e236c1e67a549d84cc91544cb6ba77b
+SIZE (hrydgard-ppsspp-v1.4.2-463-g11f8bcc8a_GH0.tar.gz) = 18994696
+SHA256 (hrydgard-glslang-136b1e2d_GH0.tar.gz) = 430bd17420a0bf453c8b3f47ff19a58aadf5ae3e15cc773f2b833d60f0ecadea
+SIZE (hrydgard-glslang-136b1e2d_GH0.tar.gz) = 1767855
+SHA256 (hrydgard-ppsspp-lang-c31a1d3_GH0.tar.gz) = 6c007432d9af7ad9358710d54d13c66d80364db7b33ab018b76c87d92853c160
+SIZE (hrydgard-ppsspp-lang-c31a1d3_GH0.tar.gz) = 328423
+SHA256 (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = de8bcf01e0a0c4107871fdc8b764771487052fedbe2990a369e7908d4a95c000
+SIZE (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = 228783
+SHA256 (Kingcom-armips-v0.9-26-g770365d_GH0.tar.gz) = e6c52967082658082544f83875cc08e50227ff788d3553e0b0bc28abdb2615ed
+SIZE (Kingcom-armips-v0.9-26-g770365d_GH0.tar.gz) = 163606
+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
diff --git a/emulators/ppsspp-qt5-devel/Makefile b/emulators/ppsspp-qt5-devel/Makefile
new file mode 100644
index 000000000000..5730e4425111
--- /dev/null
+++ b/emulators/ppsspp-qt5-devel/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-qt5-devel
+
+MASTERDIR=	${.CURDIR}/../ppsspp-devel
+
+OPTIONS_SLAVE=	QT5
+
+.include "${MASTERDIR}/Makefile"
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index a521b6262a21..9102811c9f34 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -10,6 +10,11 @@ MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/do
 DISTFILES=	${PORTNAME}.1:manpage
 EXTRACT_ONLY=	${DISTFILES:N*\:manpage:C/:.*//}
 
+.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX:N*-devel}
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	e33acdc5e922.patch:-p1
+.endif
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS
 
diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo
index a57fad2a0925..52c7938dacbc 100644
--- a/emulators/ppsspp/distinfo
+++ b/emulators/ppsspp/distinfo
@@ -13,3 +13,5 @@ SHA256 (Kingcom-armips-v0.9-26-g770365d_GH0.tar.gz) = e6c52967082658082544f83875
 SIZE (Kingcom-armips-v0.9-26-g770365d_GH0.tar.gz) = 163606
 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 (e33acdc5e922.patch) = 26db4fe256c3947193b379ea7d17b0aae59e4339ae3822b53ef40fd6dca07004
+SIZE (e33acdc5e922.patch) = 1819
diff --git a/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp b/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp
deleted file mode 100644
index 8bb037d020fe..000000000000
--- a/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/hrydgard/ppsspp/pull/9857
-
---- Common/MemoryUtil.cpp.orig	2017-05-27 09:58:05 UTC
-+++ Common/MemoryUtil.cpp
-@@ -154,7 +154,7 @@ void *AllocateExecutableMemory(size_t size) {
- 	}
- #else
- 	static char *map_hint = 0;
--#if defined(_M_X64)
-+#if defined(_M_X64) && !defined(MAP_32BIT)
- 	// Try to request one that is close to our memory location if we're in high memory.
- 	// We use a dummy global variable to give us a good location to start from.
- 	if (!map_hint) {
-@@ -176,7 +176,7 @@ void *AllocateExecutableMemory(size_t size) {
- 	void* ptr = mmap(map_hint, size, prot,
- 		MAP_ANON | MAP_PRIVATE
- #if defined(_M_X64) && defined(MAP_32BIT)
--		| ((uintptr_t) map_hint == 0 ? MAP_32BIT : 0)
-+		| MAP_32BIT
- #endif
- 		, -1, 0);
- 
-@@ -193,7 +193,7 @@ void *AllocateExecutableMemory(size_t size) {
- 		ERROR_LOG(MEMMAP, "Failed to allocate executable memory (%d)", (int)size);
- 		PanicAlert("Failed to allocate executable memory\n%s", GetLastErrorMsg());
- 	}
--#if defined(_M_X64) && !defined(_WIN32)
-+#if defined(_M_X64) && !defined(MAP_32BIT) && !defined(_WIN32)
- 	else if ((uintptr_t)map_hint <= 0xFFFFFFFF) {
- 		// Round up if we're below 32-bit mark, probably allocating sequentially.
- 		map_hint += round_page(size);