emulators/rpcs3: update to 0.0.5.821

- Make BROKEN on FreeBSD 10.* as RPCS3 now requires C++17 <variant>
  and more bustage is expected in future

Changes:	https://github.com/RPCS3/rpcs3/compare/cd6bf37d0...bf89b709c

4 files changed, 52 insertions, 116 deletions

diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 4dd963a47601..e80292c4b33d 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.5-816
-DISTVERSIONSUFFIX=	-gcd6bf37d0
+DISTVERSION=	0.0.5-821
+DISTVERSIONSUFFIX=	-gbf89b709c
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -12,10 +12,11 @@ COMMENT=	PS3 emulator/debugger
 LICENSE=	BSD3CLAUSE BSL GPLv2 MIT ZLIB
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC_cereal}/LICENSE
-LICENSE_FILE_BSL=	${WRKSRC_Optional}/LICENSE
 LICENSE_FILE_MIT=	${WRKSRC_GSL}/LICENSE
 LICENSE_FILE_ZLIB=	${WRKSRC_asmjit}/LICENSE.md
 
+BROKEN_FreeBSD_10=	libc++ does not support C++17 features
+
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libavcodec.so:multimedia/ffmpeg
 
@@ -26,7 +27,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
 GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-26-g4c27501:hidapi/3rdparty/hidapi \
 		RPCS3:llvm:be9f7bfe2068:llvm/llvm \
-		akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \
 		Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \
 		jbeder:yaml-cpp:yaml-cpp-0.6.2-8-gc90c08c:yamlcpp/3rdparty/yaml-cpp \
 		kobalicek:asmjit:673dcef:asmjit/asmjit \
@@ -42,9 +42,6 @@ USE_QT=		qmake_build buildtools_build core dbus gui network widgets qml
 USE_XORG=	x11
 CMAKE_ON=	CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
 CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS
-EXTRA_PATCHES+=	${EXTRA_PATCHES_${COMPILER_FEATURES:Mlib*}_${OPSYS}_${OSREL}}
-EXTRA_PATCHES_libc++_FreeBSD_10.4=	${PATCHDIR}/extra-patch-c++14
-EXTRA_PATCHES_libc++_FreeBSD_11.1=	${PATCHDIR}/extra-patch-c++14
 CXXFLAGS+=	-Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config
 LDFLAGS+=	-Wl,--as-needed # GLU
 
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index 92e62e14e721..97e319dc7615 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,12 +1,10 @@
-TIMESTAMP = 1535671157
-SHA256 (RPCS3-rpcs3-v0.0.5-816-gcd6bf37d0_GH0.tar.gz) = aac5d7a0c35a7e3bfa6661aae4078ed513510a9f56a5fd519754c652762c4047
-SIZE (RPCS3-rpcs3-v0.0.5-816-gcd6bf37d0_GH0.tar.gz) = 4983857
+TIMESTAMP = 1535732034
+SHA256 (RPCS3-rpcs3-v0.0.5-821-gbf89b709c_GH0.tar.gz) = 4a5b59460b173ba873ff86f577b311d5ecf44608ca2739f5732e90c877ba31d7
+SIZE (RPCS3-rpcs3-v0.0.5-821-gbf89b709c_GH0.tar.gz) = 4979896
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 4f58ba2a51136cc6af0f1d833688b55f78468c4f5429a4bf9b38bb51c9d212b1
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 105372
 SHA256 (RPCS3-llvm-be9f7bfe2068_GH0.tar.gz) = 6fc805799e0853505ce786882e5856d018130fcca37206e7ef5fcef6b72937d3
 SIZE (RPCS3-llvm-be9f7bfe2068_GH0.tar.gz) = 42328799
-SHA256 (akrzemi1-Optional-f27e790_GH0.tar.gz) = d9f81fa3699b724812994897180365b7ee2fdef1549239d5086722bd4552baf1
-SIZE (akrzemi1-Optional-f27e790_GH0.tar.gz) = 16055
 SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95
 SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521
 SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.2-8-gc90c08c_GH0.tar.gz) = 97c3638ef39adb392199d51c4bb700201e15160f43f6da9f2d09c3e87f5c8c51
