gentoo auto-resync : 16:01:2024 - 05:29:50

9 files changed, 67 insertions, 6 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 4b78d4c4e141..2a8a8d700096 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 294372ed635c..e12f1d1e9535 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -6,6 +6,7 @@ AUX nvidia-drivers-390.154-clang15-x86.patch 1085 BLAKE2B 5bb221407b280f2dde69ef
 AUX nvidia-drivers-390.154-clang15.patch 2915 BLAKE2B e9799aee3c6b814ecdc40e83d2e495acad046f18c88fe8c1b5fead1c9cd0fab3d0a0a2924730dadec5eb8ea1e2d2132c495298d6ab108c015721bab911a4da79 SHA512 6e1c99ae8efb06aa4fc3accb4cee55f43a6498f94fca064fd4b9b007a3555913a5cef042d4e74b6f24a3eb6f14988f810d0c848d34ae81835fbae8ec32cf0cf0
 AUX nvidia-drivers-470.141.03-clang15.patch 3757 BLAKE2B 9cec15b57c82c8e24f89a025a73bf78e3d7ea5df681cf803888ca4ad8b96976b433717d01c9fdad5036cb06376345bef64dd05287791ed0ce7dc2a06c8a79aab SHA512 10ed0fa6b1fdf24fbc18432a9b94b1c1b9d7d6003926272d3c924d72a298c1d3a8875b43a42472d701864fe9dda35d75f9cf7c51ca841d20b989ed46ed994311
 AUX nvidia-drivers-525.116.04-clang-unused-option.patch 883 BLAKE2B 264cd7cf7972b686a8096c13c8e6b9cdcc8b0c32995de476482a597041160c347793ad7ef53d9d214df64c48d6e87995543e625ebace8a09845bcbc34063f529 SHA512 58f8c7b505ef4195ef0211bc06e5220fec58fa4c25ca61f45f79742516895d9339fd8ecf8abba767abf7bec121d9a6c9a539c9ac6b16fd12a25805df9fda5ae7
+AUX nvidia-drivers-525.147.05-gcc14.patch 1348 BLAKE2B bd6d048b325ea2aef59c27ec51f6060329ba78aad5a663504d4be1b0cf6e57d2422170091324ef0e225584e849073779ecfd6c04c7ce0af72751deb837366a3d SHA512 4adb7aba14d5d50dc91a966c2cfdb94c1f24eb9580d7e46a5793e3b59eae58840dd790aa1d5899b5eee8117b2dc6559805b9e7e759f98bc7ed8957387a6892b8
 AUX nvidia-drivers-535.43.22-kernel-6.7.patch 1485 BLAKE2B 06f0d46a03b4b07f906f057b06b93e56f0841118a48f74ff9d8cc15adc78e2d2a34d5bb8a63808099ef54286ea08816a69040953326c14dec04828054af6ab59 SHA512 9343294014917086b61dc72b091a7840f2a4fa929846e1554d201e38c3bc2d82b2d022e693045134eb8a52955e8df1dd3d65947f68ea8f294e6d69a23805da54
 AUX nvidia-drm-outputclass-390.conf 179 BLAKE2B 2a7d3bb2bb131db6ddf24c9fa157a1044e72a3229088654f4768f76eb871cdaacdee58e82be5504c1c0af928c343448b4d03f23d289a4479b64218d57fbd7a16 SHA512 8e5dfe54b9cf261d28c206ca1594183cba4945ed633a13ab4b1801b2ad4614ca10038ab7f0cf35dbf4eaa7b2de6e747c3be13ecb11d05740b22654626f09d774
 AUX nvidia-kernel-module-source-515.86.01-raw-ldflags.patch 628 BLAKE2B da490e4af1c898958df0ef656914e8bba3f7236fb1d2f94420a42d895d7f47ddc9cc173ef3b4b29f80ac880266767d54e76613dfc3defb1d4fe3f2b48377a71b SHA512 0a972c4efd219ddc8e814753c7c2bdea8fd0f0f3d2255bd0f9a4baab2a96319c8238cc027f602e399be9521467e110cffb1e0ee6b90f38867df49cd4c3b11c5d
