gentoo auto-resync : 19:10:2023 - 15:53:17

6 files changed, 166 insertions, 7 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 54cd3c8a1d24..00f7d4463670 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 93fc0043e687..3d47109c2a61 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -5,7 +5,9 @@ AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c9694
 AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb07306007edbb001fc44cab21d3c4356a46a1104fc77de9d7fbf4dd76147fd2e3e8695ff4abf6e984dbda1a832e610c1126 SHA512 35ae6f69f4c7ef0bac86b231e75438cf24f8c50cb72f03b4540164c87ced0a3c167cb911cd5d7949f9fad41895fe97fc775ff8f179601d73597d967c79029e83
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.5033.tar.xz 15811448 BLAKE2B ac1fa9e405aafc03c194e0a032102af19b1c7b64114aa64523982bcb1c519c8a1c888c4d681a63d68fb744c4cc1999f2feb4ff71757eb645d9d5826813c34c2b SHA512 ba62725beeb7f51cc6c6da746384d33b6435d3a06e5f06844b09a6399171befd0e4099b277fa5c91d09a2f5399270511e53c34aaee43afee975152344a5127a6
+DIST pcsx2-1.7.5133.tar.xz 17898104 BLAKE2B 89fdc9eb7b1e2ba2ed6b8e36859b728cac593ad78b5d0ecf542e624787440dd7c783285870b170df0cd4eee7f8d97c33be7b065ecb5894084a048f76f5978284 SHA512 cdd27820954675a5ded2168238c4ca071447b1d31e8d92e9db96105d6dae66e2a8f9fc549fcdc5d0d04f3822d6dd3d3c3525f4f8131b18aa6ff5d1177a27b99a
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
 EBUILD pcsx2-1.7.5033.ebuild 4144 BLAKE2B 8c74f5ca60dc1e1e54db7c65582621922634917a4e3ad3a7c6935984420389276456969cbca876a8d501ee26f6e39d4d899ea3aa5de5f35c33ae85eccad41bfc SHA512 557c2ea2d6861dcf4cf09d7cc1c5f7ad12d573bd3e47f82bde4880c96b862351b177efda71d39eb427b4da0af70c92a4433f3273d471b34282ca41dc2215c922
