gentoo auto-resync : 02:07:2024 - 08:01:06

6 files changed, 38 insertions, 3 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 8004ad42e682..9e6e189b2d3b 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 2e9819178916..8f89130d4cdc 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -2,9 +2,10 @@ AUX pcsx2-1.7.4667-flags.patch 333 BLAKE2B 4c986ba4909c7289362665c95806bb0730600
 AUX pcsx2-1.7.5232-cubeb-automagic.patch 774 BLAKE2B a932e49643df613710c27c8f0881c6e2b9c2d90964ff7f88b48b3ec5ad281bbd152fbede638accc054ea5935401ef240ed0bf8107fe1c10997242ea546b93699 SHA512 5985f08a2acce8ccbe946a7c5bd85b2388ad7166b0243a7e698c96990a3856660c1f353bc74a9ced0e5ff08f10e27922e05eb77fabff1e797166b7d6a4c445a7
 AUX pcsx2-1.7.5835-vanilla-shaderc.patch 2637 BLAKE2B 87a0774d44ad6d9b8f5219fbb2c36f4156bbefdeb172b6cca5ac6d310ab569e1687202b97b3056220fd0d5cacd0da1dbb11dcd6912b7d53850fbd0e419d13485 SHA512 1d624fae87b92c509404b0a27218a82163568350f223dbd2d9a2021d5207b923bdf9f7e13d5c6efd89aaea6eeb021ee825dce9be0a389ba0b5ee2adfa4a48c16
 AUX pcsx2-1.7.5855-no-libbacktrace.patch 955 BLAKE2B 035da91a0a64e9960846cd8d12bf649e4c536def15ca47e8a176294fbf389550f25ebb27e8ce55d9777390c1311b3b803410f57c19980dd677ef4c7e0f8d5d40 SHA512 a68d9d09dee53abcf5abe5b6eea3d7a5871d2f43eb6f684ad73f699c7930a8e89b8dc61df96f1f7a030ad90014b29b19080c6e2dc189efca67123b8509d2a04a
+AUX pcsx2-1.7.5913-musl-cache.patch 646 BLAKE2B 531a6792eda8449827019d6332a7a53f32cab006c79784996911ec4305276e506b0fc9dfda81e4ff7d3a835aef2789e2d3d36d8632636494503f6392528ece86 SHA512 56c9d1425f327ac8df040a6237c7cbb04932aabbe7bbdb84307085b0eba07914cf046c908216c6e692d0543fb6c2b0d157d88afd79ce56448bb6cf411847aca7
 DIST pcsx2-1.7.5835.tar.xz 11565084 BLAKE2B 537aa890b668a1bed471f3677de1fee99f33fda41943dc4e7a11f8a85d2cbe831bfcd0040319643d370e90f31974272ee8ec4e17e3b6ec5d170d5750d38d707f SHA512 7e0541e5d0433a59047dfd15af3c3d90c61f61a416510cce14b89d5b641c45d7deae1a084ebd9e8b36f1768e714e3b480f1b28801e0f818b0290d7d06d384bc7
 DIST pcsx2-1.7.5913.tar.gz 15669443 BLAKE2B 1b1e353b544791fb52d9e181e66fcdf0bc7039878a80279b855d05fdab4f1010f45db685d4ab6ae141f497cd72a6e007f583725345a9ef1c9a6d69dc46a77547 SHA512 a8c2e6879527d4864de97ece74aefcbe34093c169a19aafe7558aef872a449be5209209f800ca71b4d259689583f10188b8385439b769688910dc5c3b291c408
