gentoo auto-resync : 01:07:2023 - 13:45:28

8 files changed, 41 insertions, 113 deletions

diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch b/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch
deleted file mode 100644
index aa647cd09c07..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.0-crcs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Upstream-PR: https://github.com/PCSX2/pcsx2/pull/5082
-Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/1762
-Upstream-Issue: https://github.com/PCSX2/pcsx2/issues/5062
-
-From: orbea <orbea@riseup.net>
-Date: Sun, 28 Nov 2021 16:18:48 -0800
-Subject: [PATCH] Revert "GS: Remove Unofficial CRCs (#4082)"
-
-These games hacks are still used and can be removed
-again when a better solution is available.
-
-This reverts commit 6bcdb55f22d468b2eb8b95fd35bd071f9272a89c.
-
---- a/pcsx2/GS/GSCrc.cpp
-+++ b/pcsx2/GS/GSCrc.cpp
-@@ -22,6 +22,8 @@ const CRC::Game CRC::m_games[] =
- {
- 	// Note: IDs 0x7ACF7E03, 0x7D4EA48F, 0x37C53760 - shouldn't be added as it's from the multiloaders when packing games.
- 	{0x00000000, NoTitle, NoRegion, 0},
-+	{0xF46142D3, ArTonelico2, NoRegion, 0},
-+	{0xC38067F4, ArTonelico2, NoRegion, 0}, // project metafalica 1.0
- 	{0xF95F37EE, ArTonelico2, US, 0},
- 	{0x68CE6801, ArTonelico2, JP, 0},
- 	{0xCE2C1DBF, ArTonelico2, EU, 0},
-@@ -164,6 +166,8 @@ const CRC::Game CRC::m_games[] =
- 	{0xBF6F101F, GiTS, EU, 0}, // same CRC as another US disc
- 	{0xA616A6C2, TalesOfAbyss, US, 0},
- 	{0x14FE77F7, TalesOfAbyss, US, 0},
-+	{0x045D77E9, TalesOfAbyss, JPUNDUB, 0},
-+	{0x14FD77F7, TalesOfAbyss, JPUNDUB, 0},
- 	{0xAA5EC3A3, TalesOfAbyss, JP, 0},
- 	{0xFB236A46, SonicUnleashed, US, 0},
- 	{0x8C913264, SonicUnleashed, EU, 0},
---- a/pcsx2/GS/GSCrc.h
-+++ b/pcsx2/GS/GSCrc.h
-@@ -91,6 +91,7 @@ public:
- 		US,
- 		EU,
- 		JP,
-+		JPUNDUB,
- 		RU,
- 		FR,
- 		DE,
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
deleted file mode 100644
index 1047105d646a..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Lazy fix for -Werror=odr and don't rely on the CMAKE macro to
-pass -fno-lto to the problematic FastJmp.cpp source with lto.
---- a/common/CMakeLists.txt
-+++ b/common/CMakeLists.txt
-@@ -268,3 +268,3 @@
- 
--if (USE_GCC AND CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-+if (USE_GCC)
- 	# GCC LTO doesn't work with asm statements
---- a/pcsx2/PAD/Linux/Device.h
-+++ b/pcsx2/PAD/Linux/Device.h
-@@ -31,3 +31,3 @@
- 
--enum DeviceType
-+enum PADDeviceType
- {
-@@ -101,3 +101,3 @@
- 	DeviceAPI api;
--	DeviceType type;
-+	PADDeviceType type;
- 
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
deleted file mode 100644
index 9ef82985dc99..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-https://github.com/PCSX2/pcsx2/commit/6386be09c2e disabled PACKAGE_MODE
-for reasons that make no sense as far as installing from an ebuild goes.
-
-Skip the error and handle the rest from the ebuild.
---- a/pcsx2-qt/CMakeLists.txt
-+++ b/pcsx2-qt/CMakeLists.txt
-@@ -7,3 +7,2 @@
- if (PACKAGE_MODE)
--	message(FATAL_ERROR "Package mode is not supported for Qt builds.")
- else()
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch
deleted file mode 100644
index aee1608ea754..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3602-rapidyaml-0.5.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/PCSX2/pcsx2/issues/7623
-https://github.com/PCSX2/pcsx2/pull/7847
---- a/pcsx2/GameDatabase.cpp
-+++ b/pcsx2/GameDatabase.cpp
-@@ -151,5 +151,5 @@
- 	if (node.has_child("gameFixes") && node["gameFixes"].has_children())
- 	{
--		for (const ryml::NodeRef& n : node["gameFixes"].children())
-+		for (const ryml::ConstNodeRef& n : node["gameFixes"].children())
- 		{
- 			bool fixValidated = false;
-@@ -182,5 +182,5 @@
- 	if (node.has_child("speedHacks") && node["speedHacks"].has_children())
- 	{
--		for (const ryml::NodeRef& n : node["speedHacks"].children())
-+		for (const ryml::ConstNodeRef& n : node["speedHacks"].children())
- 		{
- 			bool speedHackValidated = false;
-@@ -212,5 +212,5 @@
- 	if (node.has_child("gsHWFixes"))
- 	{
--		for (const ryml::NodeRef& n : node["gsHWFixes"].children())
-+		for (const ryml::ConstNodeRef& n : node["gsHWFixes"].children())
- 		{
- 			const std::string_view id_name(n.key().data(), n.key().size());
-@@ -233,5 +233,5 @@
- 	if (node.has_child("memcardFilters") && node["memcardFilters"].has_children())
- 	{
--		for (const ryml::NodeRef& n : node["memcardFilters"].children())
-+		for (const ryml::ConstNodeRef& n : node["memcardFilters"].children())
- 		{
- 			auto memcardFilter = std::string(n.val().str, n.val().len);
-@@ -243,5 +243,5 @@
- 	if (node.has_child("patches") && node["patches"].has_children())
- 	{
--		for (const ryml::NodeRef& n : node["patches"].children())
-+		for (const ryml::ConstNodeRef& n : node["patches"].children())
- 		{
- 			// use a crc of 0 for default patches
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch
new file mode 100644
index 000000000000..ad76cc99c6b6
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch
@@ -0,0 +1,7 @@
+If upstream believes -ffast-math is ok for this part then that is
+fine, but we do not want to override users' -O.
+--- a/3rdparty/soundtouch/CMakeLists.txt
++++ b/3rdparty/soundtouch/CMakeLists.txt
+@@ -43 +43 @@
+-		target_compile_options(pcsx2-soundtouch PRIVATE -Ofast)
++		target_compile_options(pcsx2-soundtouch PRIVATE -ffast-math)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch
new file mode 100644
index 000000000000..9787cd380337
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch
@@ -0,0 +1,6 @@
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -164 +164,2 @@
+-add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL)
++pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)
++alias_library(chdr-static PkgConfig::chdr)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch
new file mode 100644
index 000000000000..858efc3b3e47
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch
@@ -0,0 +1,15 @@
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -96,6 +95,0 @@
+-if(ENABLE_TESTS)
+-	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt")
+-		message(WARNING "ENABLE_TESTS was on but gtest was not found, unit tests will not be enabled")
+-		set(ACTUALLY_ENABLE_TESTS Off)
+-	endif()
+-endif()
+--- a/tests/ctest/CMakeLists.txt
++++ b/tests/ctest/CMakeLists.txt
+@@ -20 +20,2 @@
+-add_subdirectory(gtest)
++find_package(GTest REQUIRED)
++alias_library(gtest_main GTest::gtest_main)
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch
new file mode 100644
index 000000000000..27b2e82852e8
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch
@@ -0,0 +1,13 @@
+This can use system zstd already but will not find it given
+it does not install cmake files, so use pkg-config.
+https://bugs.gentoo.org/872254
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -114,5 +114,2 @@
+-find_optional_system_library(zstd 3rdparty/zstd 1.4.5)
+-if (${zstd_TYPE} STREQUAL System)
+-	alias_library(Zstd::Zstd zstd::libzstd_shared)
+-	alias_library(pcsx2-zstd zstd::libzstd_shared)
+-endif()
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++alias_library(Zstd::Zstd PkgConfig::zstd)