From f8deb4f754798d63fb6b82178452ee846df8475f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Feb 2024 11:37:14 +0000 Subject: gentoo auto-resync : 17:02:2024 - 11:37:14 --- games-emulation/Manifest.gz | Bin 12035 -> 12031 bytes games-emulation/pcsx2/Manifest | 8 +- games-emulation/pcsx2/metadata.xml | 5 + games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 8 +- games-emulation/pcsx2/pcsx2-1.7.5560.ebuild | 161 ++++++++++++++++++++++++++++ games-emulation/pcsx2/pcsx2-9999.ebuild | 8 +- 6 files changed, 179 insertions(+), 11 deletions(-) create mode 100644 games-emulation/pcsx2/pcsx2-1.7.5560.ebuild (limited to 'games-emulation') diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz index c699ad920f6f..6d5b1623bb26 100644 Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index a4bce939866d..c5adcfd2380c 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -3,7 +3,9 @@ AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb0730600 AUX pcsx2-1.7.5232-cubeb-automagic.patch 774 BLAKE2B a932e49643df613710c27c8f0881c6e2b9c2d90964ff7f88b48b3ec5ad281bbd152fbede638accc054ea5935401ef240ed0bf8107fe1c10997242ea546b93699 SHA512 5985f08a2acce8ccbe946a7c5bd85b2388ad7166b0243a7e698c96990a3856660c1f353bc74a9ced0e5ff08f10e27922e05eb77fabff1e797166b7d6a4c445a7 DIST pcsx2-1.7.5312.tar.xz 17999588 BLAKE2B ab8e80d51bd617aff0b62ed91f9bc3d31deb98872c0bc7db0a66813cc47cc77a9e45ce50044609a6559dd281212812b61b2d14dfa3e56b754647be40404faebd SHA512 6ca36b57e24c68b046fe85f6fce0a7ea726129ee5dceb28ca6b17fe72d9c80229817e23f0d5bcf314d2ad524ca399b751b77f4752e41a53c5bda5bc2effb1fd7 DIST pcsx2-1.7.5474.tar.xz 18196732 BLAKE2B 2b8fcede476b4181cfe1a2d9b6c746b24a770ec6904e2add5e4faa33792f5d81fd44b6c061b523449357cfc756f270e3b1b317986a6f7ac325e562a2b1cbce8d SHA512 261c3be58ca8d70e2d8a996701e0ac5256225edc075029c3d0ee82731b2149a8937a28b97d1ce7ab5c2b701b3d7bb89c1f8291fcfe3a64ec9e99e2aa211ee0a0 +DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43 SHA512 ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5 EBUILD pcsx2-1.7.5312.ebuild 4242 BLAKE2B 0f0308b0bf27f2d6d5345773715ddbc523a68b3276469dfd2de19bb8515e4edb35d8689423ec272fbda8b4a9e326c19d1b6249192efb08820bffdc816d33dc29 SHA512 f00c2ebc324fc48e2ce13dfab360c212877e549c482e1103acd746bf03395daf30603128494f826dae21b69390a4a1e1f485985b295eded58a0c525dac07d825 -EBUILD pcsx2-1.7.5474.ebuild 4390 BLAKE2B 54a27a7271c106b67589497163fffaa1877d5c4cdc5b1d70454210c58a462a16e441801a715d8249f33f9a334b1b067da591370299dc0e3ca230db3a10bcce54 SHA512 e575604618dc292282c1232b3a65424354a425255c70e5f48eec6d21b51adffef0d3b120f1e2cd7f7af049b8582995e3ca34f83d8e16863b2371d704f6e8be19 -EBUILD pcsx2-9999.ebuild 4390 BLAKE2B 54a27a7271c106b67589497163fffaa1877d5c4cdc5b1d70454210c58a462a16e441801a715d8249f33f9a334b1b067da591370299dc0e3ca230db3a10bcce54 SHA512 e575604618dc292282c1232b3a65424354a425255c70e5f48eec6d21b51adffef0d3b120f1e2cd7f7af049b8582995e3ca34f83d8e16863b2371d704f6e8be19 -MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426 +EBUILD pcsx2-1.7.5474.ebuild 4431 BLAKE2B 98ce7d7da5e2338abf90238b7695e8f136473a66c850ff71a78220f1459a553b6efa784c82377d8d0b37106b01d6d9e0ef09f1f12e27691b46f8ec8d20b2e504 SHA512 28421a121c393ab6d64fc90c6b752f7b43cd4567221af100ac9f8e0950bd6ae7ef27115a94857d2f2c1192c8172c719de4d0f45d80c4cd777703fdbbaa58ae72 +EBUILD pcsx2-1.7.5560.ebuild 4431 BLAKE2B 98ce7d7da5e2338abf90238b7695e8f136473a66c850ff71a78220f1459a553b6efa784c82377d8d0b37106b01d6d9e0ef09f1f12e27691b46f8ec8d20b2e504 SHA512 28421a121c393ab6d64fc90c6b752f7b43cd4567221af100ac9f8e0950bd6ae7ef27115a94857d2f2c1192c8172c719de4d0f45d80c4cd777703fdbbaa58ae72 +EBUILD pcsx2-9999.ebuild 4431 BLAKE2B 98ce7d7da5e2338abf90238b7695e8f136473a66c850ff71a78220f1459a553b6efa784c82377d8d0b37106b01d6d9e0ef09f1f12e27691b46f8ec8d20b2e504 SHA512 28421a121c393ab6d64fc90c6b752f7b43cd4567221af100ac9f8e0950bd6ae7ef27115a94857d2f2c1192c8172c719de4d0f45d80c4cd777703fdbbaa58ae72 +MISC metadata.xml 926 BLAKE2B 0076f5137c48d1d000eeff8f82457dfbf01c02928cc2a97479fcdef1eb71ce79c444ece7db8cc949e9c1f143b46623cae5992b51c27be87cf8bbe2bea254a499 SHA512 9e23b0c991418f8c8331795477ece481e0d8a78f4da06db03738cfa303555b80f1bc772f9d521674574fb500cf742b1c5193a0b6084b34f8b16c1cd2f1d33332 diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml index 6e25d9d61e5b..ddf894bc0a0f 100644 --- a/games-emulation/pcsx2/metadata.xml +++ b/games-emulation/pcsx2/metadata.xml @@ -14,6 +14,11 @@ Gentoo Games Project + + Use Clang compiler to build (the only compiler that is + currently supported by upstream on Linux, do not report + bugs if force-disabled) + Enable support for the media-sound/sndio backend diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild index 5166d24d2965..9810fcf44af1 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild @@ -23,7 +23,7 @@ LICENSE=" 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" +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 )" @@ -65,7 +65,7 @@ DEPEND=" " BDEPEND=" dev-qt/qttools:6[linguist] - sys-devel/clang:* + clang? ( sys-devel/clang:* ) wayland? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules @@ -93,10 +93,10 @@ src_prepare() { } src_configure() { - # upstream only supports clang and ignores gcc issues, e.g. + # 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 ! tc-is-clang; then + if use clang && ! tc-is-clang; then local -x CC=${CHOST}-clang CXX=${CHOST}-clang++ strip-unsupported-flags fi diff --git a/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild new file mode 100644 index 000000000000..9810fcf44af1 --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-1.7.5560.ebuild @@ -0,0 +1,161 @@ +# 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 toolchain-funcs + +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 +clang 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/lz4:= + app-arch/xz-utils + app-arch/zstd:= + dev-libs/libaio + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 + media-libs/libglvnd + 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/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 +) + +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 + + # for bundled old glslang (bug #858374) + use vulkan && append-flags -fno-strict-aliasing + + 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) + -DWAYLAND_API=$(usex wayland) + -DX11_API=yes # X libs are currently hard-required either way + + # 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 +} diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 5166d24d2965..9810fcf44af1 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -23,7 +23,7 @@ LICENSE=" 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" +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 )" @@ -65,7 +65,7 @@ DEPEND=" " BDEPEND=" dev-qt/qttools:6[linguist] - sys-devel/clang:* + clang? ( sys-devel/clang:* ) wayland? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules @@ -93,10 +93,10 @@ src_prepare() { } src_configure() { - # upstream only supports clang and ignores gcc issues, e.g. + # 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 ! tc-is-clang; then + if use clang && ! tc-is-clang; then local -x CC=${CHOST}-clang CXX=${CHOST}-clang++ strip-unsupported-flags fi -- cgit v1.2.3