emulators/rpcs3: update to 0.0.5.838

- Amend libc++ instead of reverting to pre-C++17 bits on FreeBSD 11.1

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

4 files changed, 40 insertions, 50 deletions

diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index f7ba70c9c619..8a3596c1ae2d 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.5-821
-DISTVERSIONSUFFIX=	-gbf89b709c
+DISTVERSION=	0.0.5-838
+DISTVERSIONSUFFIX=	-gca5158a03
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index 97e319dc7615..a55e127e8480 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,6 +1,6 @@
-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
+TIMESTAMP = 1536004836
+SHA256 (RPCS3-rpcs3-v0.0.5-838-gca5158a03_GH0.tar.gz) = befa96215f572402617bcd054f39974ef03222db044185a23be38df8e5d08650
+SIZE (RPCS3-rpcs3-v0.0.5-838-gca5158a03_GH0.tar.gz) = 4978234
 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
diff --git a/emulators/rpcs3/files/patch-c++14 b/emulators/rpcs3/files/patch-c++14
deleted file mode 100644
index 028e7b9dc4f4..000000000000
--- a/emulators/rpcs3/files/patch-c++14
+++ /dev/null
@@ -1,45 +0,0 @@
-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;
- 
diff --git a/emulators/rpcs3/files/patch-libc++ b/emulators/rpcs3/files/patch-libc++
new file mode 100644
index 000000000000..3f7380095681
--- /dev/null
+++ b/emulators/rpcs3/files/patch-libc++
@@ -0,0 +1,35 @@
+Add missing bits from later libc++ versions. Remove after FreeBSD 11.1 EOL.
+
+--- Utilities/types.h.orig	2018-09-03 20:00:36 UTC
++++ Utilities/types.h
+@@ -83,6 +83,30 @@ using steady_clock = std::conditional<
+     std::chrono::high_resolution_clock::is_steady,
+     std::chrono::high_resolution_clock, std::chrono::steady_clock>::type;
+ 
++#ifdef _LIBCPP_VERSION
++namespace std
++{
++# if _LIBCPP_VERSION < 5000
++#define GSL_USE_STD_BYTE 1
++enum class byte : unsigned char {};
++
++template <class _Integer>
++  constexpr typename enable_if<is_integral_v<_Integer>, _Integer>::type
++  to_integer(byte __b) noexcept { return static_cast<_Integer>(__b); }
++# endif
++# if _LIBCPP_VERSION < 6000
++template <class _Fn, class... _Args>
++struct _LIBCPP_TEMPLATE_VIS invoke_result
++    : __invoke_of<_Fn, _Args...>
++{
++};
++
++template <class _Fn, class... _Args>
++using invoke_result_t = typename invoke_result<_Fn, _Args...>::type;
++# endif
++} // namespace std
++#endif
++
+ namespace gsl
+ {
+ 	using std::byte;