-EBUILD pcsx2-1.7.5835.ebuild 4933 BLAKE2B d5de2b4a3e18555f770c07cc2a524f329b03b8d94b6b84f4d9ff32df70e5b6137efd9080525e0526646e654902ca2edfd4b9cbb231aa2e25052ab0096b08d6be SHA512 41dc132c89261814a4457167afece381dc5484c4e5de5cbc12d214078fd834ddde920217f1ebc1b3ec0312f3320d07a42850d89e2b88a1b577398d60026c4b2d
-EBUILD pcsx2-1.7.5913.ebuild 4758 BLAKE2B fe6b018559c92e102a0eb2fcd8eb61b2daba4af8e8ad53c170616d5e02d081b1fda0f5aaa65c6b170239c06388d1c1d08b0d2b5be17226e865b910fc7dc3b0a2 SHA512 b663c9de55f1ca83a4d8271e5b7fb45271f3e8d28ae20bd8c54fac36a29455d3d80bc0c98ab7815c736dea44d60fe8df949b2a00a1c8580e0745d41b63310f88
-EBUILD pcsx2-9999.ebuild 4758 BLAKE2B fe6b018559c92e102a0eb2fcd8eb61b2daba4af8e8ad53c170616d5e02d081b1fda0f5aaa65c6b170239c06388d1c1d08b0d2b5be17226e865b910fc7dc3b0a2 SHA512 b663c9de55f1ca83a4d8271e5b7fb45271f3e8d28ae20bd8c54fac36a29455d3d80bc0c98ab7815c736dea44d60fe8df949b2a00a1c8580e0745d41b63310f88
+EBUILD pcsx2-1.7.5835.ebuild 5137 BLAKE2B 03186b90dcf5fdc2ca18e1071a38d13bcb2d38cf10b89c06a43dc90f83c993959ed35005d2f8a2807b5679ff03f01bd23c5c1b77a5f07a32305339cf9236e0a9 SHA512 122c55897fb0867edd6041a8eb86c33761954511eb0ae04c35695dc91840b9dc3f0ea44804cf2617777cf3d2eef2d83ebffdf5ea2bd0abcaf494acdb4d55d603
+EBUILD pcsx2-1.7.5913.ebuild 5009 BLAKE2B 616fd86c381d4dc3563e1b6e74b6544d9e233b08fd344531bd8f093f85b4bb911aff110bd24bde39f60f3a292a2f913a78d89ece5bc26fcce1b3a50ccc6938ea SHA512 0d7c063bb6f2c1b8c2b7a17fcfd60686131ecd20889eae4fa9631779a57c360e070584d8f516cb9247220c7b7d153be53779f2ffb753683a18dafa06f24d23cb
+EBUILD pcsx2-9999.ebuild 5009 BLAKE2B 616fd86c381d4dc3563e1b6e74b6544d9e233b08fd344531bd8f093f85b4bb911aff110bd24bde39f60f3a292a2f913a78d89ece5bc26fcce1b3a50ccc6938ea SHA512 0d7c063bb6f2c1b8c2b7a17fcfd60686131ecd20889eae4fa9631779a57c360e070584d8f516cb9247220c7b7d153be53779f2ffb753683a18dafa06f24d23cb
 MISC metadata.xml 926 BLAKE2B 0076f5137c48d1d000eeff8f82457dfbf01c02928cc2a97479fcdef1eb71ce79c444ece7db8cc949e9c1f143b46623cae5992b51c27be87cf8bbe2bea254a499 SHA512 9e23b0c991418f8c8331795477ece481e0d8a78f4da06db03738cfa303555b80f1bc772f9d521674574fb500cf742b1c5193a0b6084b34f8b16c1cd2f1d33332
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5913-musl-cache.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5913-musl-cache.patch
new file mode 100644
index 000000000000..3383904fee48
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.5913-musl-cache.patch
@@ -0,0 +1,20 @@
+Patch adapted from [1]:
+
+	musl doesn't expose these sysconf values, so just use the loop
+	below that reads them out of sysfs coherency_line_size only
+
+[1] https://github.com/chimera-linux/cports/blob/114b576aee3ebc25b48ac120da1a1093dcc4365f/user/pcsx2/patches/cache.patch
+--- a/common/Linux/LnxHostSys.cpp
++++ b/common/Linux/LnxHostSys.cpp
+@@ -143,7 +143,11 @@
+ size_t HostSys::GetRuntimeCacheLineSize()
+ {
++	#if defined(__GLIBC__)
+ 	int l1i = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
+ 	int l1d = sysconf(_SC_LEVEL1_ICACHE_LINESIZE);
+ 	int res = (l1i > l1d) ? l1i : l1d;
++	#else
++	int res = 0;
++	#endif
+ 	for (int index = 0; index < 16; index++)
+ 	{
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
index 87e19f866161..ece5dfc93cc5 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5835.ebuild
@@ -105,6 +105,10 @@ src_configure() {
 		strip-unsupported-flags
 	fi
 
+	# pthread_attr_setaffinity_np is not supported on musl, may be possible
+	# to remove if bundled lzma code is updated like 7zip did (bug #935298)
+	use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
index f8d4b9f5a3aa..deabb28cc4af 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
 	"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
+	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
 )
 
 src_prepare() {
@@ -107,6 +108,10 @@ src_configure() {
 		strip-unsupported-flags
 	fi
 
+	# pthread_attr_setaffinity_np is not supported on musl, may be possible
+	# to remove if bundled lzma code is updated like 7zip did (bug #935298)
+	use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f8d4b9f5a3aa..deabb28cc4af 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
 	"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
+	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
 )
 
 src_prepare() {
@@ -107,6 +108,10 @@ src_configure() {
 		strip-unsupported-flags
 	fi
 
+	# pthread_attr_setaffinity_np is not supported on musl, may be possible
+	# to remove if bundled lzma code is updated like 7zip did (bug #935298)
+	use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes