gentoo auto-resync : 25:11:2024 - 03:02:44

9 files changed, 51 insertions, 21 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 4dfb3158cd84..657c3d3fea9a 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 1f3bd3ead708..3f88295751b4 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -67,11 +67,11 @@ DIST nvidia-xconfig-550.127.05.tar.bz2 111217 BLAKE2B a687e3e1d9e77cb5153a9732be
 DIST nvidia-xconfig-550.135.tar.bz2 111674 BLAKE2B 0913687b89856f1371ec50caadcacb51ed61e6533e16de427d26297cf11429820581bca40d4e7ff5977889a1eb176436293e2bec48c318a14ebae167fdb771cd SHA512 aa15efd3fc39359848f09789bab158f31c66dcf816e6a81001cbbc72fa3a94caf5a5e5f28ff7ae3961d16a872e665dd422e8ced669eb3d1dc7d6da38159e465c
 DIST nvidia-xconfig-565.57.01.tar.bz2 111256 BLAKE2B 66c6eea83729d87ddf516bf6d6bab9dd5552bc7ff5cec0969565383f66e6dde82ee7eb9553be4d78d752f51140ae722a103008bdd1e62c21fb89479fbdc92c05 SHA512 567cbe0ec092b8932be7ffd41ded760d3ed7be9496bf4cf655384443ec9a90d653432986ad01c62f5ed5fd4230131cc47eaba5df6a5caedc88236c9fa3ec14cb
 DIST open-gpu-kernel-modules-550.40.80.tar.gz 13812930 BLAKE2B ee9b1f5560e9d10983037218acb812cff0d8e719d77dc3ec0b826630e130e3b03803a456d34156b4c01fd1d8e644b3febdbbed21b577be24e0b7ae858d643e02 SHA512 96439ac2a0ef2327b28fd7a329805921a48f3dc4567fd69d1f4bd84b0f3f03aa8e93ae665e33d2a07e8864a12a93dcf2308a595594319a5418667d79c59a8bad
