commit: 638d959dfe1ae6462e3d3996f6cb7e4558c23429
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 08:25:11 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 09:07:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=638d959d
games-emulation/pcsx2: update live
gtest unbundling needs rebasing, and unfortunately can no longer
use system soundtouch as-is (newly bundled, fails if unbundled).
Also split unbundling patches while at it, using diff -U0 so they're
unlikely to break easily while touching the same file (context is
not important for these).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/pcsx2/files/pcsx2-1.7.4667-flags.patch | 7 +++++++
.../pcsx2/files/pcsx2-1.7.4667-system-chdr.patch | 6 ++++++
.../pcsx2/files/pcsx2-1.7.4667-system-gtest.patch | 15 +++++++++++++++
.../pcsx2/files/pcsx2-1.7.4667-system-zstd.patch | 13 +++++++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 9 +++++++--
5 files changed, 48 insertions(+), 2 deletions(-)
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)
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild
b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 0837cde0069d..63f79eb0b691 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -55,7 +55,6 @@ COMMON_DEPEND="
media-libs/libglvnd
media-libs/libpng:=
>=media-libs/libsdl2-2.0.22[haptic,joystick]
- media-libs/libsoundtouch:=
media-video/ffmpeg:=
net-libs/libpcap
net-misc/curl
@@ -85,9 +84,12 @@ FILECAPS=(
)
PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+ "${FILESDIR}"/${PN}-1.7.4667-flags.patch
+ "${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch
+ "${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch
+ "${FILESDIR}"/${PN}-1.7.4667-system-zstd.patch
)
src_unpack() {
@@ -191,6 +193,9 @@ src_configure() {
# https://github.com/PCSX2/pcsx2/pull/4329
-DARCH_FLAG=-msse4.1
+ # not packaged due to bug #885471, but still disable for no
automagic
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes
+
# bundled cubeb flags, see media-libs/cubeb and
cubeb-automagic.patch
-DCHECK_ALSA=$(usex alsa)
-DCHECK_JACK=$(usex jack)
