gentoo auto-resync : 11:08:2023 - 15:35:17

4 files changed, 36 insertions, 13 deletions

diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index 2125941a075d..7400d89ab114 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -7,7 +7,7 @@ AUX wine-proton-7.0.6-mingw64-11.0.0.patch 849 BLAKE2B 26833ef532e7c5b8b0ae14424
 AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cfd7666363bede5dddedd2449e07251823b1ce86a717e06d342eec782aff501f27bc23433511c163da0b2a50c411df7ac53 SHA512 82ff0510fcab35471aa0db8f32f48cd62dbf78b3f5f36e3d191b86be55cb476df1ee689e5cd53c95d4f02199b5900eb0c8a45959693739a6c35e4c8b3cfa243f
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-3c.tar.gz 48254135 BLAKE2B fee58928555376f71579099d3fb39dbe2242516b671af1ca2507a135c3119422d6e168ed2a258d29c57a8fc33a026e5cf788d8362f238f1c0c4c7c81c9cbb147 SHA512 5d473534834ce8ea855d4ee2d39f1596117c0abab0925ee50875245ff6e1f49fe4684fe6f162e92a4b5e408795ff8c9b15b382fb013074216dd565143ecd9efc
-EBUILD wine-proton-7.0.6.ebuild 10957 BLAKE2B 42161cb65325f6cb0c129055c58301efbd7f38151958809289d269053c0573c60e11ce8ff6a393c87e39e31c737a3c92a2984b322e1178ac6f8e51e9913fe735 SHA512 6447856a8664212ed1ec7ca068f94b3003e5790f730db5703ec10bdfade5f8ad6e48de85c6e1e80a7cc6ce91b548b81fdadeb26d8312e8ba50aee8680584f0ac
-EBUILD wine-proton-8.0.3c.ebuild 11215 BLAKE2B 8712763fbb60efb62860a0511ab50b412466037cb4a888abc8d8aff1114bcca07ea6c98a8e6e59cdd048b2f9c352d8ec2a86b54a87942f9af3eb9d5167458e1d SHA512 472139158349310af399ddbeaf975d1b668a14b7779022fdcbbd22ed4e44ac0eeca86e348bec617a7fcacbb170af652fb58862ab4897014b3da2c6b8d67cb78a
-EBUILD wine-proton-8.0.9999.ebuild 11275 BLAKE2B 2cc71b94cf649b3bc4cd4873ecb6bd7c4aa4d15235a26b5524f4cf70d284cb426e2914f1fe80b7584b80e4ee15afd63575cdbf3108f5c5a49f15b4fed1286a16 SHA512 04d9ec9711121a3e8b59a65144cf9e5de1210cff551a55c517d936bb4d0cd529f0e9c93811fa777caf238b2948a41bb534bf5e0ed69bc23680e0f4bf9cd61a5c
+EBUILD wine-proton-7.0.6.ebuild 11234 BLAKE2B 54384570b1202653c5f5112eddce5253666095deb4073197ea22531d3e5db04452e6fac0dfd4a9b04aa21ed8be84e76b0b72e8ba82508d63bd741366bdcd5e33 SHA512 8fe4a60335e9eeeff86b99605818ffaaecb8d2e59aaebc55af9623814945e417956a70e65a721b89e8b70fcce7844f065b8231799746ad0efb5b63f08e35d0be
+EBUILD wine-proton-8.0.3c.ebuild 11565 BLAKE2B 38dd9b30e87c104ca9270d93d25332f40947852d4ef517f8c2a56ed15c8e5f087add2f42eedf25fab6c00ff2f713632825acd70f86072a111320785d227ba325 SHA512 3a498f0265426dad3b79f4f4d6556a0b8d20796ce9c573585aadd750f71689ed835b1e983e6b83f8d2d968f34dff13a66169b0bb0aaa8b0ccbb22c933a6f0845
+EBUILD wine-proton-8.0.9999.ebuild 11625 BLAKE2B 0fb0d5ed5bb2f7a5bb80643fac07ba7af3caca85edf14be436b28f9fb626a63721e345b980425919e371f091efd3001aa2dfa636fe2779ccf5963c1ac5444226 SHA512 6258cd5a656fe75677f86be9636f4ce35e72c31b199c6b02b5fed04b84cc4a6fb7a1d0fc00ecca374e219787df99c51d024a82fad42a19f02a1203ca235e1d51
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 294e5c9aab65..95664cb0ff23 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -152,6 +152,13 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		# -mabi=ms was ignored by <clang:16 then turned error in :17
+		# and it still gets used in install phase despite --with-mingw,
+		# drop as a quick fix for now which hopefully should be safe
+		sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index 3f2ba5ab1d26..c5db812fe92b 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -60,8 +60,10 @@ WINE_DLOPEN_DEPEND="
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+# gcc: for -latomic with clang
 WINE_COMMON_DEPEND="
 	${WINE_DLOPEN_DEPEND}
+	sys-devel/gcc:*
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
@@ -149,6 +151,16 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		# -mabi=ms was ignored by <clang:16 then turned error in :17
+		# and it still gets used in install phase despite --with-mingw,
+		# drop as a quick fix for now which hopefully should be safe
+		sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+
+		# needed by Valve's fsync patches if using clang (undef atomic_load_8)
+		sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in || die
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
@@ -218,11 +230,7 @@ src_configure() {
 		$(use_with xinerama)
 	)
 
-	# builds with non-bfd but broken at runtime (bug #867097)
-	# TODO: retest mold and lld, and figure out what's wrong if
-	# still broken given (at least) lld is supposed to work
-	tc-ld-force-bfd
-
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
 	filter-lto # build failure
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
diff --git a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
index 68a943a8042e..cced91f4ca78 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
@@ -60,8 +60,10 @@ WINE_DLOPEN_DEPEND="
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+# gcc: for -latomic with clang
 WINE_COMMON_DEPEND="
 	${WINE_DLOPEN_DEPEND}
+	sys-devel/gcc:*
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
@@ -149,6 +151,16 @@ src_prepare() {
 
 	default
 
+	if tc-is-clang; then
+		# -mabi=ms was ignored by <clang:16 then turned error in :17
+		# and it still gets used in install phase despite --with-mingw,
+		# drop as a quick fix for now which hopefully should be safe
+		sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+
+		# needed by Valve's fsync patches if using clang (undef atomic_load_8)
+		sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in || die
+	fi
+
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
@@ -220,11 +232,7 @@ src_configure() {
 		--without-vosk # unpackaged, file a bug if you need this
 	)
 
-	# builds with non-bfd but broken at runtime (bug #867097)
-	# TODO: retest mold and lld, and figure out what's wrong if
-	# still broken given (at least) lld is supposed to work
-	tc-ld-force-bfd
-
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
 	filter-lto # build failure
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}