From 37a097af13d675b83911ac006ee9ee22d2163f9a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Nov 2024 03:04:24 +0000 Subject: gentoo auto-resync : 02:11:2024 - 03:04:23 --- games-emulation/pcsx2/Manifest | 9 +- .../pcsx2/files/pcsx2-2.2.0-missing-header.patch | 8 + games-emulation/pcsx2/pcsx2-1.7.5913.ebuild | 179 --------------------- games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild | 170 +++++++++++++++++++ games-emulation/pcsx2/pcsx2-2.0.2.ebuild | 170 ------------------- games-emulation/pcsx2/pcsx2-2.2.0.ebuild | 173 ++++++++++++++++++++ games-emulation/pcsx2/pcsx2-9999.ebuild | 25 +-- 7 files changed, 370 insertions(+), 364 deletions(-) create mode 100644 games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch delete mode 100644 games-emulation/pcsx2/pcsx2-1.7.5913.ebuild create mode 100644 games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild delete mode 100644 games-emulation/pcsx2/pcsx2-2.0.2.ebuild create mode 100644 games-emulation/pcsx2/pcsx2-2.2.0.ebuild (limited to 'games-emulation/pcsx2') diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index b2a04673095b..4c480271034b 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -4,9 +4,10 @@ AUX pcsx2-1.7.5835-musl-header.patch 247 BLAKE2B 07fa93b782436c575ed43a47694f351 AUX pcsx2-1.7.5835-vanilla-shaderc.patch 2637 BLAKE2B 87a0774d44ad6d9b8f5219fbb2c36f4156bbefdeb172b6cca5ac6d310ab569e1687202b97b3056220fd0d5cacd0da1dbb11dcd6912b7d53850fbd0e419d13485 SHA512 1d624fae87b92c509404b0a27218a82163568350f223dbd2d9a2021d5207b923bdf9f7e13d5c6efd89aaea6eeb021ee825dce9be0a389ba0b5ee2adfa4a48c16 AUX pcsx2-1.7.5855-no-libbacktrace.patch 955 BLAKE2B 035da91a0a64e9960846cd8d12bf649e4c536def15ca47e8a176294fbf389550f25ebb27e8ce55d9777390c1311b3b803410f57c19980dd677ef4c7e0f8d5d40 SHA512 a68d9d09dee53abcf5abe5b6eea3d7a5871d2f43eb6f684ad73f699c7930a8e89b8dc61df96f1f7a030ad90014b29b19080c6e2dc189efca67123b8509d2a04a AUX pcsx2-1.7.5913-musl-cache.patch 646 BLAKE2B 531a6792eda8449827019d6332a7a53f32cab006c79784996911ec4305276e506b0fc9dfda81e4ff7d3a835aef2789e2d3d36d8632636494503f6392528ece86 SHA512 56c9d1425f327ac8df040a6237c7cbb04932aabbe7bbdb84307085b0eba07914cf046c908216c6e692d0543fb6c2b0d157d88afd79ce56448bb6cf411847aca7 -DIST pcsx2-1.7.5913.tar.gz 15669443 BLAKE2B 1b1e353b544791fb52d9e181e66fcdf0bc7039878a80279b855d05fdab4f1010f45db685d4ab6ae141f497cd72a6e007f583725345a9ef1c9a6d69dc46a77547 SHA512 a8c2e6879527d4864de97ece74aefcbe34093c169a19aafe7558aef872a449be5209209f800ca71b4d259689583f10188b8385439b769688910dc5c3b291c408 +AUX pcsx2-2.2.0-missing-header.patch 274 BLAKE2B e1a0428b8dbbdae9a2a9d7386c8797f54c2c499fe2f5ef1df49ab5308053a75a47226da17a1a43e84953ab3c053df26fd370c6b6bf078f138789abe5bcd477de SHA512 565d86bc11d92360630dea97b1ed745526a9b62c44f420db06d68cb26ef5c9145df9a3ad9ea80b00490a4291a63fe36690728f998c4c2d0d1515a72648ea0963 DIST pcsx2-2.0.2.tar.gz 16071515 BLAKE2B 328ea302ab2a7f7c4784844005ad4091d3f0b571c80f2a122136cc152fd46d4b1db4541e53ada09fc6cd15ebf37ae494911cadbbc7c57b92b494da355f67fcef SHA512 d442b1c5f9dbd1dca23261c56d0a433771928827b1ff9ebf5bea9cf5c5013defab659e7f0b63f5ce5c6ad856461c00f6ac98498a229300f8d58b9ea0ebf21507 -EBUILD pcsx2-1.7.5913.ebuild 5056 BLAKE2B 9f2a90e66331568f5c869c42cadb3b727ca50341b62977a7637ae4e1265b2d0d0c7c5e897d7f191b3a49aef0ea6945426f5499f6bc9565ef78d1c70128f88580 SHA512 d2956379af75f329aebeaa68ed37999188c8a510a8074404d86c7d66fd3e6b4c930e2669c9ba5c1d3407d0851ab7f1834b2676a749665578c2cee6155c13aa4e -EBUILD pcsx2-2.0.2.ebuild 4676 BLAKE2B eab9643bc77d567250459094a4ba008daa9b9d4003c38a28f5873e179aa3a8b3c2a6ed3896c72cc049b66e67365401c303cbff14d0b873a2d48c05e94ebf4888 SHA512 00e2d5984e2b0c8b6107fdf0f9c54b91590724f03766f8303cf182a51715a522087ee1913ed9552f77bf595308f2758fa153100be3163f13fda735c7088ed297 -EBUILD pcsx2-9999.ebuild 4675 BLAKE2B 8f8b024654132c9d28ce7c748ce4fad762dcfc7307e5b77c366e88126fae2fb5cde9f6edbf03a77d28fd65b3323ad27a7b6f7cbfb1761402d518929cd3ea505a SHA512 abb36d6bb520d0a3e9001edb94d102db91bb74d7d33b87bacc316b7c4c8802ed4650990585700056f937973509e7309723137bb03eb08a9a60898d183570627b +DIST pcsx2-2.2.0.tar.gz 17097731 BLAKE2B 8df1ed7478491444c70a0e481f4ceff5e97d7378c2fee8566f0759f2c8bb1f0f10fb17d5cb26344bbac4150b534c518971bafd984338e386f855f83182d1e755 SHA512 4f67045b38ead6f48f99c27b02924b0ec97d3b79540d62900a6b4e7c3642594e53d37a0360d51077cc1c048175c89d891d7352d7db9231d128564b1d0242b7e0 +EBUILD pcsx2-2.0.2-r1.ebuild 4675 BLAKE2B 7d12d425a16f7edd60fb883c4cd4d45fbe1a01eb4fd6fad1a56b8f7a848b79d6c8e983390d02d2d613d88c7331fa15f9b7724b2c574601d22dcc78356638a19f SHA512 284a9c8daa1e2503e2fd123b074e7d8f8e07b13de1ba50c772dbbefa1b7d71fb0bfb6aaed6b31471d4c07e90048eb99392724352b599611d43997d8ed4673c0d +EBUILD pcsx2-2.2.0.ebuild 4758 BLAKE2B 42ff4d6702174d7c431438d36ae182b416541562dcf3259992e1ca81a1afed94d2f519704cbaea1ef483bf27fe642e98affd408e205345aa1f4df2e97be7e96c SHA512 7fc8b07e4f43c9c81e191724f015d52134127843fdd3ca2c06f205f827570df7ad451a31d7f0417a87415e4d3dcd8385a206cf9d006e6c08ed4875b66f80c2f5 +EBUILD pcsx2-9999.ebuild 4758 BLAKE2B 42ff4d6702174d7c431438d36ae182b416541562dcf3259992e1ca81a1afed94d2f519704cbaea1ef483bf27fe642e98affd408e205345aa1f4df2e97be7e96c SHA512 7fc8b07e4f43c9c81e191724f015d52134127843fdd3ca2c06f205f827570df7ad451a31d7f0417a87415e4d3dcd8385a206cf9d006e6c08ed4875b66f80c2f5 MISC metadata.xml 668 BLAKE2B ae2b523f457cb9bcdaa31d8f6e64ab953d7e6f3d1fab0c26d133fe1f35bf2b26f74eb5ad62c360a9e182eedabbb8c7c2318754778b5b7f1ae1adf89e74fe9e14 SHA512 f3c52eb50a0ed572c84cdb559f58ed2588772ed5d0a2c60844532dae66073ae8ff078263a7bf3a9659a4473d4dfa0df4c5b4e30cc4133c8d219ca4603f9af80b diff --git a/games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch b/games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch new file mode 100644 index 000000000000..17d53c1d1ee3 --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch @@ -0,0 +1,8 @@ +Fails to build likely(?) with >=clang-19 +SymbolGuardian.cpp:19:7: error: no member named 'unique_lock' in namespace 'std' +--- a/pcsx2/DebugTools/SymbolGuardian.h ++++ b/pcsx2/DebugTools/SymbolGuardian.h +@@ -6,2 +6,3 @@ + #include ++#include + #include diff --git a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild deleted file mode 100644 index eabda37bc8cf..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild +++ /dev/null @@ -1,179 +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 - 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_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.5835-vanilla-shaderc.patch - "${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch - "${FILESDIR}"/${PN}-1.7.5835-musl-header.patch - "${FILESDIR}"/${PN}-1.7.5913-musl-cache.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 - - # 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 - - 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) - - # note that upstream hardly support native wayland, may or may not work - # https://github.com/PCSX2/pcsx2/pull/10179 - -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() { - 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 - # https://github.com/PCSX2/pcsx2/issues/11141 - optfeature "UI sound effects support" \ - media-sound/alsa-utils \ - media-libs/gst-plugins-base:1.0 - - 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-2.0.2-r1.ebuild b/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild new file mode 100644 index 000000000000..ea9ea5061f39 --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild @@ -0,0 +1,170 @@ +# 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 + 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_p20230917 + >=games-emulation/pcsx2_patches-0_p20241020 " DEPEND=" ${COMMON_DEPEND} @@ -82,6 +82,7 @@ PATCHES=( "${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 ) src_prepare() { @@ -116,6 +117,7 @@ src_configure() { -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 @@ -145,26 +147,27 @@ src_test() { } src_install() { - insinto /usr/lib/${PN} - doins -r "${BUILD_DIR}"/bin/. + cmake_src_install - 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^^} + newicon bin/resources/icons/AppIconLarge.png pcsx2-qt.png + make_desktop_entry pcsx2-qt PCSX2 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 + 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 [[ ${REPLACING_VERSIONS##* } ]] && + ver_test ${REPLACING_VERSIONS##* } -lt 2.2.0 + then + elog + elog "Note that the 'pcsx2' executable was renamed to 'pcsx2-qt' with this version." + fi } -- cgit v1.2.3