diff options
Diffstat (limited to 'games-emulation')
-rw-r--r-- | games-emulation/Manifest.gz | bin | 11869 -> 11859 bytes | |||
-rw-r--r-- | games-emulation/fceux/Manifest | 3 | ||||
-rw-r--r-- | games-emulation/fceux/fceux-2.6.5.ebuild | 67 | ||||
-rw-r--r-- | games-emulation/fceux/files/fceux-2.4.0-gcc13.patch | 31 | ||||
-rw-r--r-- | games-emulation/pcsx2/Manifest | 11 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch | 6 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch | 15 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch | 13 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch | 8 | ||||
-rw-r--r-- | games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild | 277 |
10 files changed, 0 insertions, 431 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz Binary files differindex 5920c4a5c5f0..5c1585c77653 100644 --- a/games-emulation/Manifest.gz +++ b/games-emulation/Manifest.gz diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest index df54fbc10493..14e75505bda0 100644 --- a/games-emulation/fceux/Manifest +++ b/games-emulation/fceux/Manifest @@ -1,10 +1,7 @@ AUX fceux-2.4.0-desktop.patch 447 BLAKE2B c9dc55fc34d990de50a1897cc9d1fe8abb5060336ae7b227ac1b07e28ef89d15e202be790ec3f8ff0f8280a64b81ae28c98ce1a22e54f57d93b2e3bb04a24b59 SHA512 00a2af80e5dc6f5ddff8e5fc28b94bc2e249798ec44f5f0b9ed414dc8438e1937058f9bab65cbb5b2c9c6dec85af1a51e58f68405dd758db4ec293efbdaf5398 -AUX fceux-2.4.0-gcc13.patch 1064 BLAKE2B 97c690be1f111d413aa4b6431bcfe5a4508f6d36dc975983437177d7154c797350dff1e57e9984ed9604a1c91511828f9e4cdca3c6e7ca68f554783a705208fa SHA512 8e7a56442f86f13bebe9d796575c21896b032da9dd3b9be000731330ab7248d652527d21a8c5b3e2475b37214ec1159dcde3b4266bf90f31d2cdda616919b587 AUX fceux-2.4.0-no-git.patch 377 BLAKE2B 8b0be40a0eba5249f73942ea774dc0a37e73ac71fe1684d01551cd96876878d53219c0744ba0e6789c3663c56e58fccc2a2a450b03207219c76e2c10b04ea679 SHA512 6c67d5b823a2b70d6982d9f911edab65c0bcf2cf5faf1ae00004201aefe99d5feae4592204c2586eaa43affff6d05f2e6e3b9274add4713073c0e1cfb519465d AUX fceux-2.6.6-luajit.patch 694 BLAKE2B 1fa2d756c0b1f941d17f659e3557787b5545cb6c3fa7771fec8dad4ba8b4ba9c8f8f22c6105732e7c8cc0c0f8d5cbd05b880496a34fd42609ce9195b7fecb7c2 SHA512 bbd8782d246ce9b451b8000db373eec9a9e6978f08e621ccb81b95eab1540eff2ba3290450bd2c3fac7a36fc2d26765595184f993e06315da7c07df2b03fcc53 AUX fceux-2.6.6-no-glx.patch 286 BLAKE2B 895c4a4fae7deb68fca6f26641f6c038b5f6fadd391dbf9a920145555e204f769435a305770c5a05bdcf9476e7d783dece8d7d9c698d6ac22314363b51ec2e12 SHA512 2b39ffb34b73522bce3610631f302c9bc843fe2acb1df156f5c14cfc4b0d20cdd1938a979ce09dfe9f3a16cc6fed238db04e4bb6aa81e177c852392fc5e3b146 -DIST fceux-2.6.5.tar.gz 23299626 BLAKE2B 167fbe401635b96ad0c1c07826b1e7b032fa66806a2c395aebcae9d2b4295a327d2abad960a883751da43baf49f91276dd6521692406ce610df7c1ce167006ca SHA512 3d37583d1917783513f05bd215437401aacda3bd1930238212cbbdd6ba105236028066d7198bfd8182e6d55ded7ce293f1e5d23295d2b730ec800dc5e5652598 DIST fceux-2.6.6.tar.gz 23330274 BLAKE2B 4d7779af0afc5fa12d3734d282f92b105757d204c69091b4e3574e4ced6179c5e202b752225f412d68331c9866c63b626703b014835d398ca1262deeb0d32654 SHA512 0a6cff4c6b900569978003675812d92d893281c2bdf3b0b58c07e257251648ee325f9bb29b01253ab1a5e9354631d91a6e67a1e6bb36ebe89d5067509cabfa64 -EBUILD fceux-2.6.5.ebuild 1712 BLAKE2B 838e7093465ce61a6fa750f0fdf53656ea9d14f6c88b0c9decca42d07d31d43f3bb5708bfee11bf389d81b69b0b6494fdb44e5eef8cc51d615a38c8d8b600e9f SHA512 3c2bb6717ed2971e9f18550e27c0c4cfc7ed6e0f63aec06fba9b56fd94789d15aa47a55baa9b7a73276d8c5f9fe99b75e71d19609915272d413840f09744468d EBUILD fceux-2.6.6.ebuild 1734 BLAKE2B aff14cce3852a594a7c6df12da1e344d3253867d86c34a1a45bcdd02b3b31f73250b28616ae134b9a05c97eb2ed91cfb37f3d12db386c0996b1a0b8234c070aa SHA512 0a57db74c6a3a1170303d67a64e18f21cfca99e77459c7b797a75337092f2fbb7e62284891ddbe377d1b1d471086f88a747cbbc8ef5cba7ef60c2cfa3c6ec233 MISC metadata.xml 655 BLAKE2B 937f4fdff1702689100b9b49d14878ddcd960bc1119160f0892c1458e707a9af0c02f3f62bcfa7b5a722f999695cc125f7ea35456969df4843315fffa06acf54 SHA512 422a83db150c7026db66e5ca7fc160b137ce5613c267a4ee9a9496be2c7c471382338a8bd03212aac26f41ff193d62a952c148717e0643776c63e51a3e520aaf diff --git a/games-emulation/fceux/fceux-2.6.5.ebuild b/games-emulation/fceux/fceux-2.6.5.ebuild deleted file mode 100644 index 16ff86085b5c..000000000000 --- a/games-emulation/fceux/fceux-2.6.5.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 ) -inherit cmake lua-single xdg - -DESCRIPTION="Portable Famicom/NES emulator, an evolution of the original FCE Ultra" -HOMEPAGE="https://fceux.com/" -SRC_URI="https://github.com/TASEmulators/fceux/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ffmpeg qt6 x264 x265" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - ${LUA_DEPS} - qt6? ( dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only] ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5[-gles2-only] - dev-qt/qtwidgets:5 - ) - media-libs/libglvnd - media-libs/libsdl2[joystick,sound,threads,video] - sys-libs/zlib:=[minizip] - ffmpeg? ( media-video/ffmpeg:= ) - x264? ( media-libs/x264:= ) - x265? ( media-libs/x265:= )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.0-desktop.patch - "${FILESDIR}"/${PN}-2.4.0-no-git.patch - "${FILESDIR}"/${PN}-2.4.0-gcc13.patch -) - -src_prepare() { - cmake_src_prepare - - use x264 || sed -i '/pkg_check_modules.*X264/d' src/CMakeLists.txt || die - use x265 || sed -i '/pkg_check_modules.*X265/d' src/CMakeLists.txt || die - use ffmpeg || sed -i '/pkg_check_modules.*LIBAV/d' src/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DPUBLIC_RELEASE=yes - -DQT6=$(usex qt6) - ) - - cmake_src_configure -} - -src_install() { - local DOCS=( README TODO-SDL changelog.txt documentation/. readme.md ) - cmake_src_install - - # remove unused/duplicate files - rm "${ED}"/usr/share/fceux/{lua5{1,.1}.dll,{fceux,taseditor}.chm} \ - "${ED}"/usr/share/doc/${PF}/fceux{,-net-server}.6 \ - "${ED}"/usr/share/man/man6/fceux-net-server.6 || die -} diff --git a/games-emulation/fceux/files/fceux-2.4.0-gcc13.patch b/games-emulation/fceux/files/fceux-2.4.0-gcc13.patch deleted file mode 100644 index 5e6348281654..000000000000 --- a/games-emulation/fceux/files/fceux-2.4.0-gcc13.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/TASEmulators/fceux/pull/629 - -From 6ad3837eebdab597da693a39068b2c05716282be Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Mon, 10 Apr 2023 05:18:41 +0100 -Subject: [PATCH] Fix build with GCC 13 - -GCC 13 (as usual for new compiler releases) shuffles around some internal includes and so etc is no longer transitively included: -``` -In file included from /var/tmp/portage/games-emulation/fceux-2.6.5/work/fceux-2.6.5/src/drivers/Qt/AboutWindow.cpp:33: -/usr/include/x264.h:40:4: warning: #warning You must include stdint.h or inttypes.h before x264.h [-Wcpp] - 40 | # warning You must include stdint.h or inttypes.h before x264.h - | ^~~~~~~ -/usr/include/x264.h:127:5: error: uint8_t does not name a type - 127 | uint8_t *p_payload; - | ^~~~~~~ -``` - -See https://gnu.org/software/gcc/gcc-13/porting_to.html. - -Bug: https://bugs.gentoo.org/900611 ---- a/src/drivers/Qt/AboutWindow.cpp -+++ b/src/drivers/Qt/AboutWindow.cpp -@@ -30,6 +30,7 @@ - #endif - - #ifdef _USE_X264 -+#include <cstdint> - #include "x264.h" - #endif - diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 493303cac693..00f81df3628a 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -3,20 +3,9 @@ AUX pcsx2-1.6.0-wx-config.patch 613 BLAKE2B e5ff17ae5bddde776990cace4735883e8869 AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387 AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7 AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb07306007edbb001fc44cab21d3c4356a46a1104fc77de9d7fbf4dd76147fd2e3e8695ff4abf6e984dbda1a832e610c1126 SHA512 35ae6f69f4c7ef0bac86b231e75438cf24f8c50cb72f03b4540164c87ced0a3c167cb911cd5d7949f9fad41895fe97fc775ff8f179601d73597d967c79029e83 -AUX pcsx2-1.7.4667-system-chdr.patch 239 BLAKE2B 7a761b2e800b0a5683f4c65f23730e02752502a0c1098422ffa37b0562a025cf8c533dfaa5bdd20811e0d643d32eeb8a5cc8028c7a02b146b37c7f22fdb511c4 SHA512 7d09e9707bd0d2d98b637f97b73afb83d3eb88a91e938215de5894b184ecdd3f0bb2c5486a03bc4b9767b4226c3e99fc0ac0a00797d03ac8850081dbe1a91211 -AUX pcsx2-1.7.4667-system-gtest.patch 504 BLAKE2B 23a15c765151fb25e54b5dfb4c948eea7b5258ae5cbcb68f214128301902c900b2e1882ae66b9a6a0838cc18eabe5c7889be29d396f6f6ba5b71e33f7cca17e4 SHA512 2571ed120173cbcd912e0d3f12afc79716c8ba791cc292b5b7f3ee133c040eed2769079a4f372b5eaa501d640498bb3781142af97447d055eac5ce10995fddf3 -AUX pcsx2-1.7.4667-system-zstd.patch 528 BLAKE2B 5539f8de26ee029d95199f3da1e5eea7f1b8a226b01ee53df8aa6ed3d514bb66e8c7ab5a4a44d8fccf4e7eb0dea058028db1c9509a0d9c67f48224d3385d4a9a SHA512 c3eb6e32c3b7b4384e438597d6bf3bae49309c0b9c7b38374edadbde2f6430c5583b2bec07daf14c8c71efa8b848af5ebe0e55f1df84f37ff98b854062644cec -AUX pcsx2-1.7.4795-rapidyaml-0.5.patch 323 BLAKE2B 1ddc927ea824793997d0fb371caa8da1db2315c0ba7205e88cc3fb405a29e00025e074a447da381ad93924f3e85f4565534d2e7b957cb43a3d9cf1b2e41a51fd SHA512 04de3ca3ee0a69c283e6a59420dd67aa77fea083607366bac7cab7ea4be1cb6207dd3d78e3179c7de6e802c8607b275d64ec4ca3f57037e27745c732a1e231d4 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 -DIST pcsx2-1.7.4940.tar.gz 12433815 BLAKE2B ee59fab55015182e8c809acd0317916b070a5f8f4c3d8a162639eb5119d10beb83c9dae1242394e00694360d3270483ddc2de103b9f31e155a2b26f41957edec SHA512 be4ed47f531cf173da9471e4a30a60f6f2ecf021f34358d94c17705da644bf9db7560d4b3e990828307161e97efa8d551353fafcb57b009be0e26e423acdf3f6 DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b SHA512 ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6 -DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e -DIST pcsx2-fmt-b6f4ceaed0.tar.gz 826246 BLAKE2B 74a4784bd1842d3afa4023efb8f74ad53b4d5b4676c5529f2c7b516db568f91d945804db20b425fececfbf10a44a1fdf39a94f88d6f40339328ceb263e15b37f SHA512 805424979dbed28ba0a48f69928a14d122de50f21dcadb97f852dcc415ab8a7a30fcf2eb90c06f006c54cbea00fcfe449d340cbb40e6a0454fffbc009fbe25e5 -DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c -DIST pcsx2-rcheevos-3af1e2fc51.tar.gz 541818 BLAKE2B 88d17b6943689b8f34240392c0e9f1c66a3f06e2bbc67cdbb1a9ac83608f2b1b74ef64cfcba40a3389f8ca7ecc6ec99b212994bef0d30e846d35673f5f0fee89 SHA512 991b64c676f3e84f8726a1965fe7709d41a04ac6cb4ab5e91ec415d6bfdf776bff909b75bfbdca705f3c03f1bfc413a15bde1755f8afa53a12148adfffb7ac83 -DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b -EBUILD pcsx2-1.7.4940-r1.ebuild 8563 BLAKE2B abe7ff5e05e0581962e52a2a2965f595751aaf33e9db5fc2580d679ffe6004846143ff9b7dc366c251c6a2d4675018b5bef131880e234ca3375b10012c952c54 SHA512 3459ced36ed374c4db5a9c3715e3c7ba6c092998b9a5628dcb054b4ed34401b3e37798b40c28b27fe09e68a61dbda7da6832e658f19d59950811f62e2df80022 EBUILD pcsx2-1.7.5033.ebuild 4144 BLAKE2B 8c74f5ca60dc1e1e54db7c65582621922634917a4e3ad3a7c6935984420389276456969cbca876a8d501ee26f6e39d4d899ea3aa5de5f35c33ae85eccad41bfc SHA512 557c2ea2d6861dcf4cf09d7cc1c5f7ad12d573bd3e47f82bde4880c96b862351b177efda71d39eb427b4da0af70c92a4433f3273d471b34282ca41dc2215c922 EBUILD pcsx2-9999.ebuild 4144 BLAKE2B 8c74f5ca60dc1e1e54db7c65582621922634917a4e3ad3a7c6935984420389276456969cbca876a8d501ee26f6e39d4d899ea3aa5de5f35c33ae85eccad41bfc SHA512 557c2ea2d6861dcf4cf09d7cc1c5f7ad12d573bd3e47f82bde4880c96b862351b177efda71d39eb427b4da0af70c92a4433f3273d471b34282ca41dc2215c922 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426 diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch deleted file mode 100644 index 9787cd380337..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-chdr.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -164 +164,2 @@ --add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL) -+pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr) -+alias_library(chdr-static PkgConfig::chdr) diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch deleted file mode 100644 index 858efc3b3e47..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-gtest.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -96,6 +95,0 @@ --if(ENABLE_TESTS) -- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt") -- message(WARNING "ENABLE_TESTS was on but gtest was not found, unit tests will not be enabled") -- set(ACTUALLY_ENABLE_TESTS Off) -- endif() --endif() ---- a/tests/ctest/CMakeLists.txt -+++ b/tests/ctest/CMakeLists.txt -@@ -20 +20,2 @@ --add_subdirectory(gtest) -+find_package(GTest REQUIRED) -+alias_library(gtest_main GTest::gtest_main) diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch deleted file mode 100644 index 27b2e82852e8..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.4667-system-zstd.patch +++ /dev/null @@ -1,13 +0,0 @@ -This can use system zstd already but will not find it given -it does not install cmake files, so use pkg-config. -https://bugs.gentoo.org/872254 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -114,5 +114,2 @@ --find_optional_system_library(zstd 3rdparty/zstd 1.4.5) --if (${zstd_TYPE} STREQUAL System) -- alias_library(Zstd::Zstd zstd::libzstd_shared) -- alias_library(pcsx2-zstd zstd::libzstd_shared) --endif() -+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd) -+alias_library(Zstd::Zstd PkgConfig::zstd) diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch b/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch deleted file mode 100644 index c4d11083ad45..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.4795-rapidyaml-0.5.patch +++ /dev/null @@ -1,8 +0,0 @@ -Continuation of https://github.com/PCSX2/pcsx2/commit/a59f95317a3fd ---- a/pcsx2/GameDatabase.cpp -+++ b/pcsx2/GameDatabase.cpp -@@ -1040,3 +1040,3 @@ - const u32 index = static_cast<u32>(s_hash_database.size()); -- for (const ryml::NodeRef& n : node["hashes"].children()) -+ for (const auto& n : node["hashes"].children()) - { diff --git a/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild deleted file mode 100644 index 4976851a41d4..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.4940-r1.ebuild +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop fcaps flag-o-matic - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git" -else - HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1 - HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9 - HASH_RCHEEVOS=3af1e2fc5188d6e932ee379942f4049ea877e648 - HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5 - HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f - SRC_URI=" - https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz - -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz - https://github.com/fmtlib/fmt/archive/${HASH_FMT}.tar.gz - -> ${PN}-fmt-${HASH_FMT::10}.tar.gz - https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz - -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz - vulkan? ( - https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz - -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz - -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz - ) - " - KEYWORDS="-* ~amd64" -fi - -DESCRIPTION="PlayStation 2 emulator" -HOMEPAGE="https://pcsx2.net/" - -LICENSE=" - GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+ - ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain -" -SLOT="0" -IUSE="alsa cpu_flags_x86_sse4_1 dbus jack pulseaudio sndio test vulkan wayland" -REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support -RESTRICT="!test? ( test )" - -# dlopen: qtsvg, vulkan-loader, wayland -COMMON_DEPEND=" - app-arch/xz-utils - app-arch/zstd:= - dev-cpp/rapidyaml:= - dev-libs/libaio - dev-libs/libchdr - dev-libs/libzip:=[zstd] - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - media-libs/libglvnd - media-libs/libpng:= - >=media-libs/libsdl2-2.0.22[haptic,joystick] - media-video/ffmpeg:= - net-libs/libpcap - net-misc/curl - sys-libs/zlib:= - virtual/libudev:= - x11-libs/libXrandr - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - sndio? ( media-sound/sndio:= ) - vulkan? ( media-libs/vulkan-loader ) - wayland? ( dev-libs/wayland ) -" -# patches is a optfeature but always pull given PCSX2 complaints if it -# is missing and it is fairly small (installs a ~1.5MB patches.zip) -RDEPEND=" - ${COMMON_DEPEND} - <games-emulation/pcsx2_patches-0_p20230917 -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto - test? ( dev-cpp/gtest ) -" -BDEPEND=" - dev-qt/qttools:6[linguist] - wayland? ( - dev-util/wayland-scanner - kde-frameworks/extra-cmake-modules - ) -" - -FILECAPS=( - -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 -) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch - "${FILESDIR}"/${PN}-1.7.3773-lto.patch - "${FILESDIR}"/${PN}-1.7.4667-flags.patch - "${FILESDIR}"/${PN}-1.7.4667-system-chdr.patch - "${FILESDIR}"/${PN}-1.7.4667-system-gtest.patch - "${FILESDIR}"/${PN}-1.7.4667-system-zstd.patch - "${FILESDIR}"/${PN}-1.7.4795-rapidyaml-0.5.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - local EGIT_SUBMODULES=( - # libfmt is volatile and upstream is unlikely to make fixes for - # latest system copy punctually (may revisit this eventually) - 3rdparty/fmt/fmt - - # has no build system and is not really setup for unbundling - 3rdparty/rcheevos/rcheevos - - # system rapidyaml is still used, but this uses another part - # of the source directly (fast_float) and so allow the submodule - # https://github.com/PCSX2/pcsx2/commit/af646e449 - 3rdparty/rapidyaml/rapidyaml - 3rdparty/rapidyaml/rapidyaml/extern/c4core - 3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float - - # glslang can be troublesome to unbundle (bug #831217), - # also keep vulkan-headers to stay in sync - $(usev vulkan ' - 3rdparty/glslang/glslang - 3rdparty/vulkan-headers - ') - ) - - git-r3_src_unpack - else - default - - mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die - mv fast_float-${HASH_FASTFLOAT} \ - "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die - - rmdir "${S}"/3rdparty/fmt/fmt || die - mv fmt-${HASH_FMT} "${S}"/3rdparty/fmt/fmt || die - - rmdir "${S}"/3rdparty/rcheevos/rcheevos || die - mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die - - if use vulkan; then - rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die - mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die - mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die - fi - fi -} - -src_prepare() { - cmake_src_prepare - - sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \ - -i pcsx2/Pcsx2Config.cpp || die - - if [[ ${PV} != 9999 ]]; then - sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \ - -i cmake/Pcsx2Utils.cmake || die - - # delete all 3rdparty/* except known-used ones in non-live - local keep=( - # TODO?: rapidjson and xbyak are packaged and could be unbundlable - # w/ patch, and discord-rpc be optional w/ dependency on rapidjson - cpuinfo cubeb demangler discord-rpc fmt glad imgui include jpgd - lzma rapidjson rapidyaml rcheevos simpleini soundtouch xbyak zydis - $(usev vulkan 'glslang vulkan-headers') - ) - find 3rdparty -mindepth 1 -maxdepth 1 -type d \ - -not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die - fi -} - -src_configure() { - if use vulkan; then - # for bundled glslang (bug #858374) - append-flags -fno-strict-aliasing - - # odr violations in pcsx2's vulkan code, disabling as a safety for now - # (vulkan support tend to receive major changes, is more on WIP side) - filter-lto - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=no - -DDBUS_API=$(usex dbus) - -DDISABLE_BUILD_DATE=yes - -DENABLE_TESTS=$(usex test) - -DUSE_LINKED_FFMPEG=yes - -DUSE_VTUNE=no - -DUSE_VULKAN=$(usex vulkan) - -DWAYLAND_API=$(usex wayland) - -DX11_API=yes # fails if X libs are missing even if disabled - - # note that the current upstream is somewhat hostile to using system - # libs, system installs, or any modifications and may disregard any - # bugs that is not reproducible with the appimage using bundled libs - -DUSE_SYSTEM_LIBS=yes - -DUSE_SYSTEM_FMT=no # volatile, keep bundled at least "for now" - - # sse4.1 is the bare minimum required, -m is required at build time - # (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp) - # https://github.com/PCSX2/pcsx2/pull/4329 - -DARCH_FLAG=-msse4.1 - - # 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) - -DCHECK_PULSE=$(usex pulseaudio) - -DCHECK_SNDIO=$(usex sndio) - -DLAZY_LOAD_LIBS=no - ) - - cmake_src_configure -} - -src_test() { - cmake_build unittests -} - -src_install() { - newbin "${BUILD_DIR}"/bin/pcsx2-qt ${PN} - - insinto /usr/share/${PN} - doins -r "${BUILD_DIR}"/bin/resources - - dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt} - - newicon bin/resources/icons/AppIconLarge.png ${PN}.png - make_desktop_entry ${PN} ${PN^^} -} - -pkg_postinst() { - fcaps_pkg_postinst - - local replacing= - if [[ ${REPLACING_VERSIONS##* } ]]; then - if ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1; then - replacing=old - elif ver_test ${REPLACING_VERSIONS##* } -lt 1.7.3773; then - replacing=wx - else - replacing=any - fi - fi - - if [[ ${replacing} == old ]]; then - elog - elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, notably" - elog "it is now a 64bit build using Qt6. Just-in-case it is recommended to" - elog "backup your configs, save states, and memory cards before use." - elog "The executable was also renamed from 'PCSX2' to 'pcsx2'." - fi - - if [[ ${replacing} == @(|old) && ${PV} != 9999 ]]; then - elog - elog "${PN}-1.7.x is a development branch where .x increments every changes." - elog "Stable 1.6.0 is getting old and lacks many notable features (e.g. native" - elog "64bit builds). Given it may be a long time before there is a new stable," - elog "Gentoo will carry and update 1.7.x roughly every months." - elog - elog "Please report an issue if feel a picked version needs to be updated ahead" - elog "of time or masked (notably for handling regressions)." - fi - - if [[ ${replacing} == wx ]]; then - ewarn - ewarn "Note that wxGTK support been dropped upstream since >=${PN}-1.7.3773," - ewarn "and so USE=qt6 is gone and Qt6 is now always used." - fi -} |