Index: head/emulators/rpcs3/Makefile =================================================================== --- head/emulators/rpcs3/Makefile (revision 548267) +++ head/emulators/rpcs3/Makefile (revision 548268) @@ -1,90 +1,99 @@ # $FreeBSD$ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.12-10860 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g676fed7cf +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger LICENSE= APACHE20 BSD3CLAUSE BSL GPLv2 MIT ZLIB LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC_cereal}/LICENSE LICENSE_FILE_BSL= ${WRKSRC_span}/LICENSE_1_0.txt LICENSE_FILE_MIT= ${WRKSRC_pugixml}/LICENSE.md LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-27-g9220f5e:hidapi/3rdparty/hidapi \ RPCS3:llvm-mirror:f5679565d348:llvm/llvm \ Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \ FNA-XNA:FAudio:20.05:FAudio/3rdparty/FAudio \ google:flatbuffers:v1.11.0:flatbuffers/3rdparty/flatbuffers \ jbeder:yaml-cpp:yaml-cpp-0.6.3-30-g6a211f0:yamlcpp/3rdparty/yaml-cpp \ kobalicek:asmjit:fc251c9:asmjit/asmjit \ KhronosGroup:SPIRV-Headers:1.5.3.reservations1:spirv_headers/Vulkan/spirv-headers \ KhronosGroup:SPIRV-Tools:v2020.4:spirv_tools/Vulkan/spirv-tools \ KhronosGroup:glslang:8.13.3743-225-g517f39ee:glslang/Vulkan/glslang \ RipleyTom:wolfssl:v4.3.0-stable-424-gd0749c654:wolfssl/3rdparty/wolfssl \ tcbrindle:span:9d7559a:span/3rdparty/span \ USCiLab:cereal:v1.3.0-5-g60c69df9:cereal/3rdparty/cereal \ zeux:pugixml:v1.9-51-g8bf806c:pugixml/3rdparty/pugixml USES= cmake compiler:c++17-lang gl iconv:wchar_t localbase:ldflags \ openal:soft pkgconfig python:3.4+,build qt:5 xorg USE_GL= gl glew USE_QT= qmake_build buildtools_build core concurrent dbus gui widgets USE_XORG= x11 CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_CURL USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG CMAKE_OFF= USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS LDFLAGS+= -Wl,--as-needed # GLU # https://bugs.llvm.org/show_bug.cgi?id=46557 BUILD_DEPENDS+= clang++${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} USES:= ${USES:Ncompiler*} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} CPP= clang-cpp${LLVM_DEFAULT} + +# XXX Drop after FreeBSD 11.3/12.1 EOL +.if make(makesum) || (!exists(/usr/include/c++/v1/fenv.h) && exists(/usr/lib/libc++.so)) +MASTER_SITES+= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx +DISTFILES+= libcxx-${LLVM_VER}.src.tar.xz:libcxx +CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include +LLVM_VER= 10.0.1 +.endif OPTIONS_DEFINE= ALSA EVDEV FAUDIO PULSEAUDIO VULKAN OPTIONS_DEFAULT=EVDEV FAUDIO VULKAN ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_CMAKE_BOOL= USE_ALSA EVDEV_DESC= libevdev-based joystick support EVDEV_CMAKE_BOOL= USE_LIBEVDEV EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev FAUDIO_DESC= FAudio audio support FAUDIO_USES= sdl FAUDIO_USE= SDL=sdl2 FAUDIO_CMAKE_BOOL= USE_FAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE VULKAN_DESC= Vulkan renderer VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CMAKE_BOOL= USE_VULKAN post-patch: @${REINPLACE_CMD} -e '/GIT_BRANCH/s/local_build/master/' \ -e '/GIT_FULL_BRANCH/s/local_build/${GH_ACCOUNT}\/${GH_PROJECT}\/master/' \ -e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake .include Index: head/emulators/rpcs3/distinfo =================================================================== --- head/emulators/rpcs3/distinfo (revision 548267) +++ head/emulators/rpcs3/distinfo (revision 548268) @@ -1,31 +1,33 @@ TIMESTAMP = 1599515417 +SHA256 (libcxx-10.0.1.src.tar.xz) = def674535f22f83131353b3c382ccebfef4ba6a35c488bdb76f10b68b25be86c +SIZE (libcxx-10.0.1.src.tar.xz) = 1839172 SHA256 (RPCS3-rpcs3-v0.0.12-10860-g676fed7cf_GH0.tar.gz) = 8b5e31d38c5e46406ae30f565b31340b412fad700842aa70a964bb6a61312af8 SIZE (RPCS3-rpcs3-v0.0.12-10860-g676fed7cf_GH0.tar.gz) = 8483264 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400 SHA256 (RPCS3-llvm-mirror-f5679565d348_GH0.tar.gz) = 201b9be34c7ef5f5a81d21b11c532040546cb602307479a4dd56357c02caa7f3 SIZE (RPCS3-llvm-mirror-f5679565d348_GH0.tar.gz) = 55246543 SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95 SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521 SHA256 (FNA-XNA-FAudio-20.05_GH0.tar.gz) = 62e68c61970552f27f0bc4943bf92af5f4b9ae2a30ed4fa70784e1f7056c6625 SIZE (FNA-XNA-FAudio-20.05_GH0.tar.gz) = 1130178 SHA256 (google-flatbuffers-v1.11.0_GH0.tar.gz) = 3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b SIZE (google-flatbuffers-v1.11.0_GH0.tar.gz) = 894944 SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.3-30-g6a211f0_GH0.tar.gz) = 4b832de2a1d0934ecc58c9c920e17908e52305f9d99d7d24625d3f13e974e0cc SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.3-30-g6a211f0_GH0.tar.gz) = 1398571 SHA256 (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 0fb6271fccf8ee86d27affda7e27a6d655bfabfda83a7dd0d41f7fd05b384aad SIZE (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 446910 SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836 SHA256 (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2 SIZE (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = 2282982 SHA256 (KhronosGroup-glslang-8.13.3743-225-g517f39ee_GH0.tar.gz) = 5414072b212552f0ee7a18efd4e56484225bcc8035ed8d1f6274b431d95969e6 SIZE (KhronosGroup-glslang-8.13.3743-225-g517f39ee_GH0.tar.gz) = 3241107 SHA256 (RipleyTom-wolfssl-v4.3.0-stable-424-gd0749c654_GH0.tar.gz) = fc590a85d20c400aa623507c151010ac109b1490a0c1c0dd6db84aca812a4f76 SIZE (RipleyTom-wolfssl-v4.3.0-stable-424-gd0749c654_GH0.tar.gz) = 7157837 SHA256 (tcbrindle-span-9d7559a_GH0.tar.gz) = 4fbe8364b8ff9388fd6ca1a11ce39ff448af76394d561d6f879cf1180b14f160 SIZE (tcbrindle-span-9d7559a_GH0.tar.gz) = 130675 SHA256 (USCiLab-cereal-v1.3.0-5-g60c69df9_GH0.tar.gz) = 3931a29bccc2ebbed13fcc3229643bfd9cdf9e81b5f09ed298f2062016e6f302 SIZE (USCiLab-cereal-v1.3.0-5-g60c69df9_GH0.tar.gz) = 374806 SHA256 (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 37bed90f3dadb642acca41508391d1409a75af05f34f13da56c866d5c3c4b00d SIZE (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 560956 Index: head/emulators/rpcs3/files/patch-libc++8 =================================================================== --- head/emulators/rpcs3/files/patch-libc++8 (revision 548267) +++ head/emulators/rpcs3/files/patch-libc++8 (nonexistent) @@ -1,304 +0,0 @@ -Drop after FreeBSD 11.3/12.1 EOL. - -https://reviews.llvm.org/rL359211 -https://reviews.llvm.org/rL364862 -https://reviews.llvm.org/rL366170 - -rpcs3/Emu/Io/PadHandler.cpp:191:27: error: no member named 'lerp' in namespace 'std' - const float pos = std::lerp(0.13f, 1.f, (mag - dzRange) / (1 - dzRange)); - ~~~~~^ -rpcs3/Emu/Io/PadHandler.cpp:198:27: error: no member named 'lerp' in namespace 'std' - const float pos = std::lerp(0.f, 0.13f, mag / dzRange); - ~~~~~^ - -In file included from rpcs3/Emu/System.cpp:9: -rpcs3/Emu/Cell/PPUOpcodes.h:66:14: error: no member named 'rotr' in namespace 'std' - return std::rotr(~0ull << (~(me - mb) & 63), mb & 63); - ~~~~~^ -rpcs3/Emu/Cell/PPUOpcodes.h:66:19: error: unexpected type name 'u64': expected expression - return std::rotr(~0ull << (~(me - mb) & 63), mb & 63); - ^ -rpcs3/Emu/Cell/PPUOpcodes.h:66:30: warning: expression result unused [-Wunused-value] - return std::rotr(~0ull << (~(me - mb) & 63), mb & 63); - ~~~~~ ^ ~~~~~~~~~~~~~~~~~ -rpcs3/Emu/Cell/PPUOpcodes.h:64:15: error: no return statement in constexpr function -constexpr u64 ppu_rotate_mask(u32 mb, u32 me) - ^ -rpcs3/Emu/Cell/PPUOpcodes.h:71:14: error: no member named 'rotr' in namespace 'std' - return std::rotr(inst, 26) & 0x1ffff; // Rotate + mask - ~~~~~^ -rpcs3/Emu/Cell/PPUOpcodes.h:71:19: error: unexpected type name 'u32': expected expression - return std::rotr(inst, 26) & 0x1ffff; // Rotate + mask - ^ -rpcs3/Emu/Cell/PPUOpcodes.h:71:24: warning: expression result unused [-Wunused-value] - return std::rotr(inst, 26) & 0x1ffff; // Rotate + mask - ^~~~ -rpcs3/Emu/Cell/PPUOpcodes.h:69:15: error: no return statement in constexpr function -constexpr u32 ppu_decode(u32 inst) - ^ -In file included from rpcs3/Emu/System.cpp:11: -rpcs3/Emu/Cell/PPUAnalyser.h:992:16: error: no member named 'countr_zero' in namespace 'std' - return std::countr_zero(mask()); - ~~~~~^ -rpcs3/Emu/Cell/PPUAnalyser.h:1241:35: error: no member named 'countl_zero' in namespace 'std' - const u64 mix = ~0ull >> std::countl_zero(min ^ max); - ~~~~~^ - -Utilities/bin_patch.cpp:788:25: error: no member named 'contains' in 'std::__1::set, std::__1::less >, std::__1::allocator > >' - if (m_applied_groups.contains(patch.patch_group)) - ~~~~~~~~~~~~~~~~ ^ -rpcs3/rpcs3qt/patch_manager_dialog.cpp:338:120: error: no member named 'contains' in 'std::__1::set, std::__1::less >, std::__1::allocator > >' - (m_owned_games.find(serial) == m_owned_games.end() || (app_version != patch_key::all && !m_owned_games.at(serial).contains(app_version)))) - ~~~~~~~~~~~~~~~~~~~~~~~~ ^ -In file included from rpcs3/Emu/System.cpp:1: -In file included from rpcs3/stdafx.h:24: -In file included from Utilities/BEType.h:5: -rpcs3/util/endian.hpp:56:13: error: no member named 'is_constant_evaluated' in namespace 'std' - if (std::is_constant_evaluated()) - ~~~~~^ -rpcs3/util/endian.hpp:76:13: error: no member named 'is_constant_evaluated' in namespace 'std' - if (std::is_constant_evaluated()) - ~~~~~^ -rpcs3/util/endian.hpp:96:13: error: no member named 'is_constant_evaluated' in namespace 'std' - if (std::is_constant_evaluated()) - ~~~~~^ - ---- Utilities/bin_patch.cpp.orig 2020-06-29 22:45:17 UTC -+++ Utilities/bin_patch.cpp -@@ -785,7 +785,11 @@ std::size_t patch_engine::apply_patch(const std::strin - { - if (!patch.patch_group.empty()) - { -+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 9000 -+ if (m_applied_groups.find(patch.patch_group) != m_applied_groups.end()) -+#else - if (m_applied_groups.contains(patch.patch_group)) -+#endif - { - continue; - } ---- Utilities/types.h.orig 2020-04-16 09:59:19 UTC -+++ Utilities/types.h -@@ -102,6 +102,208 @@ namespace std - } - #endif - -+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 9000 -+_LIBCPP_BEGIN_NAMESPACE_STD -+template -+constexpr -+_Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept { -+ if ((__a <= 0 && __b >= 0) || (__a >= 0 && __b <= 0)) -+ return __t * __b + (1 - __t) * __a; -+ -+ if (__t == 1) return __b; -+ const _Fp __x = __a + __t * (__b - __a); -+ if (__t > 1 == __b > __a) -+ return __b < __x ? __x : __b; -+ else -+ return __x < __b ? __x : __b; -+} -+ -+constexpr float -+lerp(float __a, float __b, float __t) _NOEXCEPT { return __lerp(__a, __b, __t); } -+ -+constexpr double -+lerp(double __a, double __b, double __t) _NOEXCEPT { return __lerp(__a, __b, __t); } -+ -+constexpr long double -+lerp(long double __a, long double __b, long double __t) _NOEXCEPT { return __lerp(__a, __b, __t); } -+ -+template -+using __bitop_unsigned_integer = integral_constant::value && -+ is_unsigned<_Tp>::value && -+ !is_same::type, bool>::value && -+ !is_same::type, signed char>::value && -+ !is_same::type, wchar_t>::value && -+ !is_same::type, char16_t>::value && -+ !is_same::type, char32_t>::value -+ >; -+ -+template -+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -+_Tp __rotl(_Tp __t, unsigned int __cnt) _NOEXCEPT -+{ -+ static_assert(__bitop_unsigned_integer<_Tp>::value, "__rotl requires unsigned"); -+ const unsigned int __dig = numeric_limits<_Tp>::digits; -+ if ((__cnt % __dig) == 0) -+ return __t; -+ return (__t << (__cnt % __dig)) | (__t >> (__dig - (__cnt % __dig))); -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -+_Tp __rotr(_Tp __t, unsigned int __cnt) _NOEXCEPT -+{ -+ static_assert(__bitop_unsigned_integer<_Tp>::value, "__rotr requires unsigned"); -+ const unsigned int __dig = numeric_limits<_Tp>::digits; -+ if ((__cnt % __dig) == 0) -+ return __t; -+ return (__t >> (__cnt % __dig)) | (__t << (__dig - (__cnt % __dig))); -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -+int __countr_zero(_Tp __t) _NOEXCEPT -+{ -+ static_assert(__bitop_unsigned_integer<_Tp>::value, "__countr_zero requires unsigned"); -+ if (__t == 0) -+ return numeric_limits<_Tp>::digits; -+ -+ if (sizeof(_Tp) <= sizeof(unsigned int)) -+ return __ctz(static_cast(__t)); -+ else if (sizeof(_Tp) <= sizeof(unsigned long)) -+ return __ctz(static_cast(__t)); -+ else if (sizeof(_Tp) <= sizeof(unsigned long long)) -+ return __ctz(static_cast(__t)); -+ else -+ { -+ int __ret = 0; -+ int __iter = 0; -+ const unsigned int __ulldigits = numeric_limits::digits; -+ while ((__iter = __ctz(static_cast(__t))) == __ulldigits) -+ { -+ __ret += __iter; -+ __t >>= __ulldigits; -+ } -+ return __ret + __iter; -+ } -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -+int __countl_zero(_Tp __t) _NOEXCEPT -+{ -+ static_assert(__bitop_unsigned_integer<_Tp>::value, "__countl_zero requires unsigned"); -+ if (__t == 0) -+ return numeric_limits<_Tp>::digits; -+ -+ if (sizeof(_Tp) <= sizeof(unsigned int)) -+ return __clz(static_cast(__t)) -+ - (numeric_limits::digits - numeric_limits<_Tp>::digits); -+ else if (sizeof(_Tp) <= sizeof(unsigned long)) -+ return __clz(static_cast(__t)) -+ - (numeric_limits::digits - numeric_limits<_Tp>::digits); -+ else if (sizeof(_Tp) <= sizeof(unsigned long long)) -+ return __clz(static_cast(__t)) -+ - (numeric_limits::digits - numeric_limits<_Tp>::digits); -+ else -+ { -+ int __ret = 0; -+ int __iter = 0; -+ const unsigned int __ulldigits = numeric_limits::digits; -+ while (true) { -+ __t = __rotr(__t, __ulldigits); -+ if ((__iter = __countl_zero(static_cast(__t))) != __ulldigits) -+ break; -+ __ret += __iter; -+ } -+ return __ret + __iter; -+ } -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -+int __countl_one(_Tp __t) _NOEXCEPT -+{ -+ static_assert(__bitop_unsigned_integer<_Tp>::value, "__countl_one requires unsigned"); -+ return __t != numeric_limits<_Tp>::max() -+ ? __countl_zero(static_cast<_Tp>(~__t)) -+ : numeric_limits<_Tp>::digits; -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 -+int __countr_one(_Tp __t) _NOEXCEPT -+{ -+ static_assert(__bitop_unsigned_integer<_Tp>::value, "__countr_one requires unsigned"); -+ return __t != numeric_limits<_Tp>::max() -+ ? __countr_zero(static_cast<_Tp>(~__t)) -+ : numeric_limits<_Tp>::digits; -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY constexpr -+enable_if_t<__bitop_unsigned_integer<_Tp>::value, _Tp> -+rotl(_Tp __t, unsigned int __cnt) noexcept -+{ -+ return __rotl(__t, __cnt); -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY constexpr -+enable_if_t<__bitop_unsigned_integer<_Tp>::value, _Tp> -+rotr(_Tp __t, unsigned int __cnt) noexcept -+{ -+ return __rotr(__t, __cnt); -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY constexpr -+enable_if_t<__bitop_unsigned_integer<_Tp>::value, int> -+countl_zero(_Tp __t) noexcept -+{ -+ return __countl_zero(__t); -+} -+ -+ -+template -+_LIBCPP_INLINE_VISIBILITY constexpr -+enable_if_t<__bitop_unsigned_integer<_Tp>::value, int> -+countl_one(_Tp __t) noexcept -+{ -+ return __countl_one(__t); -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY constexpr -+enable_if_t<__bitop_unsigned_integer<_Tp>::value, int> -+countr_zero(_Tp __t) noexcept -+{ -+ return __countr_zero(__t); -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY constexpr -+enable_if_t<__bitop_unsigned_integer<_Tp>::value, int> -+countr_one(_Tp __t) noexcept -+{ -+ return __countr_one(__t); -+} -+ -+template -+_LIBCPP_INLINE_VISIBILITY constexpr -+enable_if_t<__bitop_unsigned_integer<_Tp>::value, int> -+popcount(_Tp __t) noexcept -+{ -+ return __popcount(__t); -+} -+ -+_LIBCPP_INLINE_VISIBILITY -+inline constexpr bool is_constant_evaluated() noexcept { -+ return __builtin_is_constant_evaluated(); -+} -+_LIBCPP_END_NAMESPACE_STD -+#endif -+ - using schar = signed char; - using uchar = unsigned char; - using ushort = unsigned short; ---- rpcs3/rpcs3qt/patch_manager_dialog.cpp.orig 2020-06-29 22:45:17 UTC -+++ rpcs3/rpcs3qt/patch_manager_dialog.cpp -@@ -335,7 +335,11 @@ void patch_manager_dialog::filter_patches(const QStrin - const std::string app_version = item->data(0, app_version_role).toString().toStdString(); - - if (serial != patch_key::all && -+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 9000 -+ (m_owned_games.find(serial) == m_owned_games.end() || (app_version != patch_key::all && !(m_owned_games.at(serial).find(app_version) != m_owned_games.at(serial).end())))) -+#else - (m_owned_games.find(serial) == m_owned_games.end() || (app_version != patch_key::all && !m_owned_games.at(serial).contains(app_version)))) -+#endif - { - item->setHidden(true); - return 0; Property changes on: head/emulators/rpcs3/files/patch-libc++8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property