@@ -56,10 +57,10 @@ DIST nvidia-xconfig-525.147.05.tar.bz2 110987 BLAKE2B 49116c8922b5c14eaa88b6230a
 DIST nvidia-xconfig-535.146.02.tar.bz2 111004 BLAKE2B 62389d8bed7a1d9864327bd295ada9c33324aa102f37746747fff163b8910705e4dd2f1d314909e045a6eb3d44066faf760ac5b47cd66fac731a10bf5a5262f6 SHA512 28db8d1bdbca45806be80732f3d43a79ea62c8423891d10d819a56892f500979ff23dead23c2ebe3f4180e87bb627283c042abd313e9d031f2c71854dafd2053
 DIST nvidia-xconfig-545.29.06.tar.bz2 110995 BLAKE2B 6c32bc45215f3d0ae65f5430eea46d93ec85b8b10d1d85f3ea40dfd358587cbc2b5493341e4da190586d2da5278abbd9dfb9b907f159448143715a8835d736fb SHA512 cfb3b1e1c96062d2e32c6fcf22410f8f3977b56097ef97de1e01ce325a381ad77e77a0e33a5deeb2889cc7dc74aa13c1a0796800696d60e5e1dcee7a7779d52b
 DIST open-gpu-kernel-modules-535.43.22.tar.gz 12738048 BLAKE2B 066625414f370fc1b8173b390ab98c8820f18f27e2ec4f4a546839d6a1bb36c69969b7ba24559b1c2f29e82a5122e3edc60c82f0ed40db8c0afb1ff8fb6d4710 SHA512 9972eb2634f7424bcd26e6525564456e72c2cad34f74c2a150f6442e0c5ae243aa1f9c9d1427331ad48d91fa1723f1207ad1bdd41d61f1dc61de3be8b9bddbbe