-EBUILD nvidia-drivers-390.157.ebuild 15156 BLAKE2B 3589f99c7531449fa326e595422d5fcb5038042ee8cf4e341877b0763fc52603695fa2606bcd98555755119638ede7d4d456b4a1eddc337262ba9c3c9cfd8974 SHA512 46ea0ee2d3a3ce354589fa40bf60523ab39883ffbb86e2d1c5394a55bd3e6aa62a5ee879ab28ea35f0714fd8ce1fdf595dc1aaec870366d339240dd96bf65516
-EBUILD nvidia-drivers-470.256.02-r2.ebuild 18949 BLAKE2B d05614f0cb33fc1286fc6514d44d7a0b7fbb0a84f466ec345bd44d1d8332d4d4166b65c623e364d8a40b5c78596249dc6aac60ed95401bb474498b4fc7e10fae SHA512 3840fa3d4a59fd15a37c0d5cfdc6993fd7579a0392f2de2b06f39ef7335a12dfa0f7c70447e59a4e7e4f8b9ecbeb8aa3adbd5806aff1a46b02d914e21349932b
-EBUILD nvidia-drivers-535.216.01-r1.ebuild 21792 BLAKE2B d957f07c832802ae53b2712e36a795f47178cf7692c51f2c0a5747985f7aa92713fff2ec0a9ebf8a07931eda4b147ca174743d42a769c1deb4e0de350a6eae88 SHA512 60b14228973bff7fd3c7d52e784a74dea24385787b0a9d5c1588459a23d1e8979de8cbf300e5f7d5750e57f22129a878d2aad221d9bc1f2a1094e6dc2a51e142
-EBUILD nvidia-drivers-550.127.05-r1.ebuild 21492 BLAKE2B cf2b498967fc0df21c6d6a79c4f92213403785c1594ab200d9b7d7a662c9f9e086b622b706481e11b842dbcd37b6666179f80e3013a346506808e72c43c1e448 SHA512 6522afbe0faee1c458dfc547e96e4380c42e8de486bfa4449f5eb143b3bc13f995b4f7e42059dfbf08edbf321358dbc92a43fc5999546c2745db4b38270dc3df
-EBUILD nvidia-drivers-550.135.ebuild 21672 BLAKE2B 668b59df4614e6bfcfc9244cdd33265bd817c29993ef16a2bc731db9bdfcdb8730e672586a4d9719f3f269fce27ed18398965b438cfb025dc9113d5dab5501a1 SHA512 798c969dda16bbebad931939d856ebf99f43fc3b768b738793a560354bbf7f61f56c528d911ab23a6ceb193a29b6b7185c5bdbed34c8e289d6ca400ca3326c31
-EBUILD nvidia-drivers-550.40.80.ebuild 21567 BLAKE2B 15203bb22e76a4a9508f5d39803700f68dab7ecfe7e0df01dc168467a3624ca914b7f7a93c611409f051f510e826ed5fa6f23fa0df6dc0f1e5a554d4b19e4973 SHA512 adcc62f8d45727eaa79d5427a441594bc831449babce1a6705498c8517de6dbea979f19f3885b898cea1ec3844e6fdafb27d3d99c5ec889f4d418986eb2432b1
-EBUILD nvidia-drivers-565.57.01-r3.ebuild 22397 BLAKE2B 889be12232a8a61c3a85cb5c427009d2dc711c9953772059cd1a9037d8271fda848e31a6bc816e3c0a42aa3f9c0bc1eed9c4c8bab48a43dd938bb7633b472b5b SHA512 7f99ecd18cc7094f80987f18008da00ac081254c6f9134dc6cf349bdce6071114fa450919033ff0184d25671155a1ef4daf1f658fc853d37ab835a1eab5f9a52
+EBUILD nvidia-drivers-390.157.ebuild 15141 BLAKE2B baf68ec6e09ddad8533ad978aaf6c993cf1034fabbf7051ebbc6ebc3c1ca2beea4055c118365ab00598127c24f9a3ec72c0f811d9fc1c533ba054da338cc80b7 SHA512 295119effe17007196554c061fba03518928e48507cac5bca1f799dd1a32188c4b8f80cd9bd4c9bd3e563075b8245eda7d1a2deb7d7cb820b104575f1c891c9b
+EBUILD nvidia-drivers-470.256.02-r2.ebuild 18790 BLAKE2B ba38d388627f509aff65a8656f17d8de5784060579be37cd186a20550d1f307c6e392aac5fff916e03d420fddae0866700ce981037691510d1fbe8741064d469 SHA512 e8b57c1ce9e3008f366e6d7c0b9a09576900a6dfda5dfb62037bbfc987fd86e22511c26100ddc90799eb10fdcaf350ed8bd233f549918d07cacbdc9decebe522
+EBUILD nvidia-drivers-535.216.01-r1.ebuild 22066 BLAKE2B d23468359087eb45f86266d0624aad1c96b718f905088dc5823c5bf7fc85fc4db87404461339a51ebd862bb40f788dd4161a9ff2107373b8e94f2fc55884ca5a SHA512 34f8db06b65700ed5e705bf8f1779a142bc10bdb9440220f4be1c407659fd27763527188d5d6631e7cf9f566cb3bfaf9ced64718dd49b50e8dc9145640955cc5
+EBUILD nvidia-drivers-550.127.05-r1.ebuild 21766 BLAKE2B f3a0ea4a85a9802772e3d473c02f790bc1a58f16cc4b8e7d1bd8bc3ad5cc89887a6de88e3009e48a91a44f79479f62feeb066f7b5ba22950a27ca87b5535663a SHA512 a371a099d2ff57a68f7067d31d33504bfe6b09182eb76e6efa43f1259ebeb3c068253ce62d9480df4f73f9123909419a474c643906aa63f237c2801ac09c71b6
+EBUILD nvidia-drivers-550.135.ebuild 21946 BLAKE2B 75dc78271f18d271b640a7946592d9004cdbdeb557ee833c2903e6f1946650d5fd49f92e306fbdb0bb51d314c988c7adad4074649d777c05b03d304cbc0649eb SHA512 239a6b254ac4839c167ac2d39a3428d152448325e28bb8d4c4ca3df6d9cad915ca62549c73a4f533e0c5b579b621fa38c60eaf5a145fac5150c54043f11dbcfd
+EBUILD nvidia-drivers-550.40.80.ebuild 21841 BLAKE2B fc2b3ef82c69240c05141b89c1edd82b30588a907d41dba7e9564883f74e4bb6af98390f9772edce6971cfbaff3fee3bb84463dedc8a9a9213afc1dc40a069c1 SHA512 516b9582ee7f9991f127718e1d3de499aeaac24a712a5f40b037b61c36276dfe6513175ae3e47a1eda4f47e03249e1fecc715bbe36d946f447d03f21d439e0c7
+EBUILD nvidia-drivers-565.57.01-r3.ebuild 22671 BLAKE2B 62a08fba947cb78d93c7fbc592329b02cf9d6924e3d02302194ed270c645a842a1a8e04820dd5bafd41bc9ae9ab6a953c289f34675de60bab4927dc96f7210ee SHA512 8c10e89e10ece7119f5acd84f2f6de7e9004e61714c5d3d18885ac3edfab8b92f5d9e51b2ac8a6c241d158df24d22f74cea29eef9550468baf04ec82d667fab1
 MISC metadata.xml 1457 BLAKE2B 10fccbffe28ab58e012aae439123f947acea95eb3bdc4d0e2eb1ec14a92ad24fc2e3e0c248dcce87d9fdec54a65b8e040b2ed048d9ef11054f762f295c24ce39 SHA512 8469884c614a0275f438a0f8d583f2823d1159905ee27402e859c824cc458ac31daf69f2b7960533daaf86e1ca203be745c03e4e67ff12e9bbb2c08b91c667a0
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index 2c3ff9a01c0d..ef1d957c063a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -151,15 +151,16 @@ src_compile() {
 	tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
 	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
 
-	# latest branches has proper fixes, but legacy have more issues and are
-	# not worth the trouble, so doing the lame "fix" for gcc14 (bug #921370)
-	local noerr=(
+	# dead branch that will never be fixed and due for eventual removal,
+	# so keeping lazy "fixes" (bug #921370)
+	local kcflags=(
+		-std=gnu17
 		-Wno-error=implicit-function-declaration
 		-Wno-error=incompatible-pointer-types
 	)
 	# not *FLAGS to ensure it's used everywhere including conftest.sh
-	CC+=" $(test-flags-CC "${noerr[@]}")"
-	use modules && KERNEL_CC+=" $(CC=${KERNEL_CC} test-flags-CC "${noerr[@]}")"
+	CC+=" $(test-flags-CC "${kcflags[@]}")"
+	use modules && KERNEL_CC+=" $(CC=${KERNEL_CC} test-flags-CC "${kcflags[@]}")"
 
 	NV_ARGS=(
 		PREFIX="${EPREFIX}"/usr
@@ -172,7 +173,7 @@ src_compile() {
 	local modlist=( nvidia{,-drm,-modeset}=video:kernel )
 	use x86 || modlist+=( nvidia-uvm=video:kernel )
 	local modargs=(
-		CC="${KERNEL_CC}" # for the above gcc14 workarounds
+		CC="${KERNEL_CC}" # for the above kcflags workarounds
 		IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
 		SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 	)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild
index 72ca42915a62..54648a15bfe3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild
@@ -137,17 +137,16 @@ src_compile() {
 	tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
 	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
 
-	# latest branches has proper fixes, but legacy have more issues and are
-	# not worth the trouble, so doing the lame "fix" for gcc14 (bug #921370)
-	# TODO: check if still needed on bumps given this branch is supported,
-	# and reminder to cleanup the CC="${KERNEL_CC}" in modargs if removing
-	local noerr=(
+	# dead branch that will never be fixed and due for eventual removal,
+	# so keeping lazy "fixes" (bug #921370)
+	local kcflags=(
+		-std=gnu17
 		-Wno-error=implicit-function-declaration
 		-Wno-error=incompatible-pointer-types
 	)
 	# not *FLAGS to ensure it's used everywhere including conftest.sh
-	CC+=" $(test-flags-CC "${noerr[@]}")"
-	use modules && KERNEL_CC+=" $(CC=${KERNEL_CC} test-flags-CC "${noerr[@]}")"
+	CC+=" $(test-flags-CC "${kcflags[@]}")"
+	use modules && KERNEL_CC+=" $(CC=${KERNEL_CC} test-flags-CC "${kcflags[@]}")"
 
 	local xnvflags=-fPIC #840389
 	# lto static libraries tend to cause problems without fat objects
@@ -164,7 +163,7 @@ src_compile() {
 
 	local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=video:kernel )
 	local modargs=(
-		CC="${KERNEL_CC}" # for the above gcc14 workarounds
+		CC="${KERNEL_CC}" # for the above kcflags workarounds
 		IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
 		SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 	)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild
index 6d4b7816cd0b..d8723f5691d5 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild
@@ -199,6 +199,11 @@ src_compile() {
 	if use modules; then
 		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
 
+		# conftest.sh is broken with c23 due to func() changing meaning,
+		# and then fails later due to ealier misdetections
+		# TODO: try without now and then + drop modargs' CC= (bug #944092)
+		KERNEL_CC+=" -std=gnu17"
+
 		local modlistargs=video:kernel
 		if use kernel-open; then
 			modlistargs+=-module-source:kernel-module-source/kernel-open
@@ -212,6 +217,7 @@ src_compile() {
 
 		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
 		local modargs=(
+			CC="${KERNEL_CC}" # needed for above gnu17 workaround
 			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
 			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 		)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild
index 16b0f7c9bd86..a64a855cd597 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild
@@ -192,6 +192,11 @@ src_compile() {
 	if use modules; then
 		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
 
+		# conftest.sh is broken with c23 due to func() changing meaning,
+		# and then fails later due to ealier misdetections
+		# TODO: try without now and then + drop modargs' CC= (bug #944092)
+		KERNEL_CC+=" -std=gnu17"
+
 		local modlistargs=video:kernel
 		if use kernel-open; then
 			modlistargs+=-module-source:kernel-module-source/kernel-open
@@ -205,6 +210,7 @@ src_compile() {
 
 		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
 		local modargs=(
+			CC="${KERNEL_CC}" # needed for above gnu17 workaround
 			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
 			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 		)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild
index e0b2132a4374..89209125741d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild
@@ -191,6 +191,11 @@ src_compile() {
 	if use modules; then
 		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
 
+		# conftest.sh is broken with c23 due to func() changing meaning,
+		# and then fails later due to ealier misdetections
+		# TODO: try without now and then + drop modargs' CC= (bug #944092)
+		KERNEL_CC+=" -std=gnu17"
+
 		local modlistargs=video:kernel
 		if use kernel-open; then
 			modlistargs+=-module-source:kernel-module-source/kernel-open
@@ -204,6 +209,7 @@ src_compile() {
 
 		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
 		local modargs=(
+			CC="${KERNEL_CC}" # needed for above gnu17 workaround
 			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
 			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.80.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.80.ebuild
index 754f67dcfc07..ce5908bef544 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.80.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.80.ebuild
@@ -193,6 +193,11 @@ src_compile() {
 	if use modules; then
 		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
 
+		# conftest.sh is broken with c23 due to func() changing meaning,
+		# and then fails later due to ealier misdetections
+		# TODO: try without now and then + drop modargs' CC= (bug #944092)
+		KERNEL_CC+=" -std=gnu17"
+
 		local modlistargs=video:kernel
 		if use kernel-open; then
 			modlistargs+=-module-source:kernel-module-source/kernel-open
@@ -206,6 +211,7 @@ src_compile() {
 
 		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
 		local modargs=(
+			CC="${KERNEL_CC}" # needed for above gnu17 workaround
 			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
 			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 		)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild
index 14c7ce103198..5d4c42112da0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild
@@ -196,6 +196,11 @@ src_compile() {
 	if use modules; then
 		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
 
+		# conftest.sh is broken with c23 due to func() changing meaning,
+		# and then fails later due to ealier misdetections
+		# TODO: try without now and then + drop modargs' CC= (bug #944092)
+		KERNEL_CC+=" -std=gnu17"
+
 		local modlistargs=video:kernel
 		if use kernel-open; then
 			modlistargs+=-module-source:kernel-module-source/kernel-open
@@ -211,6 +216,7 @@ src_compile() {
 
 		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
 		local modargs=(
+			CC="${KERNEL_CC}" # needed for above gnu17 workaround
 			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
 			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 		)