diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /games-emulation/pcsx2 | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'games-emulation/pcsx2')
| -rw-r--r-- | games-emulation/pcsx2/Manifest | 5 | ||||
| -rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch | 20 | ||||
| -rw-r--r-- | games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild (renamed from games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild) | 10 | ||||
| -rw-r--r-- | games-emulation/pcsx2/pcsx2-9999.ebuild | 1 |
4 files changed, 28 insertions, 8 deletions
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index eadeb2708c51..9a14c95b102e 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,5 +1,6 @@ AUX pcsx2-1.6.0-disable-setcap.patch 2783 BLAKE2B 8840d64feeb042c8442fae30c40fa05e5de19f0b5da9f383bb097e8f092bbabcaf529424e11eb99bb3af81ac8407cd207f846683cd359ac9ea11f8d40a4a72dd SHA512 463ef253a192d3531b1733c4006bd5870aaa31ae58e54d188edd889bb0c3e3eb7d2e76442461c68105ff51753b29add02a673aad4eb5ed27a0b9a66345fea08d +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-r2.ebuild 2808 BLAKE2B f947a2cb7ec6a2ba32514a622317913a3b63fc4063c7b7a1aa36012ecefb8bae327a8673e9b1d66002f6f059cd0d08faf3de4d79566fe451305a47b2de615ced SHA512 cf504517c5dac9cfff4adaf7fe7425e468acd7f1e5a8c7ff0670040ed5e8970dd8e304d716831e8cea4c1fc015a499e4db791fd0df4913f28ed25cc89664433a -EBUILD pcsx2-9999.ebuild 2809 BLAKE2B 967a29c69976ed96b7dabcf5f9bda82fa90f8a10ba18853b1968dcb61155d012672f373933b8a59c56d94405d3eb7d88d6d52b4cef3a38b4463ba312f6f539f5 SHA512 9dccea1357fa2705faec7a37418a951228c91cb7de8d74128bd1895693ed3986148e7094966f440509776bbe1ebd05fea0ed777b409399010bccd657a610ad07 +EBUILD pcsx2-1.6.0-r3.ebuild 2756 BLAKE2B b62ba422f2856bc9b6a6f0e3961495e8cd88ce67a80228dfde200d9f62b71e41fef52836a5d80ceb2bdf4a11323935d37a566127387437abb133c361ff3c5dfe SHA512 892d63d5b60495ffd2459cec294e50eff2b9b83fe153d650f809a539bc4521e80fad64d229fe6af05ff21faad3e57a10d06b10f6053d42c254102da0f8036fed +EBUILD pcsx2-9999.ebuild 2867 BLAKE2B 2e6eafc0c9b9c747e48ad745b4b186bd27927ccb8db4a3c80b7c9cfe7e5f8ee08bdba372af3460f205eeab8e113d162861d722dcacb8aacc3c65a4503189edf1 SHA512 75c9fc8a4a385cfabf30d34aa889da186d2d06ff410ee32e18eb52797ca07e95e94d5429214f881366583aaeed8ea614482d730241f2ed1baa3821f81665e61f MISC metadata.xml 533 BLAKE2B 6133475168a5df84979b4ce8a195451abcc28f6cc910b937bc9de5b31f4f149c251602786d05d256a0c863d4a49ba5b47c8bbc957d1f87e5019ea78e8e3a5295 SHA512 9be0d69ebad684eeaad115e7b3e5ab66093e87a48523ef5b0cf6dff30ff5b0be9fdfc93aa755767e55a2e1a74fbc34316242acb24148560ae4a7382586eac1a5 diff --git a/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch b/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch new file mode 100644 index 000000000000..bfa12b893dcd --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.6.0-wx-config.patch @@ -0,0 +1,20 @@ +Don't attempt to use /usr/bin/wx-config-3.0 which can point to the +wrong wx-config depending on eselect'ed wxGTK profile. Furthermore +that path does not use ESYSROOT. + +If unset, FindwxWidgets.cmake will use WX_CONFIG environment +set by the wxwidgets eclass. +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -50,4 +50,5 @@ + # lib32-wx3.0 => /usr/bin/wx-config32-3.0 + # FindwxWidgets only searches for wx-config. ++#[[ + if(CMAKE_CROSSCOMPILING) + # May need to fix the filenames for lib32-wx3.0. +@@ -71,4 +72,5 @@ + endif() + endif() ++#]] + + find_package(wxWidgets COMPONENTS base core adv) diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild index a9b0dc2b9ffb..8a6662ae3aa4 100644 --- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild @@ -46,6 +46,7 @@ FILECAPS=( PATCHES=( "${FILESDIR}/${P}-disable-setcap.patch" + "${FILESDIR}/${P}-wx-config.patch" ) pkg_setup() { @@ -68,12 +69,6 @@ src_configure() { # if it something other than "Devel|Debug|Release" local CMAKE_BUILD_TYPE="Release" - if use amd64; then - # Passing correct CMAKE_TOOLCHAIN_FILE for amd64 - # https://github.com/PCSX2/pcsx2/pull/422 - local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake) - fi - local mycmakeargs=( -DARCH_FLAG= -DDISABLE_BUILD_DATE=TRUE @@ -93,6 +88,9 @@ src_configure() { # wxGTK must be built against same sdl version -DSDL2_API=TRUE -DUSE_VTUNE=FALSE + + # mimic old toolchain file behavior (bug #833100 comment #20) + -DCMAKE_SYSTEM_IGNORE_PATH="${ESYSROOT}"/usr/lib64 ) setup-wxwidgets diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index f5543f61bed1..bdd694c0a1c5 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -75,6 +75,7 @@ src_prepare() { # unbundle, use sed over patch for less chances to break -9999 sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \ -e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)' \ + -e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \ -i cmake/SearchForStuff.cmake || die sed -i 's/chdr-static/PkgConfig::chdr/' pcsx2/CMakeLists.txt || die |