| 1 |
commit: e808632da1235b69f255a013bc21923ff8c064cd |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 19 15:05:16 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 19 15:20:10 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e808632d |
| 7 |
|
| 8 |
games-emulation/pcsx2: fix live unbundling, now does use zstd |
| 9 |
|
| 10 |
Thanks-to: Samuel Bauer |
| 11 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 12 |
|
| 13 |
games-emulation/pcsx2/pcsx2-9999.ebuild | 8 +++++--- |
| 14 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild |
| 17 |
index 0d816ee8c404..6ec992906f64 100644 |
| 18 |
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild |
| 19 |
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild |
| 20 |
@@ -24,6 +24,7 @@ RESTRICT="!test? ( test )" |
| 21 |
|
| 22 |
RDEPEND=" |
| 23 |
app-arch/xz-utils |
| 24 |
+ app-arch/zstd:= |
| 25 |
dev-cpp/rapidyaml:= |
| 26 |
dev-libs/glib:2 |
| 27 |
dev-libs/libaio |
| 28 |
@@ -72,14 +73,15 @@ src_prepare() { |
| 29 |
cmake_src_prepare |
| 30 |
|
| 31 |
# unbundle, use sed over patch for less chances to break -9999 |
| 32 |
- # (zstd is only used by libzip, so can remove entirely) |
| 33 |
sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \ |
| 34 |
-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \ |
| 35 |
-e '/add_subdir.*libzip/c\find_package(libzip REQUIRED)' \ |
| 36 |
- -e '/add_subdir.*zstd/d' \ |
| 37 |
+ -e '/add_subdir.*zstd/c\pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)' \ |
| 38 |
-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \ |
| 39 |
-i cmake/SearchForStuff.cmake || die |
| 40 |
- sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die |
| 41 |
+ sed -e 's/chdr-static/PkgConfig::chdr/' \ |
| 42 |
+ -e 's/Zstd::Zstd/PkgConfig::zstd/' \ |
| 43 |
+ -i pcsx2/CMakeLists.txt || die |
| 44 |
|
| 45 |
# pulseaudio is only used for usb-mic, not audio output |
| 46 |
use pulseaudio || > cmake/FindPulseAudio.cmake || die |
Archives