From 08c5e4df7a4b66ba8dbb827ca2e3a973d4f19ab0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Jan 2024 20:06:58 +0000 Subject: gentoo auto-resync : 17:01:2024 - 20:06:58 --- games-emulation/Manifest.gz | Bin 12021 -> 12020 bytes games-emulation/pcsx2/Manifest | 4 +- games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 161 +++++++++++++++++++++ games-emulation/pcsx2/pcsx2-9999.ebuild | 1 + games-emulation/pcsx2_patches/Manifest | 2 + .../pcsx2_patches/pcsx2_patches-0_p20240116.ebuild | 55 +++++++ 6 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 games-emulation/pcsx2/pcsx2-1.7.5474.ebuild create mode 100644 games-emulation/pcsx2_patches/pcsx2_patches-0_p20240116.ebuild (limited to 'games-emulation') diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz index fb4558872b17..300d792e9099 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 7626d80a3220..a4bce939866d 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -2,6 +2,8 @@ AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c9694 AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb07306007edbb001fc44cab21d3c4356a46a1104fc77de9d7fbf4dd76147fd2e3e8695ff4abf6e984dbda1a832e610c1126 SHA512 35ae6f69f4c7ef0bac86b231e75438cf24f8c50cb72f03b4540164c87ced0a3c167cb911cd5d7949f9fad41895fe97fc775ff8f179601d73597d967c79029e83 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 EBUILD pcsx2-1.7.5312.ebuild 4242 BLAKE2B 0f0308b0bf27f2d6d5345773715ddbc523a68b3276469dfd2de19bb8515e4edb35d8689423ec272fbda8b4a9e326c19d1b6249192efb08820bffdc816d33dc29 SHA512 f00c2ebc324fc48e2ce13dfab360c212877e549c482e1103acd746bf03395daf30603128494f826dae21b69390a4a1e1f485985b295eded58a0c525dac07d825 -EBUILD pcsx2-9999.ebuild 4320 BLAKE2B d743f7d48b00a56e460261fe7488822a85de42191967ef1f315f35a00b9d53af582c72ebb8f76566232a4a095aa6a5b6974f6b7bc4e15ff14e9c4490948ec483 SHA512 5aab04e43d7f4c56cb53d869c5e2822a1ce4ea478492662e4070caeb1723a6616097d742fda3b8320b98b7ad2b040c63c8fde86b5badce10ed8528044447033d +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 diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild new file mode 100644 index 000000000000..5166d24d2965 --- /dev/null +++ b/games-emulation/pcsx2/pcsx2-1.7.5474.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 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] + 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() { + # 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 + 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 328235f14174..5166d24d2965 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -95,6 +95,7 @@ src_prepare() { src_configure() { # 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 local -x CC=${CHOST}-clang CXX=${CHOST}-clang++ strip-unsupported-flags diff --git a/games-emulation/pcsx2_patches/Manifest b/games-emulation/pcsx2_patches/Manifest index 91b8f4903bab..5c66a4685e8b 100644 --- a/games-emulation/pcsx2_patches/Manifest +++ b/games-emulation/pcsx2_patches/Manifest @@ -1,4 +1,6 @@ DIST pcsx2_patches-0_p20231217.tar.gz 647767 BLAKE2B a82211d3a31ee3475d2047ad4c25cc247003b15f8132c0e0fa1c144fff3ea59f0806409aeb9a1128697aee2453110d2da50e9577067d068879a885477b04dc3a SHA512 411431fa80a0a221c7b336ebb84ce9b0c078ff75c2cc79b5e31c9b5fc505f9ecec8b371c142a6be6802e2070ae57758c65df34d24d5392fb9f4065a276b32610 +DIST pcsx2_patches-0_p20240116.tar.gz 657224 BLAKE2B 9a85ed98565fa002176b86675c60b016688959228b9055c7e577aea235d15a9aa64d09e4af7c997670dec075a3c3b790d19661342d2f5978ca49adc9da33625a SHA512 c35281bb92d562e279fe81c2584d8341b407a3bd72467825c4ac454a698cd844b905dd4533144c7837e22b1fb7971be525fc5dcd8f0ec09e5f1d66630f7c2692 EBUILD pcsx2_patches-0_p20231217.ebuild 1518 BLAKE2B 4c66d2f2e340000ef50f63c3eb50ac851a93963e776091e06654b845791168f0060fce54d7aaeb7017247adbc584f474f84a45d9d27dc421eaf6b3de9b6ef147 SHA512 68dd144f8344660840dfceaa4ea2d5cd3a1212ea324d97ba0105ced2b4fb71a8df3dd5742a4352c4326ec6ef321af0bf0fd9e29d6fbdd29134ee6f0ef65ccbdd +EBUILD pcsx2_patches-0_p20240116.ebuild 1519 BLAKE2B aa06488421786608bbac8e75045d9c7a3d9015c78930279faa5af5128697785ecce45e6cd006c6f9afb22f792e934c21901c545cc81905bbc6aa6363e8504ca8 SHA512 565856bc0fd64d7419200d26c6b656df1e127c8fcb52378b9274db41776c54ce1459db91aaa655632327d1ae8c42316a4a835698087cb126d2997073c7db9173 EBUILD pcsx2_patches-9999.ebuild 1474 BLAKE2B b93d9a65771de4e9699a31e4a8d0b1cefc57a9851fdcb07d711d1aa79ea3b9e8f8b1bfa17d5d1b000be19be72a8ece7d72981bd2dfb06409cefec8ca878a374a SHA512 191e544e1100c701906a01b711c3111d743b3a4a68805a5c22d86fdab5d50e49bb04182ba7933c0e1f555ba50a9c09c4eba7480396adb1547b1bbc893b011a8b MISC metadata.xml 362 BLAKE2B 3b213785f8a28bc1e2f540e27b025d4397dec5f7885fcc8f7e3fa56186b8f023ef97de5ff7b927a8c09ad1f79baee546d08b25cf865e344197a1640470f37641 SHA512 f00b1d14ba779989c235775de6f2470e18b29f2813723eae51015681af2d2c798aeddaa9657897c83b8bcb0b124ea77b34cf6370e37104fa24a968834ea5fabb diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240116.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240116.ebuild new file mode 100644 index 000000000000..03d08b015a5e --- /dev/null +++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240116.ebuild @@ -0,0 +1,55 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit python-any-r1 + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/PCSX2/pcsx2_patches.git" +else + HASH_PCSX2_PATCHES=619e75bb8db50325b44863f2ccf3c39470c3d5a3 + SRC_URI=" + https://github.com/PCSX2/pcsx2_patches/archive/${HASH_PCSX2_PATCHES}.tar.gz + -> ${P}.tar.gz + " + S=${WORKDIR}/${PN}-${HASH_PCSX2_PATCHES} + KEYWORDS="~amd64" +fi + +DESCRIPTION="Collection of game patches for use with PCSX2 (e.g. widescreen hacks)" +HOMEPAGE="https://github.com/PCSX2/pcsx2_patches/" + +# these are normally distributed by upstream with PCSX2 which is GPL-3+ +LICENSE="GPL-3+" +SLOT="0" + +BDEPEND="${PYTHON_DEPS}" + +src_compile() { + # upstream uses a constantly replaced "latest" patches.zip (currently no + # real releases), and github's .zip archives cannot be used either due to + # having the patches/ subdirectory -- so we use a snapshot and repack + # (could use app-arch/zip, but python is more likely to skip a dependency) + ebegin "Creating patches.zip" + "${PYTHON}" - <<-EOF + import pathlib + from zipfile import ZipFile, ZIP_DEFLATED + + patches = pathlib.Path("patches/") + + with ZipFile("patches.zip", "w", ZIP_DEFLATED, compresslevel=9) as archive: + for file in patches.iterdir(): + archive.write(file, arcname=file.name) + EOF + eend ${?} || die +} + +src_install() { + insinto /usr/lib/pcsx2/resources + doins patches.zip + + einstalldocs +} -- cgit v1.2.3