commit: 9af2648cf253fc21104e174ed1d85171c11f477a Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Oct 27 21:30:34 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Oct 27 22:17:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af2648c
games-emulation/pcsx2: drop 1.7.3329 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-emulation/pcsx2/Manifest | 1 - .../pcsx2/files/pcsx2-1.7.3329-unbundle.patch | 41 ----- .../pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch | 9 - games-emulation/pcsx2/pcsx2-1.7.3329.ebuild | 201 --------------------- 4 files changed, 252 deletions(-) diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 7315d0ecf127..06cde4e6d679 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,5 +1,4 @@ DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 -DIST pcsx2-1.7.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a DIST pcsx2-1.7.3468.tar.gz 19926257 BLAKE2B d276d7640c46c6fbad28c87b46e367c6dbfc8b3f6732f34dce49736772224dada6b4d5bc5947db2fe757b465e0d9fc0821eaf6f79987daf6df1734c8c9d34c52 SHA512 e96c1d8e733e3df8666e4eb7ebf3be47c7c65d948b4d4fc0818f90af60dfe15e928a5f93bfe0791444b3529f9b0a3789853c2b53845437507f97eda0c2bc2646 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch deleted file mode 100644 index 450329522183..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch +++ /dev/null @@ -1,41 +0,0 @@ -Adjust to unbundle a few extras. - -zstd changes only needed because of https://bugs.gentoo.org/872254 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,3 +54,4 @@ - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -- add_subdirectory(3rdparty/gtest EXCLUDE_FROM_ALL) -+ find_package(GTest REQUIRED) -+ alias_library(gtest_main GTest::gtest_main) - add_subdirectory(tests/ctest) ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -177,3 +177,3 @@ - set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS}) --if(ENABLE_TESTS) -+if(0) - if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt") -@@ -210,7 +210,4 @@ - find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0) --find_optional_system_library(zstd 3rdparty/zstd 1.4.5) --if (${zstd_TYPE} STREQUAL System) -- alias_library(Zstd::Zstd zstd::libzstd_shared) -- alias_library(pcsx2-zstd zstd::libzstd_shared) --endif() -+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd) -+alias_library(Zstd::Zstd PkgConfig::zstd) - find_optional_system_library(libzip 3rdparty/libzip 1.8.0) -@@ -243,3 +240,4 @@ - add_subdirectory(3rdparty/lzma EXCLUDE_FROM_ALL) --add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL) -+pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr) -+alias_library(chdr-static PkgConfig::chdr) - -@@ -269,5 +267,3 @@ - if(CUBEB_API) -- add_subdirectory(3rdparty/cubeb EXCLUDE_FROM_ALL) -- target_compile_options(cubeb PRIVATE "-w") -- target_compile_options(speex PRIVATE "-w") -+ find_package(cubeb REQUIRED) - endif() diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch deleted file mode 100644 index d00f9553993d..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch +++ /dev/null @@ -1,9 +0,0 @@ -This check is unnecessary, bit dodgy (ldd+grep), and requires -DSDL2_API=1 -/only/ if wxGTK was built with USE=sdl or else get a cmake unused options -warning. Test code also fails with -Werror=strict-prototypes (clang16). ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -191,3 +191,2 @@ - if(NOT PCSX2_CORE) -- WX_vs_SDL() - endif() diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild deleted file mode 100644 index 6dd06cea5dcb..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2022 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_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5 - HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f - SRC_URI=" - https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.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 GPL-2+ LGPL-2.1+ - LGPL-3+ MIT OFL-1.1 ZLIB public-domain" -SLOT="0" -IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 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:= - dev-libs/libaio - dev-libs/libchdr - >=dev-libs/libfmt-7.1.3:= - dev-libs/libzip:=[zstd] - media-libs/cubeb - media-libs/harfbuzz - media-libs/libglvnd - media-libs/libpng:= - media-libs/libsamplerate - >=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 - 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] - pulseaudio? ( media-libs/libpulse ) - ) - 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[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-musl.patch - "${FILESDIR}"/${PN}-1.7.3329-qt6.patch - "${FILESDIR}"/${PN}-1.7.3329-unbundle.patch - "${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - local EGIT_SUBMODULES=() - if use vulkan; then - EGIT_SUBMODULES+=( - 3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h - 3rdparty/vulkan-headers # to keep in sync with glslang - ) - fi - git-r3_src_unpack - else - default - 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 - - # pulseaudio is only used for usb-mic and without qt6, not for audio output - { use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die - - # GS tests currently fail to build with qt6 - use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || 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=( - cpuinfo glad imgui include jpgd lzma simpleini xbyak - $(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 - ) - - 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 using a nightly release model" - elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks" - elog "many notable features (e.g. native 64bit builds). Given it may be a long" - elog "time before there is a new stable, Gentoo will carry and update 1.7.x" - elog "roughly every months." - elog - elog "Please report an issue if feel a picked nightly release needs to be" - elog "updated ahead of time or masked (notably for handling regressions)." - fi -}