diff --git a/emulators/rpcs3/files/extra-patch-c++14 b/emulators/rpcs3/files/extra-patch-c++14
deleted file mode 100644
index 5cbc8b8a2161..000000000000
--- a/emulators/rpcs3/files/extra-patch-c++14
+++ /dev/null
@@ -1,104 +0,0 @@
-Downgrade to C++14 as libc++ < 5 doesn't support std::byte
-
---- Utilities/BEType.h.orig	2018-08-27 18:53:45 UTC
-+++ Utilities/BEType.h
-@@ -334,10 +334,14 @@ inline v128 operator~(const v128& other)
- template <typename T, std::size_t Align, std::size_t Size>
- struct se_storage
- {
-+#if __cplusplus < 201703L
-+	using type = std::aligned_storage_t<Size, Align>;
-+#else
- 	struct type
- 	{
- 		alignas(Align) std::byte data[Size];
- 	};
-+#endif
- 
- 	// Unoptimized generic byteswap for unaligned data
- 	static void reverse(u8* dst, const u8* src)
---- Utilities/types.h.orig	2018-08-27 18:53:45 UTC
-+++ Utilities/types.h
-@@ -91,7 +91,11 @@ using steady_clock = std::conditional<
- 
- namespace gsl
- {
-+#if __cplusplus < 201703L
-+	enum class byte : u8;
-+#else
- 	using std::byte;
-+#endif
- }
- 
- // Formatting helper, type-specific preprocessing for improving safety and functionality
-@@ -120,6 +124,8 @@ class atomic_t;
- 
- #if defined(__INTELLISENSE__) && !defined(_MSC_VER)
- namespace std { template <typename...> using void_t = void; }
-+#elif defined(_LIBCPP_VERSION) && __cplusplus < 201703L
-+namespace std { template <class...> using void_t = void; }
- #endif
- 
- // Extract T::simple_type if available, remove cv qualifiers
-@@ -770,7 +776,11 @@ struct value_hash
- template <template <typename> class TT, std::size_t S, std::size_t A = S>
- struct alignas(A) any_pod
- {
-+#if __cplusplus < 201703L
-+	std::aligned_storage_t<S, A> data;
-+#else
- 	alignas(A) std::byte data[S];
-+#endif
- 
- 	any_pod() = default;
- 
---- rpcs3/CMakeLists.txt.orig	2018-08-27 18:53:45 UTC
-+++ rpcs3/CMakeLists.txt
-@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1)
- 
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules")
- set(RES_FILES "")
--set(CMAKE_CXX_STANDARD 17)
-+set(CMAKE_CXX_STANDARD 14)
- include(CheckCXXCompilerFlag)
- 
- # Qt section
---- rpcs3/Emu/RSX/rsx_utils.h.orig	2018-08-27 18:53:45 UTC
-+++ rpcs3/Emu/RSX/rsx_utils.h
-@@ -6,7 +6,19 @@
- #include <atomic>
- #include <memory>
- #include <bitset>
-+#if __cplusplus < 201703L
-+#include <optional.hpp>
-+#else
- #include <optional>
-+#endif
-+
-+#if __cplusplus < 201703L
-+namespace std
-+{
-+	template<class T>
-+	using optional = experimental::optional<T>;
-+}
-+#endif
- 
- extern "C"
- {
---- rpcs3/stdafx.h.orig	2018-08-27 18:53:45 UTC
-+++ rpcs3/stdafx.h
-@@ -45,3 +45,14 @@ namespace std { inline namespace literals { inline nam
- #include <algorithm>
- 
- using namespace std::literals;
-+
-+#if __cplusplus < 201703L
-+namespace std
-+{
-+	template<typename T>
-+	constexpr const T clamp(const T value, const T min, const T max)
-+	{
-+		return value < min ? min : value > max ? max : value;
-+	}
-+}
-+#endif
diff --git a/emulators/rpcs3/files/patch-c++14 b/emulators/rpcs3/files/patch-c++14
new file mode 100644
index 000000000000..028e7b9dc4f4
--- /dev/null
+++ b/emulators/rpcs3/files/patch-c++14
@@ -0,0 +1,45 @@
+libc++ < 5 doesn't support std::byte, so use previous version
+
+--- Utilities/BEType.h.orig	2018-08-27 18:53:45 UTC
++++ Utilities/BEType.h
+@@ -334,10 +334,14 @@ inline v128 operator~(const v128& other)
+ template <typename T, std::size_t Align, std::size_t Size>
+ struct se_storage
+ {
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 5000
++	using type = std::aligned_storage_t<Size, Align>;
++#else
+ 	struct type
+ 	{
+ 		alignas(Align) std::byte data[Size];
+ 	};
++#endif
+ 
+ 	// Unoptimized generic byteswap for unaligned data
+ 	static void reverse(u8* dst, const u8* src)
+--- Utilities/types.h.orig	2018-08-27 18:53:45 UTC
++++ Utilities/types.h
+@@ -91,7 +91,11 @@ using steady_clock = std::conditional<
+ 
+ namespace gsl
+ {
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 5000
++	enum class byte : u8;
++#else
+ 	using std::byte;
++#endif
+ }
+ 
+ // Formatting helper, type-specific preprocessing for improving safety and functionality
+@@ -770,7 +776,11 @@ struct value_hash
+ template <template <typename> class TT, std::size_t S, std::size_t A = S>
+ struct alignas(A) any_pod
+ {
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 5000
++	std::aligned_storage_t<S, A> data;
++#else
+ 	alignas(A) std::byte data[S];
++#endif
+ 
+ 	any_pod() = default;
+