gentoo auto-resync : 23:09:2022 - 05:29:13

4 files changed, 32 insertions, 2 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index f0386bd3f6ba..8e8287fb3741 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 1a42122d7656..11727bb6ce60 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,6 +1,7 @@
 AUX 95-nvidia-settings-r1 54 BLAKE2B 598067babb48bd0f5680300cf3cbb37ac804edb3131c47510d3350511b918cd47fcf44f1ccd4746e4a41f2f8aa36511f20c2c6f313010e89a79b7869771b9ee6 SHA512 de9edf678c64ca3d10c912397800b2cb651ef9108b33ece97a4cc1e86dad0a9e81986cca6b96cfe80740d9cb433de7ef93f29be45178db714ee408c7f6570ac7
 AUX nvidia-390.conf 797 BLAKE2B 7cb7dc58841d2e7cf28f677939031a20ff820e2d46f799177c6004d94e73c308d2a9ee81fca476ff7ab4846a275cce996f68a53a7a9f819c3d57b5dace1d40e2 SHA512 17cabfcaa4b7323c635d1491e46710624d13396c019591499993662a20df39c8e3fa843387594aeb66d70cf38ab9fde7bee85dd1ab37eaa637a315fd52328222
 AUX nvidia-470.conf 1272 BLAKE2B 842aff5a34a6f6e62a914ac42a5e11c9f620e580303c470057cec261f0804f2a9254a3d4928c2dbd1ae992e71d30c0880a5bcf3e89e725ae918738ebe001911f SHA512 615b42ffdaf070ac191b9dcd4b17ca261aef1eb1ed45514a5bdfae1d900202ae6b7218f0dc037800bb51eb6a3b96aecaa4aaecc1c349b3439fdec3640a3586fa
+AUX nvidia-drivers-390.154-clang15-x86.patch 1002 BLAKE2B a221d3063439eb492b4d5cb96d88b6e2de9e7146872a340d8ff0c635060850f78180809aeb3e58f9908d6eb09a96d4ec98608b48059cfd019cd9bcb928649968 SHA512 3677e2ed21ff30eb499eff89ccb64a5a7e79c66872871b1703bb5bdd19aee6f08abf197395aa3b7c442f6147939d8ff2d3bde04fd2d47cc92d9b0ac211c2e5b7
 AUX nvidia-drivers-390.154-clang15.patch 2832 BLAKE2B af69f8195ee42fc12ef9a001d6a0e169b3104f41ae62008c2c831907c345c9bca5008d5cd9204c64940706b4d248815edb8dc1cc659a33d541924fc82766a6bb SHA512 2005cf471ff804dbf0ca96800e30177a4b50a113c2d9ff6ee46b40d6a435c20b5ce9c13cef729d69204269b869f39c8109bca63186f7ff3c79baef08b7af0b73
 AUX nvidia-drivers-470.141.03-clang15.patch 3674 BLAKE2B 58297ed0360c972641933c83f019c52ddfec71fa34b27bc2c9326ba5e50896f72a899196719af72e134716f7a54697ccca5c13cffd10ab5df64a5131a9a03cba SHA512 8aaae0dedb3e774046052cc5296c7c9fe24f01767f71ff837012a32775473bad8c5b3c26b8547761dcc6ca8f9fbc6aa8e256b58f15830b64dd187e64b0c96f20
 AUX nvidia-drm-outputclass-390.conf 179 BLAKE2B 2a7d3bb2bb131db6ddf24c9fa157a1044e72a3229088654f4768f76eb871cdaacdee58e82be5504c1c0af928c343448b4d03f23d289a4479b64218d57fbd7a16 SHA512 8e5dfe54b9cf261d28c206ca1594183cba4945ed633a13ab4b1801b2ad4614ca10038ab7f0cf35dbf4eaa7b2de6e747c3be13ecb11d05740b22654626f09d774
@@ -51,7 +52,7 @@ DIST nvidia-xconfig-510.85.02.tar.bz2 109790 BLAKE2B 09313f0f423c52c81550e8d94b8
 DIST nvidia-xconfig-515.65.01.tar.bz2 109681 BLAKE2B b41b3ec377c79af6906a47c826d9930cc5ea6e85e8404e6882f3bc03cfccfa03d8ef7c280453ab29edb208173aeb576d33df00f92c225a86bc3cb571b352cdbc SHA512 6f0752e32af6772e85bd2799ea2d895bd5b5faee4c1b6813eb839e75af43d07ef09be6606e7dfc40491e07c25333e9c4145465f97dc0338053e8be1c19220bf9
 DIST nvidia-xconfig-515.76.tar.bz2 110126 BLAKE2B de3c76133cdf20f927f242c39cc8db9bd8a03d27be2f3f3007ad69597e9aeeb5596602b18ea49d9de57d832e374568b19a05ce068521c4e0a067c359da55b873 SHA512 36d8831679427e331e3143ff1f46ff90498dcbefa5708f748be9ae608ff149ee23b8aaa80567a91f642de84be63a301c0b0bd9a46344cf6f2493c4a38466f709
 DIST open-gpu-kernel-modules-515.49.15.tar.gz 7413872 BLAKE2B af04b65096832cfdde54025559585197d3c24700551b866a79d170eee9aefaa99e7e1a9357a8be4762ec7d39789a22610e3d031c04d2e589cbbf086ee34a5ffe SHA512 efadd610126281def49fb5f559dd5a115f2bde6058500862e359faaac7d095f578c496fbb150b8c99cad990a8214662c9fae4428aa8e7a8060f2405d194341ac
