emulators/rpcs3: update to 0.0.4.36

Changes:	https://github.com/RPCS3/rpcs3/compare/c435b328...75298f59

6 files changed, 9 insertions, 107 deletions

diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index b1bb8c3159ba..c24732f84c8e 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -2,9 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.4-14
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-gc435b328
+DISTVERSION=	0.0.4-36
+DISTVERSIONSUFFIX=	-g75298f59
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -26,12 +25,12 @@ ONLY_FOR_ARCHS_REASON=	requires int128 and SSSE3
 USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
 GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hidapi/3rdparty/hidapi \
-		RPCS3:pugixml:f205aaf:pugixml/3rdparty/pugixml \
 		RPCS3:yaml-cpp:release-0.5.3-62-g017626a:yamlcpp/Utilities/yaml-cpp \
 		akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \
 		kobalicek:asmjit:1370fe6:asmjit/asmjit \
 		Microsoft:GSL:fc5fce4:GSL/3rdparty/GSL \
-		USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal
+		USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \
+		zeux:pugixml:v1.8.1-148-g257fbb4:pugixml/3rdparty/pugixml
 
 USES=		cmake compiler:c++14-lang iconv:wchar_t localbase:ldflags \
 		openal:soft pkgconfig
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index 6cedd5ae1f6f..7936c363a5b5 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,10 +1,8 @@
-TIMESTAMP = 1510768802
-SHA256 (RPCS3-rpcs3-v0.0.4-14-gc435b328_GH0.tar.gz) = 4677caee19a192ec9490e76c6167d0d0a8eb9bc943b9bfddafb5232a36a3c874
-SIZE (RPCS3-rpcs3-v0.0.4-14-gc435b328_GH0.tar.gz) = 3562247
+TIMESTAMP = 1511203562
+SHA256 (RPCS3-rpcs3-v0.0.4-36-g75298f59_GH0.tar.gz) = c7d40457826988d62af10b7f839aa904c685376dd84802b86759cc0e8443b3f7
+SIZE (RPCS3-rpcs3-v0.0.4-36-g75298f59_GH0.tar.gz) = 3565642
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623
-SHA256 (RPCS3-pugixml-f205aaf_GH0.tar.gz) = 3b2a7e21625d8cbeb3aa1841b8816f6cab0752e89008b9fc67a325c800f153b5
-SIZE (RPCS3-pugixml-f205aaf_GH0.tar.gz) = 76332
 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841
 SIZE (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 65888
 SHA256 (akrzemi1-Optional-f27e790_GH0.tar.gz) = d9f81fa3699b724812994897180365b7ee2fdef1549239d5086722bd4552baf1
@@ -15,3 +13,5 @@ SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff240bf4dd3ef44ba8c832451376f
 SIZE (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 38809
 SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1
 SIZE (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 299883
+SHA256 (zeux-pugixml-v1.8.1-148-g257fbb4_GH0.tar.gz) = 0b37a212bd64ae2336b5f8401e44b0f5f8cb16460e80d1cd9bee1c6acdee0552
+SIZE (zeux-pugixml-v1.8.1-148-g257fbb4_GH0.tar.gz) = 539220
diff --git a/emulators/rpcs3/files/patch-Utilities_JIT.cpp b/emulators/rpcs3/files/patch-Utilities_JIT.cpp
deleted file mode 100644
index 870bddd99118..000000000000
--- a/emulators/rpcs3/files/patch-Utilities_JIT.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-FreeBSD ignores address hints with default RLIMIT_DATA
-
---- Utilities/JIT.cpp.orig	2017-07-20 15:05:34 UTC
-+++ Utilities/JIT.cpp
-@@ -30,6 +30,8 @@
- 
- #ifdef _WIN32
- #include <Windows.h>
-+#else
-+#include <sys/mman.h>
- #endif
- 
- #include "JIT.h"
-@@ -47,6 +49,11 @@ static void* const s_memory = []() -> void*
- 	llvm::InitializeNativeTargetAsmPrinter();
- 	LLVMLinkInMCJIT();
- 
-+#ifdef MAP_32BIT
-+	auto ptr = ::mmap(nullptr, s_memory_size, PROT_NONE, MAP_ANON | MAP_PRIVATE | MAP_32BIT, -1, 0);
-+	if (ptr != MAP_FAILED)
-+		return ptr;
-+#else
- 	for (u64 addr = 0x10000000; addr <= 0x80000000 - s_memory_size; addr += 0x1000000)
- 	{
- 		if (auto ptr = utils::memory_reserve(s_memory_size, (void*)addr))
-@@ -54,6 +61,7 @@ static void* const s_memory = []() -> void*
- 			return ptr;
- 		}
- 	}
-+#endif
- 
- 	return utils::memory_reserve(s_memory_size);
- }();
diff --git a/emulators/rpcs3/files/patch-Utilities_Thread.cpp b/emulators/rpcs3/files/patch-Utilities_Thread.cpp
deleted file mode 100644
index 8b98705703d8..000000000000
--- a/emulators/rpcs3/files/patch-Utilities_Thread.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-Utilities/Thread.cpp:1920:2: error: unknown type name 'cpu_set_t'; did you mean 'cpusetid_t'?
-        cpu_set_t cs;
-        ^~~~~~~~~
-        cpusetid_t
-/usr/include/sys/types.h:84:22: note: 'cpusetid_t' declared here
-typedef __cpusetid_t    cpusetid_t;
-                        ^
-Utilities/Thread.cpp:1921:2: error: use of undeclared identifier 'CPU_ZERO'
-        CPU_ZERO(&cs);
-        ^
-Utilities/Thread.cpp:1922:2: error: use of undeclared identifier 'CPU_SET'
-        CPU_SET(core, &cs);
-        ^
-Utilities/Thread.cpp:1923:48: error: unknown type name 'cpu_set_t'; did you mean 'cpusetid_t'?
-        pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cs);
-                                                      ^~~~~~~~~
-                                                      cpusetid_t
-
---- Utilities/Thread.cpp.orig	2017-11-15 18:00:02 UTC
-+++ Utilities/Thread.cpp
-@@ -25,6 +25,11 @@
- #include <sys/resource.h>
- #endif
- 
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
-+#include <pthread_np.h>
-+#define cpu_set_t cpuset_t
-+#endif
-+
- #include "sync.h"
- 
- thread_local u64 g_tls_fault_all = 0;
-@@ -1916,7 +1921,7 @@ void thread_ctrl::set_ideal_processor_core(int core)
- #ifdef _WIN32
- 	HANDLE _this_thread = GetCurrentThread();
- 	SetThreadIdealProcessor(_this_thread, core);
--#else
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
- 	cpu_set_t cs;
- 	CPU_ZERO(&cs);
- 	CPU_SET(core, &cs);
diff --git a/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt b/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt
deleted file mode 100644
index 4c8190e60a0b..000000000000
--- a/emulators/rpcs3/files/patch-rpcs3_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- rpcs3/CMakeLists.txt.orig	2017-09-19 12:07:07 UTC
-+++ rpcs3/CMakeLists.txt
-@@ -213,6 +213,9 @@ if(NOT WIN32 AND USE_VULKAN)
- 	if(VULKAN_FOUND)
- 		add_definitions(-DHAVE_VULKAN)
- 		list(APPEND ADDITIONAL_LIBS ${VULKAN_LIBRARY})
-+		if(VULKAN_PREBUILT)
-+			list(APPEND ADDITIONAL_LIBS glslang HLSL OGLCompiler SPIRV OSDependent)
-+		endif()
- 	else()
- 		message("WARNING! USE_VULKAN was enabled, but libvulkan was not found. RPCS3 will be compiled without Vulkan support.")
- 	endif()
diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp b/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp
deleted file mode 100644
index d7bafa8af579..000000000000
--- a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKCommonDecompiler.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp.orig	2017-09-19 12:07:07 UTC
-+++ rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp
-@@ -1,7 +1,7 @@
- #include "stdafx.h"
- #include "VKCommonDecompiler.h"
- #include "restore_new.h"
--#include "../../../../Vulkan/glslang/SPIRV/GlslangToSpv.h"
-+#include "SPIRV/GlslangToSpv.h"
- #include "define_new_memleakdetect.h"
- 
- namespace vk