diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-01 00:07:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-01 00:07:06 +0100 |
| commit | 1551fe56fd6ba43a94509cffc61b6bf854b7ac9f (patch) | |
| tree | be99b6ceb874878a108d68c641b476a2df076517 /games-emulation/pcsx2 | |
| parent | 0e2a727aba684f1a44cc0402a3f77d242140681b (diff) | |
gentoo auto-resync : 01:06:2024 - 00:07:06
Diffstat (limited to 'games-emulation/pcsx2')
| -rw-r--r-- | games-emulation/pcsx2/Manifest | 3 | ||||
| -rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch | 30 | ||||
| -rw-r--r-- | games-emulation/pcsx2/pcsx2-9999.ebuild | 4 |
3 files changed, 33 insertions, 4 deletions
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 1633cbfdf5cc..b7729f6b0e91 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -2,11 +2,12 @@ AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb0730600 AUX pcsx2-1.7.5232-cubeb-automagic.patch 774 BLAKE2B a932e49643df613710c27c8f0881c6e2b9c2d90964ff7f88b48b3ec5ad281bbd152fbede638accc054ea5935401ef240ed0bf8107fe1c10997242ea546b93699 SHA512 5985f08a2acce8ccbe946a7c5bd85b2388ad7166b0243a7e698c96990a3856660c1f353bc74a9ced0e5ff08f10e27922e05eb77fabff1e797166b7d6a4c445a7 AUX pcsx2-1.7.5700-vanilla-shaderc.patch 751 BLAKE2B d7dde7c368c2231b2876d1e42ae1306f413bcc795a15514e3cbe15bedccc667a60d9ac09b8559ee48513fb144732937bc69e5d722523fb6a3353adebd7ae8464 SHA512 975d490772a7552f748afbc37fddb7acbd3b33e58799b0b4527b24b6d7335436739e8c544a1eee4c73240029a5bd691e318e953c1d9a33e0630061d69a038837 AUX pcsx2-1.7.5835-vanilla-shaderc.patch 2637 BLAKE2B 87a0774d44ad6d9b8f5219fbb2c36f4156bbefdeb172b6cca5ac6d310ab569e1687202b97b3056220fd0d5cacd0da1dbb11dcd6912b7d53850fbd0e419d13485 SHA512 1d624fae87b92c509404b0a27218a82163568350f223dbd2d9a2021d5207b923bdf9f7e13d5c6efd89aaea6eeb021ee825dce9be0a389ba0b5ee2adfa4a48c16 +AUX pcsx2-1.7.5855-no-libbacktrace.patch 955 BLAKE2B 035da91a0a64e9960846cd8d12bf649e4c536def15ca47e8a176294fbf389550f25ebb27e8ce55d9777390c1311b3b803410f57c19980dd677ef4c7e0f8d5d40 SHA512 a68d9d09dee53abcf5abe5b6eea3d7a5871d2f43eb6f684ad73f699c7930a8e89b8dc61df96f1f7a030ad90014b29b19080c6e2dc189efca67123b8509d2a04a DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6 DIST pcsx2-1.7.5724.tar.xz 11429708 BLAKE2B 773dddc2b754ec5eddccad6e520846811299aac9cddf7b5ab77cca13c330f457f2b1d045d5f0f804a70d7fd3e498b6aab62b32e0a58536afd6805785055c81c4 SHA512 1589a0f3087cbb7c57e648f7afc7f1a22edef2601bab10dec2928b31d77d81780f11916f5a56f353d4a1063ea7e01e6ddab8df9e4982424eb7cf14b3bcfe2e3d DIST pcsx2-1.7.5835.tar.xz 11565084 BLAKE2B 537aa890b668a1bed471f3677de1fee99f33fda41943dc4e7a11f8a85d2cbe831bfcd0040319643d370e90f31974272ee8ec4e17e3b6ec5d170d5750d38d707f SHA512 7e0541e5d0433a59047dfd15af3c3d90c61f61a416510cce14b89d5b641c45d7deae1a084ebd9e8b36f1768e714e3b480f1b28801e0f818b0290d7d06d384bc7 EBUILD pcsx2-1.7.5624.ebuild 4444 BLAKE2B 3602c1506b01d5fc22680968361fc3851d5495f22e0f6669023269d216ac8da017188afc93354cacfcb19b82f58e89bdb31e40d2ff13831930e4431cb3e01068 SHA512 4e03cfa18b447568e0af437763ce03701414270eabd330e9711a736c6470ed51737e4808754ee8dbb9bcc0f1934cae542fb44164083926ea774c8c7350f14594 EBUILD pcsx2-1.7.5724.ebuild 4658 BLAKE2B 0d2fc97197fda74d235b9f653992f0a56ae300510e71b20ddfbc641af68d94c44b25fc3a4abebe7169eb439fd050801137c5f8b7f9a5026279a55bb9d740b3c5 SHA512 f83dcae5a4c7a1699283abef12948ecada3fca29567a58b233384dfa12d870e3b15430a3605d08fcf4ce8cd83df1269da03dc0206d85bc6fbb1c9ce6241838d5 EBUILD pcsx2-1.7.5835.ebuild 4934 BLAKE2B da5f60edce65bb0e79ebb679c7cacd33161ca8b40a11ced3e09520b90afe71be4fb706d1acc0dbf049c0a85b5c3a7b905c20b8c1ad1ee443476a591086f93054 SHA512 2f571b64fea43e0a1e6bb6993c70c63bf521dea793f8dc3f7de3494747147a5308327c041df2da9d8b35c675726d774269577423a441a07bfc1056af8e8a2790 -EBUILD pcsx2-9999.ebuild 4934 BLAKE2B da5f60edce65bb0e79ebb679c7cacd33161ca8b40a11ced3e09520b90afe71be4fb706d1acc0dbf049c0a85b5c3a7b905c20b8c1ad1ee443476a591086f93054 SHA512 2f571b64fea43e0a1e6bb6993c70c63bf521dea793f8dc3f7de3494747147a5308327c041df2da9d8b35c675726d774269577423a441a07bfc1056af8e8a2790 +EBUILD pcsx2-9999.ebuild 4865 BLAKE2B df7e10e0cb8bd967bc0f2f6cb9f3ca300b3db3eaf0e0e772f790f02d820a3be516ad16ce3a8e5fa4678ce164ceef3c0f71f6fb85ff9c043baea8e39639245c55 SHA512 d87897b2932d6d6a89af0573e0a7544ce5d54e5eeeba6d7e0e094ff4c27bc1c499a0100474227fce98197ffe36524b9e55438df11749c50c63ee32b7f6d7e41d MISC metadata.xml 926 BLAKE2B 0076f5137c48d1d000eeff8f82457dfbf01c02928cc2a97479fcdef1eb71ce79c444ece7db8cc949e9c1f143b46623cae5992b51c27be87cf8bbe2bea254a499 SHA512 9e23b0c991418f8c8331795477ece481e0d8a78f4da06db03738cfa303555b80f1bc772f9d521674574fb500cf742b1c5193a0b6084b34f8b16c1cd2f1d33332 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..548f90e8ec1f --- /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 lacks it. + +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) |