-EBUILD nvidia-drivers-390.154.ebuild 14499 BLAKE2B 738775b82d686c1ab0cc10fd434a1cfe1488c33ffffb702f550fee0ddf3efe45cf61f15beeed3b9e0aa02b14eed3e17a372f0deac594c8d5ba3f3b9f563f8c48 SHA512 839bf4f6bdf8d471fef1f721719ad1d0cf624cb7313cc7e6546e64a858205c56c5bce3dbfe7fcf5e50d089e3a6bd13c6c376ebd5859199a875d27664978761d8
+EBUILD nvidia-drivers-390.154.ebuild 14522 BLAKE2B 2d194b25d39d7a7cc47ea5c209b9e91f8ca51c11a67d77fd71cbee4e9fd65b19318ee5d1894e8afa09c30de9a8d3851cf7a3534a8faabc5ff3a4141dabd41d9b SHA512 ba174ffe8c86ac22f2a7ac29be4cbc52669d83a523851234683282db384abf24725b9b3ccc2e5291669a87889903704e0eb196839582a7e5ae82df05c28b9124
 EBUILD nvidia-drivers-470.141.03.ebuild 15173 BLAKE2B 363a42dac2c3f75694dfdb3b953e3a20fe2b49646e95dc45da2e1657dec1c62ec7a5913e79bd62cac5ddb5bb941d850d73ed47ee8e754b9a53c45fa65ee91b81 SHA512 e058ea9b36931beae6d22dc9a7edf680bbc8a2fc77661d0b94516e9cf1700c4c6077e4500813c5510c7586b4386b245f988d94e794b57cac5c8de8e7b0692728
 EBUILD nvidia-drivers-510.85.02.ebuild 15503 BLAKE2B 5def90d96f7166930a8d71704bf8267f1900b1f17118efaa1f58d94d042a04f2f16c236941e22229fc6786e560d514d4b69162f004fdffa889621e621cc279b0 SHA512 9840767dd038b6804f011d05fac8334afe8fb012a12ddde6991cf15cc5e5dcf709566b8ae32731b2e3a24d18b8d11eaea7dc7a1fe66e41c3ac9f2e88c3309216
 EBUILD nvidia-drivers-515.49.15.ebuild 17286 BLAKE2B 0a390e038907b7fca0704fe32e3216a80b2c30d1c925327eeecebe42e06d4c833c15b42c8cca380bccee3e2e1aa2b8a7d6cb9d9d95774c3a8a620371d81d9b43 SHA512 197284f7789fef33236f6337d94c54cc48d072f22a8e263df5af9468e1bfe02f85c876965cc614798648e416e7482624b3d303fb92fd1a912689ca82ce016fa1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch
new file mode 100644
index 000000000000..2038b3da157a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch
@@ -0,0 +1,28 @@
+Kernel's makefiles pass -Werror=strict-prototypes which
+trigger errors with clang15+
+https://bugs.gentoo.org/870238
+--- a/kernel/nvidia/nvlink_linux.c
++++ b/kernel/nvidia/nvlink_linux.c
+@@ -639 +639 @@
+-void * NVLINK_API_CALL nvlink_allocLock()
++void * NVLINK_API_CALL nvlink_allocLock(void)
+--- a/kernel/nvidia/os-interface.c
++++ b/kernel/nvidia/os-interface.c
+@@ -879 +879 @@
+-NV_STATUS NV_API_CALL os_flush_cpu_cache()
++NV_STATUS NV_API_CALL os_flush_cpu_cache(void)
+@@ -886 +886 @@
+-NV_STATUS NV_API_CALL os_flush_cpu_cache_all()
++NV_STATUS NV_API_CALL os_flush_cpu_cache_all(void)
+@@ -944 +944 @@
+-void NV_API_CALL os_flush_cpu_write_combine_buffer()
++void NV_API_CALL os_flush_cpu_write_combine_buffer(void)
+@@ -1073 +1073 @@
+-NvU32 NV_API_CALL os_get_cpu_number()
++NvU32 NV_API_CALL os_get_cpu_number(void)
+@@ -1080 +1080 @@
+-NvU32 NV_API_CALL os_get_cpu_count()
++NvU32 NV_API_CALL os_get_cpu_count(void)
+@@ -1155 +1155 @@
+-void NV_API_CALL os_dump_stack()
++void NV_API_CALL os_dump_stack(void)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
index 14d1ff0122f7..7a9cab0fed5d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
@@ -73,7 +73,6 @@ BDEPEND="
 QA_PREBUILT="opt/bin/* usr/lib*"
 
 PATCHES=(
-	"${FILESDIR}"/nvidia-drivers-390.154-clang15.patch
 	"${FILESDIR}"/nvidia-extras-390.154-clang16.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.141-fno-common.patch
@@ -152,6 +151,8 @@ src_prepare() {
 	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
 	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
 
+	eapply "${FILESDIR}"/nvidia-drivers-390.154-clang15$(usev {,-}x86).patch
+
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)