-EBUILD nvidia-drivers-390.157.ebuild 14136 BLAKE2B fc6244f27730a76c55e0ba370cbbd457ae5b98963ab7e92ac1c4aecf4bce78dd217ecfebe5780af3232a8e673607e69289ff1e3ce16143165f3c067a5da01989 SHA512 071f4df494f7b79cf9c910cf7ce491809bc09f4f38bf583e66921561e728d72f584f7e8ab20096182fad97136661089200dcce3fb258afa18ce46cb01b973e3a
-EBUILD nvidia-drivers-470.223.02.ebuild 14792 BLAKE2B 612c69a8e1e20aa5ad0a3baa89a04d4421c480a10f1b034af701eaf1f300069268f7bca02e1f49af53ac6d8875c62fa48d5bcb1c0cad86bfb8f39e260ee2dc64 SHA512 b697f02b12834d24aa92c1f8881a8e724b59830e9e7613394a4730b093641c89ad73c9b9e5aba191e2c1d8680b253332990dd99c4755d670b7d18cb6d6a8f1fd
-EBUILD nvidia-drivers-525.147.05.ebuild 17081 BLAKE2B 11b490141233ea871a4134e37011cadd1695d02a70aa1039c8ab483f254af5c3a8fba6dc09c8ebb664016ab922308441159a666c94f57414e0d3a4d8ebc09a48 SHA512 1e47b977c2dda9366617f1d4494e561246244a3d75b45f487b9f7baf05663a68fe80abc1d8c35c4f9278887912f4699ee497464e65b49ddeedd5cd3533cdfb6c
-EBUILD nvidia-drivers-535.146.02.ebuild 17290 BLAKE2B 590beced5c5093ace5b70957833aa836cc14d72e2d6beb7ef0dc17d343c58124c6c0766c22c0d2f9de37bb63af5b16d8e487c78c01a3646901109f491b1d654d SHA512 908fb0062638b7373621122c2d47d588ef9004d8e5f2527b13097bcc56f1bb6c6b8da0be8ed09cc48131e3bf6a3451a2e07e41f30070ed426a387824422922b2
-EBUILD nvidia-drivers-535.43.22.ebuild 17339 BLAKE2B 4d099527f00602db1e8b53b3929110c2cd83dc816f23663d637271599665e325e502e06097f8dbfcd1df6a714e69d8733187a1cf5d392070beb69a1f9adcf83b SHA512 b535924f8ef9880e865273f2056b4856cc2d6449b54ddcdc3120e0e76f591263837ea7e1a16d3768f501d5c273d8cca2ff02dd086165090b6ff0dfabb9298d54
-EBUILD nvidia-drivers-545.29.06-r1.ebuild 16880 BLAKE2B 5fef0421b572961dee7144e7399d4cb37b15a8ec7c738c2c87c2a6f0824a4981f94a545e2de27a3382e77b39cac4be5538f76b7131e4ce14fd1723d10c2862c2 SHA512 53c22231291beb69a3b773de723246e59536a30f949575147214c484c936be189f95ebbdabdd3933fb6682392f4c9c97f31328ac117d860eac084c44f4500268
+EBUILD nvidia-drivers-390.157.ebuild 14622 BLAKE2B d58511ce6d9981c3354fa735cfb0427c90393e1959b36c311d442138a61ac9ea2570fbbfc45ce89fa8108289fc765e1f9c3d8fe1dae27ad818c8057734e4d9aa SHA512 28fc2b701ce5f4805b260bb0a18775ebb3721a4d9193d9642241094e2567e99831bedc6940cd002b021963d0b99a9ac40ee31a6989b2052124db0eebe174ae95
+EBUILD nvidia-drivers-470.223.02.ebuild 15422 BLAKE2B 6905522e52a417038400c1149d26e2dc351f1e38a7db9db8276096b57a85f65bc976ca5d370c53624866a028f954672eea96f38ae3f9d9fe301baf5f14a1a673 SHA512 3bfba17df817b3468ef7db0dc7d7e8a89ed4eb8a0f2c529f515762da98099300a0e196556481fbef45a33114c7be558567b2e1fb8401e3d758c5910216c44e16
+EBUILD nvidia-drivers-525.147.05.ebuild 17134 BLAKE2B b277aa7999b8f886004b42d659184979165fe3e66ccecfccb0ac319a7a8890030917516f6ddd43a7cda8b4a40b21e47aab04e10344a5ca049a3848ca93525540 SHA512 44aef8ac73386a28fe2aa53596ae85c7eac91cb726e9f3ef730d9d0751c5d73bb8a5908cc187d87d76b1620a357bcaa5957d57cbf6976b7c56a57cd4f60768af
+EBUILD nvidia-drivers-535.146.02.ebuild 17343 BLAKE2B acc41a8be1853b393cf72202712b50e290f3e63935a74b6b4559cba5b922ffeceed922e95eb008abda666e754c6714b62631556c45d0de8571a2a6abd5fc44dd SHA512 52ebea74d78530f11cc8aebaa9cbaf90337f58f842b61dea12b5fa68aa32794f7cdc0fe774eaf1fea988f044269c4a5a4b00c5af08ce0eb723f450d90050e4bf
+EBUILD nvidia-drivers-535.43.22.ebuild 17392 BLAKE2B 4f98d191e1092b878b3028b89732af97e38de417d00b500c9e6e8f5c5882dff47b304ded2f958a524748f2370d4c8dbf1f403cca60a3d09c3e11e583cb7720c4 SHA512 6850484d83c1ea3974287d8c2a3b0c323c44854befd30208774e31640110c5a3474dba25af22f010cc63080af0f6f41fbbf157aed58a1b8a70700d778e93b879
+EBUILD nvidia-drivers-545.29.06-r1.ebuild 16933 BLAKE2B eb8f36a1eab8da8c18616efabf5a866ab637f20a0631fbd37568c2f3da0989053dd8b0b0edc0418a3a34c13daa3cfe04f358caf3188acec942f599f7e4b4c265 SHA512 dda99a86495b961d17143ecd428ccd9bcfb00aec8e9d8c236ab0284ae2011f42c06c8e1f589471ba2a7cb14b0406ccbdd9f2de026d6a5c9c2074e1a18a63c529
 MISC metadata.xml 1276 BLAKE2B 9fd18d8984ae4440f9623426edea81096b3aef9e591737d45f434848a24d50bda3ea6fa14fa412a9a59404b6256f00147b1a4650cf5f7a1a1445363fd844b522 SHA512 e46e21f95ea3b84dae5dee6bd2fa61efa4df7ebbf9ecb8033d5d590ad05c1343119822a50a156c3a46fcec5fbd1977cb6d6fc74c32e64ac4e8ded9760f09d91c
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.147.05-gcc14.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.147.05-gcc14.patch
new file mode 100644
index 000000000000..799f80b79f7e
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.147.05-gcc14.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/921370
+https://forums.developer.nvidia.com/t/279072
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -4807,6 +4807,11 @@
+             CODE="
+             #include <drm/drm_gem.h>
++            #if defined(NV_LINUX_IOSYS_MAP_H_PRESENT)
++            typedef struct iosys_map nv_sysio_map_t;
++            #else
++            typedef struct dma_buf_map nv_sysio_map_t;
++            #endif
+             int conftest_drm_gem_object_vmap_has_map_arg(
+-                    struct drm_gem_object *obj, struct dma_buf_map *map) {
++                    struct drm_gem_object *obj, nv_sysio_map_t *map) {
+                 return obj->funcs->vmap(obj, map);
+             }"
+--- a/kernel-module-source/kernel-open/conftest.sh
++++ b/kernel-module-source/kernel-open/conftest.sh
+@@ -4807,6 +4807,11 @@
+             CODE="
+             #include <drm/drm_gem.h>
++            #if defined(NV_LINUX_IOSYS_MAP_H_PRESENT)
++            typedef struct iosys_map nv_sysio_map_t;
++            #else
++            typedef struct dma_buf_map nv_sysio_map_t;
++            #endif
+             int conftest_drm_gem_object_vmap_has_map_arg(
+-                    struct drm_gem_object *obj, struct dma_buf_map *map) {
++                    struct drm_gem_object *obj, nv_sysio_map_t *map) {
+                 return obj->funcs->vmap(obj, map);
+             }"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index e722d7730c3d..364d03fab92d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -151,6 +151,16 @@ src_compile() {
 	tc-export AR CC CXX LD OBJCOPY OBJDUMP
 	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=(
+		-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[@]}")"
+
 	NV_ARGS=(
 		PREFIX="${EPREFIX}"/usr
 		HOST_CC="$(tc-getBUILD_CC)"
@@ -162,6 +172,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
 		IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
 		SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 	)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild
