commit: 799e337522114be710544bc8adc93f669f32b60d Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri May 31 04:32:25 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri May 31 04:37:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=799e3375
games-emulation/pcsx2: update live Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../files/pcsx2-1.7.5855-no-libbacktrace.patch | 30 ++++++++++++++++++++++ games-emulation/pcsx2/pcsx2-9999.ebuild | 4 +-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch new file mode 100644 index 000000000000..220095f57aeb --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch @@ -0,0 +1,30 @@ +libbacktrace used to be packaged in Gentoo but was last-rited due +to [1], and as of [2] pcsx2 no longer let it be optional albeit the +code to allow this still exists behind __APPLE__ which lacksit. + +May be revisited to see if re-packaging may be sane (not looked +into the issue much, could potentially mask libbacktrace and pcsx2 +on musl, or even bundle libbacktrace), but for now drop the +dependency again as it is fairly trivial. + +[1] https://bugs.gentoo.org/885471 +[2] https://github.com/PCSX2/pcsx2/commit/d48f527d6d88dfbf87 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -71,3 +71,2 @@ + +- find_package(Libbacktrace REQUIRED) + find_package(PkgConfig REQUIRED) +--- a/common/CMakeLists.txt ++++ b/common/CMakeLists.txt +@@ -161,3 +161,2 @@ + ${DBUS_LINK_LIBRARIES} +- libbacktrace::libbacktrace + X11::X11 +--- a/common/CrashHandler.cpp ++++ b/common/CrashHandler.cpp +@@ -178,3 +178,3 @@ + +-#elif !defined(__APPLE__) ++#elif 0 + diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 3b09dfdebe2d..452519d49d92 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -79,6 +79,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.7.4667-flags.patch "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch "${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch + "${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch ) src_prepare() { @@ -121,9 +122,6 @@ src_configure() { # https://github.com/PCSX2/pcsx2/issues/11149 -DX11_API=yes - # not packaged due to bug #885471, but still disable for no automagic - -DCMAKE_DISABLE_FIND_PACKAGE_Libbacktrace=yes - # bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch -DCHECK_ALSA=$(usex alsa) -DCHECK_JACK=$(usex jack)
