From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6A49A158090 for ; Thu, 19 May 2022 15:20:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81E5AE0855; Thu, 19 May 2022 15:20:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6717CE0855 for ; Thu, 19 May 2022 15:20:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 298B3341711 for ; Thu, 19 May 2022 15:20:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F6143B5 for ; Thu, 19 May 2022 15:20:47 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1652973610.e808632da1235b69f255a013bc21923ff8c064cd.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/pcsx2/pcsx2-9999.ebuild X-VCS-Directories: games-emulation/pcsx2/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: e808632da1235b69f255a013bc21923ff8c064cd X-VCS-Branch: master Date: Thu, 19 May 2022 15:20:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d12a4e27-f1eb-41ec-8626-0cd442cdd341 X-Archives-Hash: e7c38c52b0a23584e834cd7909adfaec commit: e808632da1235b69f255a013bc21923ff8c064cd Author: Ionen Wolkens gentoo org> AuthorDate: Thu May 19 15:05:16 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu May 19 15:20:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e808632d games-emulation/pcsx2: fix live unbundling, now does use zstd Thanks-to: Samuel Bauer Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/pcsx2-9999.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 0d816ee8c404..6ec992906f64 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -24,6 +24,7 @@ RESTRICT="!test? ( test )" RDEPEND=" app-arch/xz-utils + app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/glib:2 dev-libs/libaio @@ -72,14 +73,15 @@ src_prepare() { cmake_src_prepare # unbundle, use sed over patch for less chances to break -9999 - # (zstd is only used by libzip, so can remove entirely) sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \ -e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \ -e '/add_subdir.*libzip/c\find_package(libzip REQUIRED)' \ - -e '/add_subdir.*zstd/d' \ + -e '/add_subdir.*zstd/c\pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)' \ -e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \ -i cmake/SearchForStuff.cmake || die - sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die + sed -e 's/chdr-static/PkgConfig::chdr/' \ + -e 's/Zstd::Zstd/PkgConfig::zstd/' \ + -i pcsx2/CMakeLists.txt || die # pulseaudio is only used for usb-mic, not audio output use pulseaudio || > cmake/FindPulseAudio.cmake || die