index d9f0ac99c1b1..a81c071f8b6d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.223.02.ebuild
@@ -148,6 +148,18 @@ src_compile() {
 	tc-export AR CC CXX LD OBJCOPY OBJDUMP
 	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=(
+		-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[@]}")"
+
 	local xnvflags=-fPIC #840389
 	# lto static libraries tend to cause problems without fat objects
 	is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
@@ -163,6 +175,7 @@ src_compile() {
 
 	local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=video:kernel )
 	local modargs=(
+		CC="${KERNEL_CC}" # for the above gcc14 workarounds
 		IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
 		SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 	)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild
index bf6ccdee2c2e..8198376cd815 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild
@@ -88,6 +88,7 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
 	"${FILESDIR}"/nvidia-drivers-525.116.04-clang-unused-option.patch
+	"${FILESDIR}"/nvidia-drivers-525.147.05-gcc14.patch
 	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
index 3f1e1c192353..9097157c2346 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
@@ -88,6 +88,7 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
+	"${FILESDIR}"/nvidia-drivers-525.147.05-gcc14.patch
 	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild
index 8c94a78cb103..1c4a52826bb9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild
@@ -91,6 +91,7 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
+	"${FILESDIR}"/nvidia-drivers-525.147.05-gcc14.patch
 	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild
index 635d62b67243..8150845d19c5 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild
@@ -87,6 +87,7 @@ BDEPEND="
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
+	"${FILESDIR}"/nvidia-drivers-525.147.05-gcc14.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
 )