commit: de66e7b69307542a793931c375498cfa4a22dfb4 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Jan 8 10:29:52 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Jan 8 12:57:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de66e7b6
games-emulation/pcsx2: drop 1.7.5214 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-emulation/pcsx2/Manifest | 1 - .../files/pcsx2-1.7.3468-cubeb-automagic.patch | 56 -------- games-emulation/pcsx2/pcsx2-1.7.5214.ebuild | 154 --------------------- 3 files changed, 211 deletions(-) diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 293fe8fddf59..da9e1fbded42 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,3 +1,2 @@ DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 -DIST pcsx2-1.7.5214.tar.xz 16995492 BLAKE2B 6eb096df5e58482f552651c469e337b108a0ba7b1064898fa7f2eb30c6787888bc4f6f5b1feb985ebf1196b66f96d6e5e24e6441b2ec5e2c7bfe663fd84b99e9 SHA512 3d787922c1478696e1baf1ec5f1adcf2e4654dcad94aac1d0c048951977c53f22c9a7e3ddcf25ab8b37b18dfef6c6ef1219b510db2abf2129606037e61364862 DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd SHA512 6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7 diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch deleted file mode 100644 index 804cf29af397..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch +++ /dev/null @@ -1,56 +0,0 @@ -Same that media-libs/cubeb does and meant for -DLAZY_LOAD_LIBS=no. - -Unfortunately need to use bundled cubeb here given it modifies the -source starting with (but not limited to): -https://github.com/PCSX2/pcsx2/commit/9170a5abc1 ---- a/3rdparty/cubeb/CMakeLists.txt -+++ b/3rdparty/cubeb/CMakeLists.txt -@@ -110,38 +110,48 @@ - - find_package(PkgConfig REQUIRED) - -+ if(CHECK_PULSE) - pkg_check_modules(libpulse IMPORTED_TARGET libpulse) - if(libpulse_FOUND) - set(USE_PULSE ON) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN) - target_link_libraries(cubeb PRIVATE PkgConfig::libpulse) - endif() -+ endif() - -+ if(CHECK_ALSA) - pkg_check_modules(alsa IMPORTED_TARGET alsa) - if(alsa_FOUND) - set(USE_ALSA ON) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN) - target_link_libraries(cubeb PRIVATE PkgConfig::alsa) - endif() -+ endif() - -+ if(CHECK_JACK) - pkg_check_modules(jack IMPORTED_TARGET jack) - if(jack_FOUND) - set(USE_JACK ON) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN) - target_link_libraries(cubeb PRIVATE PkgConfig::jack) - endif() -+ endif() - -+ if(CHECK_SNDIO) - check_include_files(sndio.h USE_SNDIO) - if(USE_SNDIO) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN) - target_link_libraries(cubeb PRIVATE sndio) - endif() -+ endif() - -+ if(CHECK_AAUDIO) - check_include_files(aaudio/AAudio.h USE_AAUDIO) - if(USE_AAUDIO) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN) - target_link_libraries(cubeb PRIVATE aaudio) - endif() -+ endif() - endif() - - if(USE_PULSE) diff --git a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild deleted file mode 100644 index 462f4b662736..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.5214.ebuild +++ /dev/null @@ -1,154 +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 - # 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 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 - dev-libs/libaio - >=dev-qt/qtbase-6.6.0:6[gui,network,widgets] - >=dev-qt/qtsvg-6.6.0:6 - media-libs/libglvnd - media-libs/libpng:= - >=media-libs/libsdl2-2.28.4[haptic,joystick] - 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.6.0:6[linguist] - wayland? ( - dev-util/wayland-scanner - kde-frameworks/extra-cmake-modules - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch - "${FILESDIR}"/${PN}-1.7.3773-lto.patch - "${FILESDIR}"/${PN}-1.7.4667-flags.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 -} - -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 - filter-lto - fi - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=no - -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 # X libs are currently hard-required either way - - # 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 - - # 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 -}
