From 4274bed0c1f1fd06a654f5816e30d82059f4cc39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Apr 2023 17:25:42 +0100 Subject: gentoo auto-resync : 05:04:2023 - 17:25:42 --- games-emulation/pcsx2/Manifest | 3 - .../files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch | 60 ------ games-emulation/pcsx2/pcsx2-1.7.4217.ebuild | 237 --------------------- 3 files changed, 300 deletions(-) delete mode 100644 games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch delete mode 100644 games-emulation/pcsx2/pcsx2-1.7.4217.ebuild (limited to 'games-emulation/pcsx2') diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 16437cf7a18e..ec0af111d381 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -7,10 +7,8 @@ AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d5 AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387 AUX pcsx2-1.7.3602-rapidyaml-0.5.0.patch 1519 BLAKE2B 97a54b242566ebb18fb2c19028fe22a8e9ffa3acc4a84e3d3a0e4199abb5dce29f9820ad1f118b3867239ca6cc046dea5b01f060d8917668e2dbea1e8b7def35 SHA512 00be997ac4a4ec1b7947afe78cf2494690ce94c060b4960eecf07e5e5307c4658061073e338f64ad4cb908bca080d61c221589218a7a3ab02e023f6257c8ff4d AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7 -AUX pcsx2-1.7.3803-rapidyaml-0.5.0.patch 2314 BLAKE2B 721989e9a04febcc57cf5a9338b2886a2512069540f7463fec9073bd9df54136b4b363f6965c79aaaf3d6b500b22af4907473e5f50f04e1fcca9855632829eea SHA512 0b266fda0e4c6ffd6362f2256ef18bc4d2acb306f732bf1eaa744c70531199740a27f15727854f6f4a84c50c7e55f8f49259874c810aff8168a24096286cfb1d DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789 -DIST pcsx2-1.7.4217.tar.gz 9217806 BLAKE2B fcdca37523a793753dac00ababeb28acea250473ce31d0a4519cf71b5d26b9a1c36d230f2fb002f423ae6a56c9e30712212717fd86451c00c37825a55d5c8c37 SHA512 382f31a9757325ed51d1e0d8f1471bf1ce7b42ec7d9df7b18a8dc4cd33278052d6fb1c2bdd82d1cf9e106b2ff68b012773567138d7808e6df5924d71f1b0bedc DIST pcsx2-1.7.4280.tar.gz 8983164 BLAKE2B 822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585 SHA512 60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c @@ -18,7 +16,6 @@ DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57 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.3738.ebuild 6993 BLAKE2B 2bd343f6a8dfc20d0a2758eda004fb7f9e0f6b3bd62091d6f67cdb8a0fa9d61e02a7087a14bc659d188a9c2069ab6e8917fe98e9214cd615584b97e5b08cad2a SHA512 2c88b36f9191e5a3360d9dcc8167680df48f409acd1e13c40fa22721e6e0f4068541b6984924c8f1671dc7f3a6a33d1d436f6f4518ebbc4e7538db0d23a92a91 -EBUILD pcsx2-1.7.4217.ebuild 7383 BLAKE2B 572bae0e77bc3d713a279596668b8b1495303323be7f06cc798aa0dd8d59c9d53cf6d49fa62d515f19bed4c1208e7e263c67b23019ad57716e38270f6662fe8d SHA512 6caa8e7835c29fc518349c891168e873b3683be4c62e4bfd9cc0653eb8da703af8abf2458b3bb877e11cdd9e7ee2e476c6f496d37894ba9bbad4314c932fbcad EBUILD pcsx2-1.7.4280.ebuild 7377 BLAKE2B a55490c259a9690da44889ae601b27293788bf3f69ad5e4eef4eba9046eda6c337e7e976be2b51292988250748c77cecea211289e5db1300f2803afabbd4beb7 SHA512 674d6714a39aa8a3ba4c28ec1d96b6fcfa63d3f885bd9457336e9f628dae2d535b9293366000d5920e0a3ff2c138c94047c3d71049ba9d53ab712c61785ccf01 EBUILD pcsx2-9999.ebuild 7377 BLAKE2B a55490c259a9690da44889ae601b27293788bf3f69ad5e4eef4eba9046eda6c337e7e976be2b51292988250748c77cecea211289e5db1300f2803afabbd4beb7 SHA512 674d6714a39aa8a3ba4c28ec1d96b6fcfa63d3f885bd9457336e9f628dae2d535b9293366000d5920e0a3ff2c138c94047c3d71049ba9d53ab712c61785ccf01 MISC metadata.xml 905 BLAKE2B 704b0ab594db3d23761b25d1d18b0a7121a989f967cfeb533f06ffa2d688fbaaa426c61d9f7c8068410129784924c26684de9919994a9580f2db531f5e34aea3 SHA512 f65374e9062406f81607514193b362a11e7e682aca7e40995679a7d7597ab13304c0f57f6b4c9eebb4ebee60cb4cdaff06ad9801ba6ce75c3698e3a926d5bf1d diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch deleted file mode 100644 index b42ae36045ad..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.3803-rapidyaml-0.5.0.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://github.com/PCSX2/pcsx2/issues/7623 -https://github.com/PCSX2/pcsx2/pull/7847 ---- a/pcsx2/GameDatabase.cpp -+++ b/pcsx2/GameDatabase.cpp -@@ -176,5 +176,5 @@ - if (node.has_child("gameFixes") && node["gameFixes"].has_children()) - { -- for (const ryml::NodeRef& n : node["gameFixes"].children()) -+ for (const ryml::ConstNodeRef& n : node["gameFixes"].children()) - { - bool fixValidated = false; -@@ -207,5 +207,5 @@ - if (node.has_child("speedHacks") && node["speedHacks"].has_children()) - { -- for (const ryml::NodeRef& n : node["speedHacks"].children()) -+ for (const ryml::ConstNodeRef& n : node["speedHacks"].children()) - { - bool speedHackValidated = false; -@@ -237,5 +237,5 @@ - if (node.has_child("gsHWFixes")) - { -- for (const ryml::NodeRef& n : node["gsHWFixes"].children()) -+ for (const ryml::ConstNodeRef& n : node["gsHWFixes"].children()) - { - const std::string_view id_name(n.key().data(), n.key().size()); -@@ -258,5 +258,5 @@ - if (node.has_child("memcardFilters") && node["memcardFilters"].has_children()) - { -- for (const ryml::NodeRef& n : node["memcardFilters"].children()) -+ for (const ryml::ConstNodeRef& n : node["memcardFilters"].children()) - { - auto memcardFilter = std::string(n.val().str, n.val().len); -@@ -268,5 +268,5 @@ - if (node.has_child("patches") && node["patches"].has_children()) - { -- for (const ryml::NodeRef& n : node["patches"].children()) -+ for (const ryml::ConstNodeRef& n : node["patches"].children()) - { - // use a crc of 0 for default patches -@@ -293,5 +293,5 @@ - if (node.has_child("dynaPatches") && node["dynaPatches"].has_children()) - { -- for (const ryml::NodeRef& n : node["dynaPatches"].children()) -+ for (const ryml::ConstNodeRef& n : node["dynaPatches"].children()) - { - DynamicPatch patch; -@@ -299,5 +299,5 @@ - if (n.has_child("pattern") && n["pattern"].has_children()) - { -- for (const ryml::NodeRef& db_pattern : n["pattern"].children()) -+ for (const ryml::ConstNodeRef& db_pattern : n["pattern"].children()) - { - DynamicPatchEntry entry; -@@ -307,5 +307,5 @@ - patch.pattern.push_back(entry); - } -- for (const ryml::NodeRef& db_replacement : n["replacement"].children()) -+ for (const ryml::ConstNodeRef& db_replacement : n["replacement"].children()) - { - DynamicPatchEntry entry; diff --git a/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild deleted file mode 100644 index e94d9f32ace2..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.4217.ebuild +++ /dev/null @@ -1,237 +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_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96 - 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/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 jack pulseaudio sndio test vulkan wayland" -REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support -RESTRICT="!test? ( test )" - -# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland -RDEPEND=" - app-arch/xz-utils - app-arch/zstd:= - >=dev-cpp/rapidyaml-0.5:= - dev-libs/libaio - dev-libs/libchdr - dev-libs/libfmt:= - 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-libs/libsoundtouch:= - media-video/ffmpeg:= - net-libs/libpcap - net-misc/curl - sys-libs/zlib:= - virtual/libudev:= - x11-libs/libXrandr - alsa? ( media-libs/alsa-lib ) - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - sndio? ( media-sound/sndio:= ) - vulkan? ( media-libs/vulkan-loader ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - test? ( dev-cpp/gtest )" -BDEPEND="dev-qt/qttools[linguist]" - -FILECAPS=( - -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 -) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch - "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch - "${FILESDIR}"/${PN}-1.7.3773-lto.patch - "${FILESDIR}"/${PN}-1.7.3803-rapidyaml-0.5.0.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - local EGIT_SUBMODULES=( - # 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/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 "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \ - -i pcsx2/Frontend/CommonHost.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 glad imgui include jpgd lzma - rapidjson rapidyaml rcheevos simpleini 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() { - # for bundled glslang (bug #858374) - use vulkan && append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=no - -DDISABLE_BUILD_DATE=yes - -DENABLE_TESTS=$(usex test) - -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 - - # 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 - - # 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,PCSX2_FAQ.pdf,debugger.txt} - newman bin/docs/PCSX2.1 ${PN}.1 - - 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 -} -- cgit v1.2.3