+EBUILD pcsx2-1.7.5133.ebuild 4168 BLAKE2B 33c598c9ff77674cd8004a29b68c4ccc43e1340a4ab297ce5477a9f57d700d8d7b7eae64b56358058027ea0f7b60edee50c45079ff04cc81282a85b46d6f6f2a SHA512 4debfac11d464b1112988b6b58a1b8faa1dfd1480b8b1b15eb6b113549c8a5947eda1efb312dd22a146a0ce208cefc14da92484aab7cb2a238f3994fd9cc3884
 EBUILD pcsx2-9999.ebuild 4168 BLAKE2B 33c598c9ff77674cd8004a29b68c4ccc43e1340a4ab297ce5477a9f57d700d8d7b7eae64b56358058027ea0f7b60edee50c45079ff04cc81282a85b46d6f6f2a SHA512 4debfac11d464b1112988b6b58a1b8faa1dfd1480b8b1b15eb6b113549c8a5947eda1efb312dd22a146a0ce208cefc14da92484aab7cb2a238f3994fd9cc3884
 MISC metadata.xml 750 BLAKE2B 33707426a3ad147ae822ec78bb271d54efcc1e295960f27d4b0c792600f84f65552596145cd46e75939e3ee9ac216b63d48d42e5264f8cca7ecf900a54846310 SHA512 78c374d8b928d9326792c0a02e1847ef7d745f6855120752a11dfe17511a611a802beae10f71c212120c78face2b52e82ba9413617af5680e7424bad9fee9426
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
new file mode 100644
index 000000000000..63a7bbdd2c1d
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.5133.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	# formerly was attempting to unbundle most, but upstream dropped every
+	# checks for alternatively using system's and keeping this up has become
+	# unmaintainable, and to simplify now also using tarballs with submodules
+	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/xz-utils
+	dev-libs/libaio
+	>=dev-qt/qtbase-6.5.3:6[gui,network,widgets]
+	>=dev-qt/qtsvg-6.5.3:6
+	media-libs/libglvnd
+	media-libs/libpng:=
+	>=media-libs/libsdl2-2.28.4[haptic,joystick]
+	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.5.3:6[linguist]
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+	fi
+}
+
+src_configure() {
+	if use vulkan; then
+		# for bundled glslang (bug #858374)
+		append-flags -fno-strict-aliasing
+
+		# odr violations in pcsx2's vulkan code, disabling as a safety for now
+		filter-lto
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=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
+
+		# 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
+
+		# 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_patches/Manifest b/games-emulation/pcsx2_patches/Manifest
index 058a4bc52975..0c1fc21faa8f 100644
--- a/games-emulation/pcsx2_patches/Manifest
+++ b/games-emulation/pcsx2_patches/Manifest
@@ -1,6 +1,6 @@
-DIST pcsx2_patches-0_p20230822.tar.gz 618444 BLAKE2B a51bba04e4bd52f8d04e5529ce05c7d22cd550bd00a5268b29addba24ca45f9c248ba9a7012a54e0187dfd75c423748b09e3afdafdd421177e8b08cbfd4809e4 SHA512 8a8ae2ed4a4b5ebca9f8a9d0b12d6fb9c862bc68496f167dc02fac4c1b39767a9bd9ff84373e43484b7a06693b06f07f2e9b283d3ec3de0202807f46801ce190
 DIST pcsx2_patches-0_p20230917.tar.gz 622275 BLAKE2B 1c9bb048ae46d454e723828d762c1d084da17777c391b0fdb40a0d3b376560f3d67336cb50f6d65efe1c1b3ff3e2079c6fbca1de00ebbe62ff97d47d6b63a294 SHA512 35eacac2ab230d645b860f79be39b9f312a23b28c4fa69c67b710a89a78343e56dc1f0c1c4a128bc73dd57b6bec0438c1561e5277c6daad4dc4000d0123f91cb
-EBUILD pcsx2_patches-0_p20230822.ebuild 1514 BLAKE2B 99701adafa3e66012660661648b8d8929ed0448fc76ce6b1aa5c221f65d649ef38d26908afac1e9fcaf9a22e3c0ea1e32cc25eb2eee23fa3facbc5b2a9f21749 SHA512 9d53ddf429e4f16c8dd576aefed07ddfb9fc086a84bdc5f975becd8965ae89068c0aa7436ec925e8b9cb2de8f89fb6250a983a1b68213b85a11d2666ef82f274
+DIST pcsx2_patches-0_p20231015.tar.gz 626844 BLAKE2B cde4e81aa354839f4e49a20cbf3d375704b9a09cf30283bfe61c0b2fcd213dd0e33431875eba3d7f5fc4ca45cb779ba1916f787464a922a5cfc484e75b727205 SHA512 6a53806ff8f348946539fb3f960e91bc40d01f8c7d6acd2e07cfbea938bd5abf4d820b1c26f19b46d103438d32325c02942a879ce3f500e30a6f5fe8b776d46c
 EBUILD pcsx2_patches-0_p20230917.ebuild 1512 BLAKE2B e383101f12cbf3abffa3d9036498152c046ef9258a7bb95788bae8aa88ad42431b29120c3829d2b2571858d9448a05087d479880ddf44aa3670c0cfecea76db1 SHA512 214aaaba430bf341a9e25e96781f33aa3f8f97e2c52a2151c8167f912fb7d2038274ef33c455501cbf4b1826a7586cb97bb7652d8af9b982805ea3c3e431b6ef
-EBUILD pcsx2_patches-9999.ebuild 1472 BLAKE2B 4c3f88d47ccc2f963d476c0dedd018838511001ffb78a6a24c71dcf2888408b64a9c3900b463fe068c0f4fa602b6e5e479c5a2902115aeb1a74e10094efa31a9 SHA512 4218a6fce2c06a6893181d5608fff6bae7b3440307f74b46930e4269aca2c4f2c9b740541818a2699b9f08e6444c6d9ca569bca12e69935aa785dfb5e7df9335
+EBUILD pcsx2_patches-0_p20231015.ebuild 1514 BLAKE2B fff36eb37657fca9a82c4003bf415dddf48376fe8a47e7c7b510804c2750e1f9d662e3177772479e17fdca51eb08311851590908b324eb34eac974e0582e910f SHA512 f18af92e33e78482bb1501ede2c3b3be88ad80353572c7a2f3f227d282796f11d71fa3c9262fb64bf76f1783d8ae2c09d73e8c09c1b6333c2c42fcec00b16451
+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_p20230822.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231015.ebuild
index 8a5ef4418d69..76995605c664 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20230822.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20231015.ebuild
@@ -10,10 +10,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2_patches.git"
 else
-	HASH_PCSX2_PATCHES=39769eef1c17a0b1743d5e6b61ec392a19ee08cf
+	HASH_PCSX2_PATCHES=4a843d2fb7d9e44532e496b8968bbcf28673b99a
 	SRC_URI="
 		https://github.com/PCSX2/pcsx2_patches/archive/${HASH_PCSX2_PATCHES}.tar.gz
-			-> ${P}.tar.gz"
+			-> ${P}.tar.gz
+	"
 	S=${WORKDIR}/${PN}-${HASH_PCSX2_PATCHES}
 	KEYWORDS="~amd64"
 fi
@@ -47,7 +48,7 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/share/pcsx2/resources
+	insinto /usr/lib/pcsx2/resources
 	doins patches.zip
 
 	einstalldocs
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild
index 6bf4935dea98..e4f775a8776c 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild
@@ -13,7 +13,8 @@ else
 	HASH_PCSX2_PATCHES=
 	SRC_URI="
 		https://github.com/PCSX2/pcsx2_patches/archive/${HASH_PCSX2_PATCHES}.tar.gz
-			-> ${P}.tar.gz"
+			-> ${P}.tar.gz
+	"
 	S=${WORKDIR}/${PN}-${HASH_PCSX2_PATCHES}
 	KEYWORDS="~amd64"
 fi