commit: 796b58fd17155c15564322c10d1f22861c3ebf36 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Sep 8 02:28:36 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Sep 8 05:56:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=796b58fd
games-emulation/pcsx2: drop 2.2.0-r1 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-emulation/pcsx2/Manifest | 1 - .../files/pcsx2-1.7.5835-vanilla-shaderc.patch | 49 ------ games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild | 178 --------------------- 3 files changed, 228 deletions(-) diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 9934ab3a6f2c..85fee7aaffed 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,2 +1 @@ -DIST pcsx2-2.2.0.tar.gz 17097731 BLAKE2B 8df1ed7478491444c70a0e481f4ceff5e97d7378c2fee8566f0759f2c8bb1f0f10fb17d5cb26344bbac4150b534c518971bafd984338e386f855f83182d1e755 SHA512 4f67045b38ead6f48f99c27b02924b0ec97d3b79540d62900a6b4e7c3642594e53d37a0360d51077cc1c048175c89d891d7352d7db9231d128564b1d0242b7e0 DIST pcsx2-2.4.0.tar.gz 20096340 BLAKE2B bd55dfc7e12545c4979f45de0da8cc075ab9668beb8291657cbaa03ec148b4b31bffce767391e49fa39c195af23bde3ec1aace6cf5cfda47b13e0e8f674f01d6 SHA512 1deb576fbcdb18cd269c2f8493e6d4994ce22d44a34700a98f6884fd16f6417213680faf3eb357947a71c4a756fc7e09ccef95d366da41579ba584fd0c519437 diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5835-vanilla-shaderc.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5835-vanilla-shaderc.patch deleted file mode 100644 index e9c06fb07a5c..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.5835-vanilla-shaderc.patch +++ /dev/null @@ -1,49 +0,0 @@ -PCSX2 upstream modifies shaderc[1][2][3] rendering its code incompatible -with vanilla. We'd rather not package this modified shaderc if it can -reasonably be avoided, so this does minimal code changes to allow vanilla -usage. - -Disclaimer: as the author of this patch, be warned that I can hardly claim -to know neither C++ nor shaderc, so it could very well be wrong. If run into -vulkan/shaderc-related issues, try to reproduce with upstream's AppImage -before reporting bugs to them as they offer no support for distros' builds. - -[1] https://github.com/PCSX2/pcsx2/commit/1cd4ba269854646 -[2] https://github.com/PCSX2/pcsx2/commit/fbfdf1200d27260 -[3] https://github.com/PCSX2/pcsx2/commit/ff7995f0d6caaac - -Signed-off-by: Ionen Wolkens <[email protected]> ---- a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp -+++ b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp -@@ -109,5 +109,5 @@ - X(shaderc_compile_options_set_optimization_level) \ - X(shaderc_compile_options_set_target_env) \ -- X(shaderc_compilation_status_to_string) \ -+ X(shaderc_result_get_compilation_status) \ - X(shaderc_compile_into_spv) \ - X(shaderc_result_release) \ -@@ -217,19 +217,16 @@ - dyn_shaderc::shaderc_compile_options_set_source_language(options, shaderc_source_language_glsl); - dyn_shaderc::shaderc_compile_options_set_target_env(options, shaderc_target_env_vulkan, 0); -- dyn_shaderc::shaderc_compile_options_set_generate_debug_info(options, debug, -- debug && GSDeviceVK::GetInstance()->GetOptionalExtensions().vk_khr_shader_non_semantic_info); -+ dyn_shaderc::shaderc_compile_options_set_generate_debug_info(options); - dyn_shaderc::shaderc_compile_options_set_optimization_level( - options, debug ? shaderc_optimization_level_zero : shaderc_optimization_level_performance); - -- shaderc_compilation_result_t result; -- const shaderc_compilation_status status = dyn_shaderc::shaderc_compile_into_spv( -+ shaderc_compilation_result_t result = dyn_shaderc::shaderc_compile_into_spv( - dyn_shaderc::s_compiler, source.data(), source.length(), static_cast<shaderc_shader_kind>(stage), "source", -- "main", options, &result); -- if (status != shaderc_compilation_status_success) -+ "main", options); -+ if (dyn_shaderc::shaderc_result_get_compilation_status(result) != shaderc_compilation_status_success) - { - const std::string_view errors(result ? dyn_shaderc::shaderc_result_get_error_message(result) : - "null result object"); -- ERROR_LOG("Failed to compile shader to SPIR-V: {}\n{}", -- dyn_shaderc::shaderc_compilation_status_to_string(status), errors); -+ ERROR_LOG("Failed to compile shader to SPIR-V: {}", errors); - DumpBadShader(source, errors); - } diff --git a/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild deleted file mode 100644 index f2d01e0442c6..000000000000 --- a/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# note: keep old versions for an extended period (at "least" 2 months -# after stabilization unless it is broken) due to save states being -# locked to specific versions and users may need time - -inherit cmake desktop eapi9-ver fcaps flag-o-matic optfeature toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"; -else - SRC_URI=" - https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz - -> ${P}.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 +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, shaderc, vulkan-loader, wayland -COMMON_DEPEND=" - app-arch/lz4:= - app-arch/zstd:= - 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_p20241020 -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto -" -BDEPEND=" - dev-qt/qttools:6[linguist] - clang? ( llvm-core/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.5835-vanilla-shaderc.patch - "${FILESDIR}"/${PN}-1.7.5835-musl-header.patch - "${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch - "${FILESDIR}"/${PN}-2.2.0-missing-header.patch -) - -CMAKE_QA_COMPAT_SKIP=1 #957976 - -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 - - # pthread_attr_setaffinity_np is not supported on musl, may be possible - # to remove if bundled lzma code is updated like 7zip did (bug #935298) - use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE - - # workaround for clang:20, backporting to old fmt would be complicated - # https://github.com/fmtlib/fmt/issues/4177 (probably?) - append-cppflags -DFMT_CONSTEVAL= - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=no - -DDISABLE_ADVANCE_SIMD=yes - -DENABLE_TESTS=$(usex test) - -DPACKAGE_MODE=yes - -DUSE_BACKTRACE=no # not packaged (bug #885471) - -DUSE_LINKED_FFMPEG=yes - -DUSE_VTUNE=no # not packaged - -DUSE_VULKAN=$(usex vulkan) - -DWAYLAND_API=$(usex wayland) - # not optional given libX11 is hard-required either way and upstream - # seemingly has no intention to drop the requirement at the moment - # https://github.com/PCSX2/pcsx2/issues/11149 - -DX11_API=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() { - cmake_src_install - - newicon bin/resources/icons/AppIconLarge.png pcsx2.png - make_desktop_entry pcsx2-qt PCSX2 - - dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt} -} - -pkg_postinst() { - fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/bin/pcsx2-qt - - # calls aplay or gst-play/launch-1.0 as fallback - # https://github.com/PCSX2/pcsx2/issues/11141 - optfeature "UI sound effects support" \ - media-sound/alsa-utils \ - media-libs/gst-plugins-base:1.0 - - if ver_replacing -lt 2.2.0; then - elog - elog "Note that the 'pcsx2' executable was renamed to 'pcsx2-qt' with this version." - fi -}
