summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2023-08-25 00:36:02 -0400
committerIonen Wolkens <ionen@gentoo.org>2023-08-25 00:41:00 -0400
commita08a828b4f780c33942e24591da4faa6c8508521 (patch)
tree6f0197db40f77d25b0f5ca38ec19ae800ff49401 /games-emulation/pcsx2
parentdev-python/mkdocs-material: Keyword 9.2.3 riscv, #912898 (diff)
downloadgentoo-a08a828b4f780c33942e24591da4faa6c8508521.tar.gz
gentoo-a08a828b4f780c33942e24591da4faa6c8508521.tar.bz2
gentoo-a08a828b4f780c33942e24591da4faa6c8508521.zip
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@gentoo.org>
Diffstat (limited to 'games-emulation/pcsx2')
-rw-r--r--games-emulation/pcsx2/files/pcsx2-1.7.4943-system-libzip-zstd.patch8
-rw-r--r--games-emulation/pcsx2/pcsx2-9999.ebuild2
2 files changed, 9 insertions, 1 deletions
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() {