gentoo auto-resync : 20:03:2024 - 13:00:14

3 files changed, 18 insertions, 22 deletions

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 840ef688270d..905ded67b6a5 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,11 +1,10 @@
-AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7
 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
 DIST pcsx2-1.7.5560.tar.xz 18383080 BLAKE2B d858c098f7256a68d8845bf7cbdb9bc2f1243e2ae763384f091cf02506729b21d8cbb7a0b96ae8579869e1f15fe955834d85f314fe53e882907de0496cdf0d43 SHA512 ede61e2be69c0b38d4bd9e44cc7a07e50d7cac154cae6891d449dcf95e6ba809420ac9ebd791ad3bf41a734f2ce40175cc7afa4843f679e15daefc272358ebc5
-EBUILD pcsx2-1.7.5312.ebuild 4256 BLAKE2B b45186ca2d9863730e6e4ed15dd99b542e3d053fd11d5328a552a53c77148afcf1a61dc32ff1379fd3589d5137e1ad6ce5bb3bc788e8ba47b829a6dc9d9b29da SHA512 3962a729ca05b13b1943210430a5aadd3635576ad734d31d0afcbbc72f90d45d4f6a347b7e22d503d5ed364a97f23669c7f617e84b9e33b44965ef386ffc9558
+DIST pcsx2-1.7.5624.tar.xz 18073460 BLAKE2B 3068190f979cb5d04c7e8bd89cbab2953bff90c90c0b1fa5e8c1e0ca50eef8b557110c14a61b6f9b9bf5262e5c5151ff0a0a017fed65b63b62d86fd80fd69cdd SHA512 60720289a0994d82d57961be257a89ac12055eefc31fdc0b1f08e4918be4e76a907884c0541c71ea3091467b7c293177dd53445811c1b68037852dfd3e1589f6
 EBUILD pcsx2-1.7.5474.ebuild 4444 BLAKE2B 3602c1506b01d5fc22680968361fc3851d5495f22e0f6669023269d216ac8da017188afc93354cacfcb19b82f58e89bdb31e40d2ff13831930e4431cb3e01068 SHA512 4e03cfa18b447568e0af437763ce03701414270eabd330e9711a736c6470ed51737e4808754ee8dbb9bcc0f1934cae542fb44164083926ea774c8c7350f14594
 EBUILD pcsx2-1.7.5560.ebuild 4445 BLAKE2B 3ecfa40d01ac3d965b0a4295cc062b9cd7030db6b21bf4e6ad1bbe6a40f7384c090fc73299ca492c57c8ac70c958225ff525a65bd1ce3bd544c4794c2bf5665d SHA512 dba95445fdb1a58d1e38c5de527d4fadf5d8fec1f5386964df6d8ab0d31e2882a6ce49929e2ee33987853af983ca956f28744b603dc5ec29819246c91ecf827c
+EBUILD pcsx2-1.7.5624.ebuild 4445 BLAKE2B 3ecfa40d01ac3d965b0a4295cc062b9cd7030db6b21bf4e6ad1bbe6a40f7384c090fc73299ca492c57c8ac70c958225ff525a65bd1ce3bd544c4794c2bf5665d SHA512 dba95445fdb1a58d1e38c5de527d4fadf5d8fec1f5386964df6d8ab0d31e2882a6ce49929e2ee33987853af983ca956f28744b603dc5ec29819246c91ecf827c
 EBUILD pcsx2-9999.ebuild 4445 BLAKE2B 3ecfa40d01ac3d965b0a4295cc062b9cd7030db6b21bf4e6ad1bbe6a40f7384c090fc73299ca492c57c8ac70c958225ff525a65bd1ce3bd544c4794c2bf5665d SHA512 dba95445fdb1a58d1e38c5de527d4fadf5d8fec1f5386964df6d8ab0d31e2882a6ce49929e2ee33987853af983ca956f28744b603dc5ec29819246c91ecf827c
 MISC metadata.xml 926 BLAKE2B 0076f5137c48d1d000eeff8f82457dfbf01c02928cc2a97479fcdef1eb71ce79c444ece7db8cc949e9c1f143b46623cae5992b51c27be87cf8bbe2bea254a499 SHA512 9e23b0c991418f8c8331795477ece481e0d8a78f4da06db03738cfa303555b80f1bc772f9d521674574fb500cf742b1c5193a0b6084b34f8b16c1cd2f1d33332
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch
deleted file mode 100644
index cd0574bd5653..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Don't rely on the cmake macro to pass -fno-lto to the problematic
-FastJmp.cpp so that it works if users add -flto themselves.
---- a/common/CMakeLists.txt
-+++ b/common/CMakeLists.txt
-@@ -275,3 +275,3 @@
- 
--if (USE_GCC AND CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-+if (USE_GCC)
- 	# GCC LTO doesn't work with asm statements
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
index 5e4249cd5a8e..04d9d27fa7e1 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5312.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5624.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake desktop fcaps flag-o-matic
+inherit cmake desktop fcaps flag-o-matic toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -12,7 +12,7 @@ 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"
+	KEYWORDS="-* ~amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"
@@ -23,19 +23,22 @@ 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 )"
 
 # dlopen: qtsvg, vulkan-loader, wayland
 COMMON_DEPEND="
+	app-arch/lz4:=
 	app-arch/xz-utils
+	app-arch/zstd:=
 	dev-libs/libaio
 	dev-qt/qtbase:6[concurrent,gui,widgets]
 	dev-qt/qtsvg:6
 	media-libs/libglvnd[X]
 	media-libs/libpng:=
 	media-libs/libsdl2[haptic,joystick]
+	media-libs/libwebp:=
 	media-video/ffmpeg:=
 	net-libs/libpcap
 	net-misc/curl
@@ -62,6 +65,7 @@ DEPEND="
 "
 BDEPEND="
 	dev-qt/qttools:6[linguist]
+	clang? ( sys-devel/clang:* )
 	wayland? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
@@ -69,7 +73,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3773-lto.patch
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
 )
@@ -90,12 +93,20 @@ src_prepare() {
 }
 
 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_BUILD_DATE=yes
+		-DDISABLE_ADVANCE_SIMD=yes
 		-DENABLE_TESTS=$(usex test)
 		-DUSE_LINKED_FFMPEG=yes
 		-DUSE_VTUNE=no
@@ -103,11 +114,6 @@ src_configure() {
 		-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