From owner-svn-ports-all@freebsd.org Tue Jun 30 06:11:00 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D529D35F77B; Tue, 30 Jun 2020 06:11:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49wv9w55VFz3gbs; Tue, 30 Jun 2020 06:11:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 927A013868; Tue, 30 Jun 2020 06:11:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05U6B0vg051367; Tue, 30 Jun 2020 06:11:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05U6B0gK051366; Tue, 30 Jun 2020 06:11:00 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006300611.05U6B0gK051366@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 30 Jun 2020 06:11:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540858 - head/emulators/rpcs3/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/emulators/rpcs3/files X-SVN-Commit-Revision: 540858 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jun 2020 06:11:00 -0000 Author: jbeich Date: Tue Jun 30 06:11:00 2020 New Revision: 540858 URL: https://svnweb.freebsd.org/changeset/ports/540858 Log: emulators/rpcs3: unbreak on FreeBSD < 11.4/12.2 after r540845 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)))) ~~~~~~~~~~~~~~~~~~~~~~~~ ^ Modified: head/emulators/rpcs3/files/patch-libc++8 (contents, props changed) Modified: head/emulators/rpcs3/files/patch-libc++8 ============================================================================== --- head/emulators/rpcs3/files/patch-libc++8 Tue Jun 30 06:05:07 2020 (r540857) +++ head/emulators/rpcs3/files/patch-libc++8 Tue Jun 30 06:11:00 2020 (r540858) @@ -2,6 +2,7 @@ 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)); @@ -43,6 +44,27 @@ rpcs3/Emu/Cell/PPUAnalyser.h:1241:35: error: no member 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)))) + ~~~~~~~~~~~~~~~~~~~~~~~~ ^ + +--- 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,203 @@ namespace std @@ -249,3 +271,17 @@ rpcs3/Emu/Cell/PPUAnalyser.h:1241:35: error: no member 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;