From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- games-emulation/pcsx2/Manifest | 2 +- games-emulation/pcsx2/pcsx2-9999.ebuild | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'games-emulation/pcsx2') diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 9a14c95b102e..86a8ca80e510 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -2,5 +2,5 @@ AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa0 AUX pcsx2-1.6.0-wx-config.patch 613 BLAKE2B e5ff17ae5bddde776990cace4735883e8869f6c125dcdf171bb67b9392921d7a006f4b96075086b3927ecede027ff0b2efa40982b10e121c2e1096e36fcbe8bc SHA512 14f0eddbd9c72600f47733a5137c171abf05723b55aedf37438ed89730a9684b67a20d79dea3864531521421c1436922a19667353d7e51253ad3449a99b7b21a DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 EBUILD pcsx2-1.6.0-r3.ebuild 2756 BLAKE2B b62ba422f2856bc9b6a6f0e3961495e8cd88ce67a80228dfde200d9f62b71e41fef52836a5d80ceb2bdf4a11323935d37a566127387437abb133c361ff3c5dfe SHA512 892d63d5b60495ffd2459cec294e50eff2b9b83fe153d650f809a539bc4521e80fad64d229fe6af05ff21faad3e57a10d06b10f6053d42c254102da0f8036fed -EBUILD pcsx2-9999.ebuild 2867 BLAKE2B 2e6eafc0c9b9c747e48ad745b4b186bd27927ccb8db4a3c80b7c9cfe7e5f8ee08bdba372af3460f205eeab8e113d162861d722dcacb8aacc3c65a4503189edf1 SHA512 75c9fc8a4a385cfabf30d34aa889da186d2d06ff410ee32e18eb52797ca07e95e94d5429214f881366583aaeed8ea614482d730241f2ed1baa3821f81665e61f +EBUILD pcsx2-9999.ebuild 3071 BLAKE2B 1ae32681db094aa92dfd357165cbcca54468cb06245abb552cc63e8d8a498d1719bbba99eb7c653a8e139b38a9c29dcdb787bd22b24b5ba37a4bf9db2d56ca2f SHA512 b25200c43d214020715b9b117ed9d43bb5ec83a8f13f3e56cf86383bc38cf7fafb83ed4850d753ad3da9b13b0a9361dfbd0f899eb8b3091bb66f29b81582301c MISC metadata.xml 533 BLAKE2B 6133475168a5df84979b4ce8a195451abcc28f6cc910b937bc9de5b31f4f149c251602786d05d256a0c863d4a49ba5b47c8bbc957d1f87e5019ea78e8e3a5295 SHA512 9be0d69ebad684eeaad115e7b3e5ab66093e87a48523ef5b0cf6dff30ff5b0be9fdfc93aa755767e55a2e1a74fbc34316242acb24148560ae4a7382586eac1a5 diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index bdd694c0a1c5..8c462bcb79c6 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -30,6 +30,7 @@ RDEPEND=" dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libxml2:2 + dev-libs/libzip:=[zstd] media-libs/alsa-lib media-libs/cubeb media-libs/freetype @@ -73,8 +74,11 @@ 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 '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \ -i cmake/SearchForStuff.cmake || die sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die @@ -99,7 +103,8 @@ src_configure() { -DDISABLE_SETCAP=TRUE -DENABLE_TESTS=$(usex test) -DPACKAGE_MODE=TRUE - -DSDL2_API=TRUE # uses SDL2 either way but option is needed if wxGTK[sdl] + -DQT_BUILD=FALSE # TODO + -DSDL2_API=TRUE # conditionally needed if wxGTK[sdl], cmake/ApiValidation.cmake -DUSE_SYSTEM_YAML=TRUE -DUSE_VTUNE=FALSE -DXDG_STD=TRUE -- cgit v1.2.3