commit: 9304bf2718c68949f0aa5c906e4a7e2929342bf3 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Jun 22 09:13:49 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Jun 22 09:33:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9304bf27
games-emulation/pcsx2: drop 1.7.5624, 1.7.5724 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-emulation/pcsx2/Manifest | 2 - .../files/pcsx2-1.7.5700-vanilla-shaderc.patch | 18 --- games-emulation/pcsx2/pcsx2-1.7.5624.ebuild | 161 -------------------- games-emulation/pcsx2/pcsx2-1.7.5724.ebuild | 167 --------------------- 4 files changed, 348 deletions(-) diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 201c1e51c713..fad0d732cb4d 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,3 +1 @@ -DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6 -DIST pcsx2-1.7.5724.tar.xz 11429708 BLAKE2B 773dddc2b754ec5eddccad6e520846811299aac9cddf7b5ab77cca13c330f457f2b1d045d5f0f804a70d7fd3e498b6aab62b32e0a58536afd6805785055c81c4 SHA512 1589a0f3087cbb7c57e648f7afc7f1a22edef2601bab10dec2928b31d77d81780f11916f5a56f353d4a1063ea7e01e6ddab8df9e4982424eb7cf14b3bcfe2e3d DIST pcsx2-1.7.5835.tar.xz 11565084 BLAKE2B 537aa890b668a1bed471f3677de1fee99f33fda41943dc4e7a11f8a85d2cbe831bfcd0040319643d370e90f31974272ee8ec4e17e3b6ec5d170d5750d38d707f SHA512 7e0541e5d0433a59047dfd15af3c3d90c61f61a416510cce14b89d5b641c45d7deae1a084ebd9e8b36f1768e714e3b480f1b28801e0f818b0290d7d06d384bc7 diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch deleted file mode 100644 index aa447b30b6fc..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.5700-vanilla-shaderc.patch +++ /dev/null @@ -1,18 +0,0 @@ -This does not exist in normal shaderc and was modified[1] by PCSX2 -for use in their CI/appimage making it impossible to use system's -(despite they do not bundle it). So not much choices but to remove -usage. - -Partial (for simplification) revert of [2], hopefully temporary. - -[1] https://github.com/PCSX2/pcsx2/commit/1cd4ba269854646 -[2] https://github.com/PCSX2/pcsx2/commit/fbfdf1200d27260 ---- a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp -+++ b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp -@@ -113,6 +113,4 @@ - { - options.SetGenerateDebugInfo(); -- if (GSDeviceVK::GetInstance()->GetOptionalExtensions().vk_khr_shader_non_semantic_info) -- options.SetEmitNonSemanticDebugInfo(); - - options.SetOptimizationLevel(shaderc_optimization_level_zero); diff --git a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild deleted file mode 100644 index b53145e648db..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop fcaps flag-o-matic toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"; -else - # unbundling on this package has become unmaintainable and, rather than - # handle submodules separately, using a tarball that includes them - SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"; - 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 +clang 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/lz4:= - app-arch/xz-utils - app-arch/zstd:= - dev-libs/libaio - dev-qt/qtbase:6[concurrent,gui,widgets] - dev-qt/qtsvg:6 - media-libs/libglvnd[X] - media-libs/libpng:= - media-libs/libsdl2[haptic,joystick] - media-libs/libwebp:= - media-video/ffmpeg:= - net-libs/libpcap - net-misc/curl - sys-apps/dbus - 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 ) -" -# 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 -" -BDEPEND=" - dev-qt/qttools:6[linguist] - clang? ( sys-devel/clang:* ) - wayland? ( - dev-util/wayland-scanner - kde-frameworks/extra-cmake-modules - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.4667-flags.patch - "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch -) - -src_prepare() { - cmake_src_prepare - - if [[ ${PV} != 9999 ]]; then - sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \ - -i cmake/Pcsx2Utils.cmake || die - fi - - # relax Qt6 and SDL2 version requirements which often get restricted - # without a specific need, please report a bug to Gentoo (not upstream) - # if a still-available older version is really causing issues - sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \ - -i cmake/SearchForStuff.cmake || die -} - -src_configure() { - # note that upstream only supports clang and ignores gcc issues, e.g. - # https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047 - # (CMakeLists.txt also gives a big warning if compiler is not clang) - if use clang && ! tc-is-clang; then - local -x CC=${CHOST}-clang CXX=${CHOST}-clang++ - strip-unsupported-flags - fi - - # for bundled old glslang (bug #858374) - use vulkan && append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=no - -DDISABLE_ADVANCE_SIMD=yes - -DENABLE_TESTS=$(usex test) - -DUSE_LINKED_FFMPEG=yes - -DUSE_VTUNE=no - -DUSE_VULKAN=$(usex vulkan) - -DWAYLAND_API=$(usex wayland) - -DX11_API=yes # X libs are currently hard-required either way - - # 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() { - insinto /usr/lib/${PN} - doins -r "${BUILD_DIR}"/bin/. - - fperms +x /usr/lib/${PN}/pcsx2-qt - dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN} - - newicon bin/resources/icons/AppIconLarge.png ${PN}.png - make_desktop_entry ${PN} ${PN^^} - - dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt} - - use !test || rm "${ED}"/usr/lib/${PN}/*_test || die -} - -pkg_postinst() { - fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt - - if [[ ${REPLACING_VERSIONS##* } ]] && - ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then - elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is" - elog "notably now a 64bit build using Qt6. Just-in-case it is recommended" - elog "to backup configs, save states, and memory cards before using." - elog - elog "The executable was also renamed from 'PCSX2' to 'pcsx2'." - fi -} diff --git a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild deleted file mode 100644 index 1bf5c7c73e38..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.5724.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"; -else - # unbundling on this package has become unmaintainable and, rather than - # handle submodules separately, using a tarball that includes them - SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"; - 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 +clang jack pulseaudio sndio test vulkan wayland" -REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support -RESTRICT="!test? ( test )" - -# dlopen: libglvnd, qtsvg, vulkan-loader, wayland -COMMON_DEPEND=" - app-arch/lz4:= - app-arch/zstd:= - dev-libs/libaio - dev-qt/qtbase:6[concurrent,gui,widgets] - dev-qt/qtsvg:6 - media-libs/freetype - media-libs/libglvnd[X] - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libsdl2[haptic,joystick] - media-libs/libwebp:= - media-video/ffmpeg:= - net-libs/libpcap - net-misc/curl - sys-apps/dbus - 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/shaderc - 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 -" -BDEPEND=" - dev-qt/qttools:6[linguist] - clang? ( sys-devel/clang:* ) - wayland? ( - dev-util/wayland-scanner - kde-frameworks/extra-cmake-modules - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.4667-flags.patch - "${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch - "${FILESDIR}"/${PN}-1.7.5700-vanilla-shaderc.patch -) - -src_prepare() { - cmake_src_prepare - - if [[ ${PV} != 9999 ]]; then - sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \ - -i cmake/Pcsx2Utils.cmake || die - fi - - # relax Qt6 and SDL2 version requirements which often get restricted - # without a specific need, please report a bug to Gentoo (not upstream) - # if a still-available older version is really causing issues - sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \ - -i cmake/SearchForStuff.cmake || die -} - -src_configure() { - # note that upstream only supports clang and ignores gcc issues, e.g. - # https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047 - # (CMakeLists.txt also gives a big warning if compiler is not clang) - if use clang && ! tc-is-clang; then - local -x CC=${CHOST}-clang CXX=${CHOST}-clang++ - strip-unsupported-flags - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=no - -DDISABLE_ADVANCE_SIMD=yes - -DENABLE_TESTS=$(usex test) - -DUSE_LINKED_FFMPEG=yes - -DUSE_VTUNE=no - -DUSE_VULKAN=$(usex vulkan) - -DWAYLAND_API=$(usex wayland) - -DX11_API=yes # X libs are currently hard-required either way - - # 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() { - insinto /usr/lib/${PN} - doins -r "${BUILD_DIR}"/bin/. - - fperms +x /usr/lib/${PN}/pcsx2-qt - dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN} - - newicon bin/resources/icons/AppIconLarge.png ${PN}.png - make_desktop_entry ${PN} ${PN^^} - - dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt} - - use !test || rm "${ED}"/usr/lib/${PN}/*_test || die -} - -pkg_postinst() { - fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt - - # calls aplay (or gst-play/launch-1.0 as fallback in next version) - # https://github.com/PCSX2/pcsx2/issues/11141 - optfeature "UI sound effects support" media-sound/alsa-utils - - if [[ ${REPLACING_VERSIONS##* } ]] && - ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then - elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is" - elog "notably now a 64bit build using Qt6. Just-in-case it is recommended" - elog "to backup configs, save states, and memory cards before using." - elog - elog "The executable was also renamed from 'PCSX2' to 'pcsx2'." - fi -}
