commit: a08a828b4f780c33942e24591da4faa6c8508521
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 04:36:02 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 04:41:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a08a828b
games-emulation/pcsx2: update live
Previous patch was just meant to fix system detection given
we lack the .cmake files, but now upstream straight up removed
the find_optional for zstd and also libzip while at it.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch | 8 ++++++++
games-emulation/pcsx2/pcsx2-9999.ebuild | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch
b/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch
new file mode 100644
index 000000000000..631e49b3bddf
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch
@@ -0,0 +1,8 @@
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -181,2 +181,3 @@
+-add_subdirectory(3rdparty/zstd EXCLUDE_FROM_ALL)
+-add_subdirectory(3rdparty/libzip EXCLUDE_FROM_ALL)
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++alias_library(Zstd::Zstd PkgConfig::zstd)
++find_package(libzip REQUIRED)
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild
b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 7d24c2ae54cd..f41481a3cf53 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -100,8 +100,8 @@ PATCHES=(
"${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
"${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.patch
+ "${FILESDIR}"/${PN}-1.7.4943-system-libzip-zstd.patch
)
src_unpack() {
