From e28a6e6eb5373071be3a09aa457f0488d753c80c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jun 2023 07:26:21 +0100 Subject: gentoo auto-resync : 24:06:2023 - 07:26:21 --- games-emulation/pcsx2/Manifest | 4 +- games-emulation/pcsx2/pcsx2-1.7.4624.ebuild | 259 ++++++++++++++++++++++++++++ games-emulation/pcsx2/pcsx2-9999.ebuild | 12 +- 3 files changed, 271 insertions(+), 4 deletions(-) create mode 100644 games-emulation/pcsx2/pcsx2-1.7.4624.ebuild (limited to 'games-emulation/pcsx2') diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index cb4492fa700f..f34da480dd15 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -10,6 +10,7 @@ AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c9694 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.4534.tar.gz 8973035 BLAKE2B 203432185e77d5380a436d176c349f8557fff240d7cc507c5009b95b8572647ce77df3d4ca0a4420819e06f6e45216810304e9c883c35c9d82dff2152997deb1 SHA512 0c369263127b56f75632f306218068b7dbb3ca226c0150755831f16e28c3204525c579f4d05f8cb4d27b186b98c1bd4f08ffd2d6d326342bcd97084c7f8f8f27 +DIST pcsx2-1.7.4624.tar.gz 11178711 BLAKE2B 539add6bf6b542b29c1ac61584dbfa549f9b866e56e72eaf9342d1e990576252c861542d4e397324efae73eda933756e14d871aaf6ece45edfb1e6e27d37b43a SHA512 af43136ffefe60e0adb85b930ec9da22a71e766a911e1a2ad37cfb1190338dee2a0a45ecd4c0de17ed5d0622b8b17d7c7ff9201ba8b2f9924d6b7d4b5804d6a1 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 @@ -18,5 +19,6 @@ DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd7 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b EBUILD pcsx2-1.7.3738-r1.ebuild 7645 BLAKE2B b4221e5efbd9dcf9453997909242c9ac505dd89e2e8ba92b3e9f3e006a01d6ae183bae1d9c2b4f7479130d66ed0bca7e2398882c71eca84b2ae71950a9ae1f95 SHA512 543fca97eb19b0b30a8dd3ff85bc8381ee13faddd1385a2258f5604d362580bbb65bec8326767ba320e9d1158d6fee18a3b7be80654ad444a1780fe7f835f8fb EBUILD pcsx2-1.7.4534-r1.ebuild 7933 BLAKE2B 88db6f6f487dc9eb7c31e715df48103d2bbb0811a91db7781d6d144cc51ea06f4e15ce4924947a2a31818ec51e5531154a4868fac8c8a640ed7015cf54b47b39 SHA512 c1d599fa127b8eb0b2d8020da2b4d223148fc2a0458672fd825809ad623cc1639c4ddb9c3b39c21d9c0e5d9c93da57fdba394702e56889f2714b41848574142a -EBUILD pcsx2-9999.ebuild 7933 BLAKE2B 88db6f6f487dc9eb7c31e715df48103d2bbb0811a91db7781d6d144cc51ea06f4e15ce4924947a2a31818ec51e5531154a4868fac8c8a640ed7015cf54b47b39 SHA512 c1d599fa127b8eb0b2d8020da2b4d223148fc2a0458672fd825809ad623cc1639c4ddb9c3b39c21d9c0e5d9c93da57fdba394702e56889f2714b41848574142a +EBUILD pcsx2-1.7.4624.ebuild 8162 BLAKE2B e8f234914b127a9d4f16fb12e0f805defc57fbd680120e457f88789ff2d6c9371f6b667669b259c89b66c280723008ab0c9824e37af9cd540936ea9bb7af781c SHA512 6c9125bd42e5dae7e6d5402cc320a28783e9d13d190589e182907459dd9d5a33f3d2cf0dff95be66620403211d4834694054ccded20db195d99afd4e39ceed83 +EBUILD pcsx2-9999.ebuild 8162 BLAKE2B e8f234914b127a9d4f16fb12e0f805defc57fbd680120e457f88789ff2d6c9371f6b667669b259c89b66c280723008ab0c9824e37af9cd540936ea9bb7af781c SHA512 6c9125bd42e5dae7e6d5402cc320a28783e9d13d190589e182907459dd9d5a33f3d2cf0dff95be66620403211d4834694054ccded20db195d99afd4e39ceed83 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426 diff --git a/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild new file mode 100644 index 000000000000..0837cde0069d --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-1.7.4624.ebuild @@ -0,0 +1,259 @@ +# 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 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-libs/libsoundtouch:= + 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" +DEPEND=" + ${COMMON_DEPEND} + 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 "/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 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 + + # 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 d2af26b4d0ef..0837cde0069d 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -42,8 +42,8 @@ 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: ffmpeg, qtsvg, vulkan-loader, wayland -RDEPEND=" +# dlopen: qtsvg, vulkan-loader, wayland +COMMON_DEPEND=" app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= @@ -69,8 +69,13 @@ RDEPEND=" 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" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} x11-base/xorg-proto test? ( dev-cpp/gtest )" BDEPEND="dev-qt/qttools:6[linguist]" @@ -169,6 +174,7 @@ src_configure() { -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) -- cgit v1.2.3