From f356af92b88d56b78588e81310493d4f5a2f6d18 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 May 2023 23:44:42 +0100 Subject: gentoo auto-resync : 10:05:2023 - 23:44:41 --- games-emulation/pcsx2/Manifest | 9 +- games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild | 246 ++++++++++++++++++++++++ games-emulation/pcsx2/pcsx2-1.7.3738.ebuild | 232 ----------------------- games-emulation/pcsx2/pcsx2-1.7.4280.ebuild | 237 ------------------------ games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild | 247 +++++++++++++++++++++++++ games-emulation/pcsx2/pcsx2-1.7.4425.ebuild | 237 ------------------------ games-emulation/pcsx2/pcsx2-9999.ebuild | 16 +- 7 files changed, 510 insertions(+), 714 deletions(-) create mode 100644 games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild delete mode 100644 games-emulation/pcsx2/pcsx2-1.7.3738.ebuild delete mode 100644 games-emulation/pcsx2/pcsx2-1.7.4280.ebuild create mode 100644 games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild delete mode 100644 games-emulation/pcsx2/pcsx2-1.7.4425.ebuild (limited to 'games-emulation/pcsx2') diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 6f916b5d2a02..d551d864eafc 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -9,15 +9,14 @@ AUX pcsx2-1.7.3602-rapidyaml-0.5.0.patch 1519 BLAKE2B 97a54b242566ebb18fb2c19028 AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7 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.4280.tar.gz 8983164 BLAKE2B 822322bac0ae5bbd484246316a2c0466f5d9b1783ab3fea28eb42ac9f9ddb2d4c104ed1bf824fc36b91a5d7bf9815e48f970e999148b2afe66f2cf7dd13c8585 SHA512 60446743d511789482bc52ac9ff52a26e1d35b753c8a9320a45658c9070562533ba553716122d406b67bc3bac6ada2e5383c2213b6b354a719dbd2d811b79a5e DIST pcsx2-1.7.4425.tar.gz 8976395 BLAKE2B 9c2abaa90ad238a436e8ec801dab7da40a842fbf9e6a2bc9358b101cb4cea8e84f644bfac4b101a79307b7208781e4dfe34ccacd56dcc9df1feba867d360eb31 SHA512 a62e9d9c2f51a75e620a56a26b76c22d5eb922a7402ee44d91778cb4392cbfb168b9d77f17c2f83d4fc52f3af3983c63e2d7c695e33cf0d3575d75ae61994bc8 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-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45 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 6995 BLAKE2B 32a94ee14dcb0028b2280ddbc7fcafdc0f13476349d6ed22e946edd0ecc08e4d2a294b1e75b9ee36335a6b5960209d13983bf0b5f5beb16764f4c1b8c9831ba8 SHA512 bd11c8952966d956cda822e5a4ac880bdf164dee72cc0f6664bf8d314f87ada5e364a7559ef554fbe41166adc294559223517d937274482bdcdeacca519684ac -EBUILD pcsx2-1.7.4280.ebuild 7379 BLAKE2B 0deae8293fa56918fb12059817bdc6f44cad94368922eaba70b45f18417a9ce981404155e0ae62237070007ac0bb009b6e7068029cb9aa7ec74964f0847e1558 SHA512 6e20ee1d1175dd57834027de19e17789a9f61d4d15401308ad27d678039e431a404e8304f974ac79cd954901bb0cc709e73a660b49801408944a743ec98bfd45 -EBUILD pcsx2-1.7.4425.ebuild 7379 BLAKE2B 0deae8293fa56918fb12059817bdc6f44cad94368922eaba70b45f18417a9ce981404155e0ae62237070007ac0bb009b6e7068029cb9aa7ec74964f0847e1558 SHA512 6e20ee1d1175dd57834027de19e17789a9f61d4d15401308ad27d678039e431a404e8304f974ac79cd954901bb0cc709e73a660b49801408944a743ec98bfd45 -EBUILD pcsx2-9999.ebuild 7435 BLAKE2B 5f9ebca9a553b6bcf206ba43f9ccf1dca1e367c0ad8a07cc315fc49f6a9a5d14e7b4400de02a39a0414ed971baff4805a09bb2a10ecff4d4012eeb0804a604b7 SHA512 d25edfcf758f411008a8eb3e8c56a69da7da86a1342a736ceb654ccd645886f2151bc4b796776cf40786e832230f78eeff26e5ac5c6d121a61dff50565f2d3b1 +EBUILD pcsx2-1.7.3738-r1.ebuild 7645 BLAKE2B b4221e5efbd9dcf9453997909242c9ac505dd89e2e8ba92b3e9f3e006a01d6ae183bae1d9c2b4f7479130d66ed0bca7e2398882c71eca84b2ae71950a9ae1f95 SHA512 543fca97eb19b0b30a8dd3ff85bc8381ee13faddd1385a2258f5604d362580bbb65bec8326767ba320e9d1158d6fee18a3b7be80654ad444a1780fe7f835f8fb +EBUILD pcsx2-1.7.4425-r1.ebuild 7824 BLAKE2B a7cd2fdfee6ad209b3c28b62315646de8de929b9e89b89cbcb3e3c66db911136070e1386fc8d7e5ba9d9c30300f985d3aab05692187b79f9a7ba9abd57dd3a30 SHA512 dbba738ebe39c1fb89f8a72d4c303054ad3a4ea360f462a9a0eaf5c890636cff2a34809ee134deaa3f342c998b19111187d0c9597e88e85be27cb8c90788cc08 +EBUILD pcsx2-9999.ebuild 7880 BLAKE2B 67c1e54baf71fa9f91b079a8d0e9920dc75c941ce31733700bcc7b795dde81c7bfb65d0ed41d985fdd122f2f023246f64a6ced9705ddabc4837e883a92f2a91a SHA512 2fa523c7812ac54acfd8cedc85c9c854c5bb6430f751a3804a35afe356bb7aa9c6fe4daa88d0bb4d64d114220cd9a51a690ff8583d29becdeff88e1415e0fb4b MISC metadata.xml 905 BLAKE2B 704b0ab594db3d23761b25d1d18b0a7121a989f967cfeb533f06ffa2d688fbaaa426c61d9f7c8068410129784924c26684de9919994a9580f2db531f5e34aea3 SHA512 f65374e9062406f81607514193b362a11e7e682aca7e40995679a7d7597ab13304c0f57f6b4c9eebb4ebee60cb4cdaff06ad9801ba6ce75c3698e3a926d5bf1d diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild new file mode 100644 index 000000000000..b0b340795652 --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-1.7.3738-r1.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +inherit cmake fcaps flag-o-matic wxwidgets + +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=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/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 jack pulseaudio qt6 sndio test vulkan wayland" +REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/xz-utils + app-arch/zstd:= + >=dev-cpp/rapidyaml-0.5:= + dev-libs/libaio + dev-libs/libchdr + dev-libs/libzip:=[zstd] + media-libs/harfbuzz + media-libs/libglvnd + media-libs/libpng:= + >=media-libs/libsdl2-2.0.22[haptic,joystick] + media-libs/libsoundtouch:= + net-libs/libpcap + sys-libs/zlib:= + virtual/libudev:= + x11-libs/libX11 + x11-libs/libXrandr + alsa? ( media-libs/alsa-lib ) + jack? ( virtual/jack ) + pulseaudio? ( media-libs/libpulse ) + qt6? ( + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 + net-misc/curl + ) + !qt6? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[wayland?] + x11-libs/wxGTK:${WX_GTK_VER}[X] + ) + 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-lang/perl + qt6? ( dev-qt/qttools:6[linguist] ) + !qt6? ( sys-devel/gettext )" + +FILECAPS=( + -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 +) + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-crcs.patch + "${FILESDIR}"/${PN}-1.7.3329-lto.patch + "${FILESDIR}"/${PN}-1.7.3329-qt6.patch + "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch + "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch + "${FILESDIR}"/${PN}-1.7.3602-rapidyaml-0.5.0.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 + + # qt6 build doesn't support PACKAGE_MODE and need to set resources location + sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \ + -i pcsx2/Frontend/CommonHost.cpp || die + + if [[ ${PV} != 9999 ]]; then + sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \ + -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 discord-rpc fmt 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() { + use qt6 || setup-wxwidgets + + # for bundled glslang (bug #858374) + use vulkan && append-flags -fno-strict-aliasing + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=no + -DDISABLE_BUILD_DATE=yes + -DDISABLE_PCSX2_WRAPPER=yes + -DDISABLE_SETCAP=yes + -DENABLE_TESTS=$(usex test) + -DPACKAGE_MODE=yes + -DQT_BUILD=$(usex qt6) + -DUSE_VTUNE=no + -DUSE_VULKAN=$(usex vulkan) + -DWAYLAND_API=$(usex wayland) + -DXDG_STD=yes + + # 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 + + # 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() { + cmake_src_install + + use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2 +} + +pkg_postinst() { + fcaps_pkg_postinst + + local replacing_old + if [[ ${REPLACING_VERSIONS##* } ]] && + ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1 + then + replacing_old= + elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case" + elog "it is recommended to backup your save states and memory cards before use." + elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'." + fi + + if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then + [[ -v replacing_old ]] && 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 +} diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild deleted file mode 100644 index 87648ee26e9d..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.0-gtk3" -inherit cmake fcaps flag-o-matic wxwidgets - -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 qt6 sndio test vulkan wayland" -REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/xz-utils - app-arch/zstd:= - >=dev-cpp/rapidyaml-0.5:= - dev-libs/libaio - dev-libs/libchdr - >=dev-libs/libfmt-7.1.3:= - dev-libs/libzip:=[zstd] - media-libs/harfbuzz - media-libs/libglvnd - media-libs/libpng:= - >=media-libs/libsdl2-2.0.22[haptic,joystick] - media-libs/libsoundtouch:= - net-libs/libpcap - sys-libs/zlib:= - virtual/libudev:= - x11-libs/libX11 - x11-libs/libXrandr - alsa? ( media-libs/alsa-lib ) - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - net-misc/curl - ) - !qt6? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3[wayland?] - x11-libs/wxGTK:${WX_GTK_VER}[X] - ) - 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-lang/perl - qt6? ( dev-qt/qttools:6[linguist] ) - !qt6? ( sys-devel/gettext )" - -FILECAPS=( - -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 -) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-crcs.patch - "${FILESDIR}"/${PN}-1.7.3329-lto.patch - "${FILESDIR}"/${PN}-1.7.3329-qt6.patch - "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch - "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch - "${FILESDIR}"/${PN}-1.7.3602-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 - - # qt6 build doesn't support PACKAGE_MODE and need to set resources location - sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \ - -i pcsx2/Frontend/CommonHost.cpp || die - - if [[ ${PV} != 9999 ]]; then - sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \ - -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 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() { - use qt6 || setup-wxwidgets - - # for bundled glslang (bug #858374) - use vulkan && append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=no - -DDISABLE_BUILD_DATE=yes - -DDISABLE_PCSX2_WRAPPER=yes - -DDISABLE_SETCAP=yes - -DENABLE_TESTS=$(usex test) - -DPACKAGE_MODE=yes - -DQT_BUILD=$(usex qt6) - -DUSE_SYSTEM_LIBS=yes - -DUSE_VTUNE=no - -DUSE_VULKAN=$(usex vulkan) - -DWAYLAND_API=$(usex wayland) - -DXDG_STD=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() { - cmake_src_install - - use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2 -} - -pkg_postinst() { - fcaps_pkg_postinst - - local replacing_old - if [[ ${REPLACING_VERSIONS##* } ]] && - ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1 - then - replacing_old= - elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case" - elog "it is recommended to backup your save states and memory cards before use." - elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'." - fi - - if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then - [[ -v replacing_old ]] && 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 -} diff --git a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild deleted file mode 100644 index ae1c9c594c50..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.4280.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 backtrace 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:= - 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 ) - backtrace? ( sys-libs/libbacktrace ) - 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:6[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 -) - -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=( - $(cmake_use_find_package backtrace Libbacktrace) - -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,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 -} diff --git a/games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild new file mode 100644 index 000000000000..4b41e151906f --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-1.7.4425-r1.ebuild @@ -0,0 +1,247 @@ +# 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=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/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 backtrace 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:= + 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-libs/libsoundtouch:= + media-video/ffmpeg:= + net-libs/libpcap + net-misc/curl + sys-libs/zlib:= + virtual/libudev:= + x11-libs/libXrandr + alsa? ( media-libs/alsa-lib ) + backtrace? ( sys-libs/libbacktrace ) + 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:6[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 +) + +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 "/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 fmt 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=( + $(cmake_use_find_package backtrace Libbacktrace) + -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 + -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 + + # 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 +} diff --git a/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4425.ebuild deleted file mode 100644 index ae1c9c594c50..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.4425.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 backtrace 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:= - 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 ) - backtrace? ( sys-libs/libbacktrace ) - 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:6[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 -) - -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=( - $(cmake_use_find_package backtrace Libbacktrace) - -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,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 -} diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 2608f0e1b287..ca3efae59de9 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -10,6 +10,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git" else HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1 + HASH_FMT=b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9 HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96 HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5 HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f @@ -17,6 +18,8 @@ else 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? ( @@ -46,7 +49,6 @@ RDEPEND=" dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr - dev-libs/libfmt:= dev-libs/libzip:=[zstd] dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 @@ -87,6 +89,10 @@ PATCHES=( 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 @@ -112,6 +118,9 @@ src_unpack() { 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 @@ -137,8 +146,8 @@ src_prepare() { 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 + cpuinfo cubeb demangler discord-rpc fmt glad imgui include jpgd + lzma rapidjson rapidyaml rcheevos simpleini xbyak zydis $(usev vulkan 'glslang vulkan-headers') ) find 3rdparty -mindepth 1 -maxdepth 1 -type d \ @@ -165,6 +174,7 @@ src_configure() { # 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) -- cgit v1.2.3