From b0378783c1929d283116fe183089c123dba5869c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Oct 2022 13:12:50 +0100 Subject: gentoo auto-resync : 02:10:2022 - 13:12:50 --- x11-drivers/nvidia-drivers/Manifest | 3 ++- .../files/nvidia-drivers-515.65.01-kernel6.patch | 19 +++++++++++++++++++ .../nvidia-drivers/nvidia-drivers-515.65.01.ebuild | 6 ++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 x11-drivers/nvidia-drivers/files/nvidia-drivers-515.65.01-kernel6.patch (limited to 'x11-drivers/nvidia-drivers') diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index c341d17eed7f..bd467704428d 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -4,6 +4,7 @@ AUX nvidia-470.conf 1272 BLAKE2B 842aff5a34a6f6e62a914ac42a5e11c9f620e580303c470 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-drivers-515.65.01-kernel6.patch 662 BLAKE2B 9c17f7b7d3683cfcb080fd38b8253cfa950034607eb2c75c4e13d708cfd1c27e394db678dec82c516a63129ef8d6ed6016e050d741178b2907bb4e869b4b9ac1 SHA512 93aabbf7d0826011fa9660d295b980d535a7d84388aa4c0ef9b9803ce5ee497e406f1d731761d4b01a568a3a02b9c0d12ccbab14f6ac22204ea7a3d0ff21378e AUX nvidia-drm-outputclass-390.conf 179 BLAKE2B 2a7d3bb2bb131db6ddf24c9fa157a1044e72a3229088654f4768f76eb871cdaacdee58e82be5504c1c0af928c343448b4d03f23d289a4479b64218d57fbd7a16 SHA512 8e5dfe54b9cf261d28c206ca1594183cba4945ed633a13ab4b1801b2ad4614ca10038ab7f0cf35dbf4eaa7b2de6e747c3be13ecb11d05740b22654626f09d774 AUX nvidia-modprobe-390.141-uvm-perms.patch 563 BLAKE2B 9befd708ad2193e507583e066f306e11d55e82912f456e738d850b804d35331df2ca5de3a35e8ab551188c1103af762941098639fa9581b4437bc5e68595ddd6 SHA512 0546d51a86554985cd7cc036e7b8f65b457cd1a1c0549ef496422fa422d2757354a47b83247b100597f908c2653314878c721b3918ebc529cae4282824d4eada AUX nvidia-persistenced.confd 213 BLAKE2B dd57e63944a97a77e83a8373dd34ef2f56824dcfadcfbbb54cdf6eeac17066d78753bd1b21a9bad8f0437c279c95492319205c15b84b7f96e0515415dfddbc26 SHA512 a311b73bb47448538e5261ba658d42e923890c909c335eeac3cc90ad0ffd3fd5fb983df8e91077f3098eaa13b07f27b23dc24a4579b1df411ae272976ef089b3 @@ -54,6 +55,6 @@ EBUILD nvidia-drivers-390.154.ebuild 17098 BLAKE2B d488b4c674b11e27620cbc7a5d8c7 EBUILD nvidia-drivers-470.141.03.ebuild 17746 BLAKE2B f596673e5524053db9a9cf7d24fa4e6c988c844037e5539ecaefd1cff8f15b9a97782cc84dc18c53d2d338c2a4b641f12df7939e17615a9603a20f80dfe9ddb0 SHA512 2d444b40d64b61db77b033a16fd575e9760bc2bbade324df6da33afeac9d6fe249d742957003d248a88eec8ce1116d80a4ac4e557de227686c9f6de77cdbd4a8 EBUILD nvidia-drivers-510.85.02.ebuild 18076 BLAKE2B 3dcdb0fb2aa554826074a961e2d5c51fcd1830690ed285b42905f93e5b9ab2404e7f07f978b20325e86b12773e64c33e57d6887935cfefe8e8c71202c91a36b4 SHA512 7ea7663a83ad9b3bf57ef8c01623ce1605f418a39734729aba1168c47ddf4127fae2f5d468d57b9cff813021d51c1d8b5c2834490751cf0a1bd114ccb9e847a1 EBUILD nvidia-drivers-515.49.19.ebuild 19859 BLAKE2B 6be68405dd9020391fcb4df15ffbd26c8fcb2d4c10d5e14ca743c7223a939082f3b13aa546a736ac7ad3cdf76b582e9553d67c3559d7a5a5d7a937c6cde21506 SHA512 4a059345503c1dca814bd11ed49651cc094991443574759758ddc3530107d25e4a9d09447615013cc9e0c73c908f7829693430c22575d5dfc9bfa0c02c1829b2 -EBUILD nvidia-drivers-515.65.01.ebuild 19859 BLAKE2B fed776b2d2dd46f3216ee8ebc3e499c5eddac77b3663af5584509e1cd18a2d429d6d1359abd969e44004e07ec6e585f8837866b8d90a6c79ca38b947f65ab951 SHA512 7ea63231cb0acbba3d319032506f45b7bd95269535be01ae554f2c36a01eb02ff0552d448c4bb5de19604c6af1de1533cf8c63bb577758cac1864b5abca4ab97 +EBUILD nvidia-drivers-515.65.01.ebuild 20105 BLAKE2B 4d460be7038dfe2f48dec2195739984cb76b5cc36f8b6322ed790070fd0a53a4d0b0f3ddf7345dc65a3dada94905d7419cd3a88ebbe3d0cfd2a60d7d40a97281 SHA512 dc7c6ac2c467c36fb40a17f274a7ba45e69ce739371f9dfce4b0e42f904b7535eb239373f286a8de20e384673d81b6bfaef97ed811278d696ad9c6ed80e9aa8f EBUILD nvidia-drivers-515.76.ebuild 19860 BLAKE2B 7c6ee74f6c7ec7c665f510d8bcd2ab11e538dc48e979b263d6caa241b3ac421a24aeae259dfc16ce8557f65e525d864303b1c652923ed1a47c1a19528d38d4b3 SHA512 7400c35b9eb2c75460de38f6698b32144cc1241da14ee931316ac59933893084149b487e9d2ccabe80b16ccb4cc906f7b896c63342fcd4cfe9103b33cef5399e MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-515.65.01-kernel6.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-515.65.01-kernel6.patch new file mode 100644 index 000000000000..5cdf2f639c6b --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-515.65.01-kernel6.patch @@ -0,0 +1,19 @@ +Normally avoid adding kernel support patches, but this one is very +trivial and many want to use 6.0 early. + +Masked 515.76 has a more elaborate fix to ensure it works with +all supported kernel branches (not all have this header), so +this one should be conditional as a safety. + +Note older drivers branches have bigger issues and this is not +sufficient, this will wait until their next release. + +https://github.com/NVIDIA/open-gpu-kernel-modules/pull/350 +--- a/kernel/nvidia-drm/nvidia-drm-helper.h ++++ b/kernel/nvidia-drm/nvidia-drm-helper.h +@@ -109,4 +109,5 @@ + */ + #include ++#include + + #if defined(drm_for_each_plane) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild index 9c35dd8fe324..f694157692b4 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild @@ -232,6 +232,12 @@ src_prepare() { eapply --directory=kernel-module-source/kernel-open \ -p2 "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch + if kernel_is -ge 6; then # conditional as a safety, see patch + eapply "${FILESDIR}"/nvidia-drivers-515.65.01-kernel6.patch + eapply --directory=kernel-module-source/kernel-open \ + -p2 "${FILESDIR}"/nvidia-drivers-515.65.01-kernel6.patch + fi + default # prevent detection of incomplete kernel DRM support (bug #603818) -- cgit v1.2.3