From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DEEC5158021 for ; Fri, 21 Oct 2022 10:28:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF2AEE07C9; Fri, 21 Oct 2022 10:28:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE0CCE07C9 for ; Fri, 21 Oct 2022 10:28:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8535340FF2 for ; Fri, 21 Oct 2022 10:28:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47BC2609 for ; Fri, 21 Oct 2022 10:27:59 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1666348049.ca34cd1a112d4775ba5cbd5c22cf47f8161c7897.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/pcsx2/Manifest games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch games-emulation/pcsx2/metadata.xml games-emulation/pcsx2/pcsx2-1.7.3468.ebuild X-VCS-Directories: games-emulation/pcsx2/ games-emulation/pcsx2/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: ca34cd1a112d4775ba5cbd5c22cf47f8161c7897 X-VCS-Branch: master Date: Fri, 21 Oct 2022 10:27:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 61bfd676-c300-427b-8765-daa471f161ca X-Archives-Hash: 345df53968287faf9678d52b47b7ff68 commit: ca34cd1a112d4775ba5cbd5c22cf47f8161c7897 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Oct 21 10:05:26 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Oct 21 10:27:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca34cd1a games-emulation/pcsx2: add 1.7.3468 Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/Manifest | 3 + .../files/pcsx2-1.7.3468-cubeb-automagic.patch | 56 +++++ games-emulation/pcsx2/metadata.xml | 1 + games-emulation/pcsx2/pcsx2-1.7.3468.ebuild | 233 +++++++++++++++++++++ 4 files changed, 293 insertions(+) diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 3a8dfeb3dde4..7315d0ecf127 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,4 +1,7 @@ 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 +DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993 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 new file mode 100644 index 000000000000..804cf29af397 --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch @@ -0,0 +1,56 @@ +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/metadata.xml b/games-emulation/pcsx2/metadata.xml index e4c0e91aeda5..efa1131e61ab 100644 --- a/games-emulation/pcsx2/metadata.xml +++ b/games-emulation/pcsx2/metadata.xml @@ -14,6 +14,7 @@ Gentoo Games Project + Enable support for the media-sound/sndio backend Enable support for Vulkan diff --git a/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild new file mode 100644 index 000000000000..25b97c43ac32 --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild @@ -0,0 +1,233 @@ +# 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_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1 + HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96 + HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5 + HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f + SRC_URI=" + https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz + https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.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 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 qt6 sndio 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/harfbuzz + media-libs/libglvnd + media-libs/libpng:= + >=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 + alsa? ( media-libs/alsa-lib ) + jack? ( virtual/jack ) + pulseaudio? ( media-libs/libpulse ) + qt6? ( + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 + net-misc/curl + ) + !qt6? ( + dev-libs/glib:2 + media-libs/libsamplerate + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[wayland?] + x11-libs/wxGTK:${WX_GTK_VER}[X] + ) + sndio? ( media-sound/sndio:= ) + 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.3351-unbundle.patch + "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch +) + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + local EGIT_SUBMODULES=( + # has no build system and is not really setup for unbundling + 3rdparty/rcheevos/rcheevos + + # system rapidyaml is still used, but this uses another part + # of the source directly (fast_float) and so allow the submodule + # https://github.com/PCSX2/pcsx2/commit/af646e449 + 3rdparty/rapidyaml/rapidyaml + 3rdparty/rapidyaml/rapidyaml/extern/c4core + 3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float + + # uses glslang's StandAlone/ResourceLimits.h unavailable with + # system's (also keep bundled vulkan-headers to be in sync) + $(usev vulkan ' + 3rdparty/glslang/glslang + 3rdparty/vulkan-headers') + ) + + git-r3_src_unpack + else + default + + mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die + mv fast_float-${HASH_FASTFLOAT} \ + "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die + + rmdir "${S}"/3rdparty/rcheevos/rcheevos || die + mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die + + 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 + + # non-cubeb pulseaudio is only used for usb-mic without qt6, not output + use pulseaudio || :> cmake/FindPulseAudio.cmake || 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=( + # TODO?: rapidjson and xbyak are packaged and could be unbundlable + # w/ patch, and discord-rpc be optional w/ dependency on rapidjson + cpuinfo cubeb discord-rpc glad imgui include jpgd lzma + rapidjson rapidyaml rcheevos 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 + + # 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 + + 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 +}