x11-drivers/nvidia-drivers : version bump

8 files changed, 4 insertions, 38 deletions

diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest
index 899ac468..995b94fb 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-390.77.run 82722543 BLAKE2B 46bc7b365b4a8bd2d9444ccccec0ef427a1bbf19546db21c01d765332e8ff12fd297991166895815c96bb8d1a6153df5178578ebfaffbf7875396a8bb5578ad8 SHA512 6273ab0dee2fb70a5675166d4a49059f2cb46528408e292ac334b6210eb54be7caa56479274404ab773a4e9ba4c5a9a2e0568cb5ca7f15dea448a59ec2e72cde
+DIST NVIDIA-Linux-x86_64-390.87.run 82690871 BLAKE2B b43a45a7d48160a72185417360a4ff4238922f6d77c7b58c0562f0e01c8aa33e89057e8a5d354e8d3c8e6fa86acf8908a6c2eab81e06158a92908eec18a9b02e SHA512 f4883744f5e07150677918669eed03c7b87774f752112aabd52d903a09ae16351b34105075da2ff0fcb7a847cf66ec17e9797826859fcaecc44fdcd464a61805
diff --git a/sys-kernel/nvidia-drivers-dkms/files/kernel-4.16.patch b/sys-kernel/nvidia-drivers-dkms/files/kernel-4.16.patch
deleted file mode 100644
index 67172815..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/kernel-4.16.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
-index 10fc418..22ef968 100644
---- a/kernel/common/inc/nv-linux.h
-+++ b/kernel/common/inc/nv-linux.h
-@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
- 
- #if defined(NV_VM_INSERT_PAGE_PRESENT)
- #include <linux/pagemap.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- #include <linux/dma-mapping.h>
-+#else
-+#include <linux/dma-direct.h>
-+#endif
- #endif
- 
- #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index b23dbb4..42dc576 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1906,7 +1906,12 @@ compile_test() {
-             # Determine if the phys_to_dma function is present.
-             #
-             CODE="
-+            #include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
-             #include <linux/dma-mapping.h>
-+#else
-+            #include <linux/dma-direct.h>
-+#endif
-             void conftest_phys_to_dma(void) {
-                 phys_to_dma();
-             }"
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.77-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.87-conf.patch
index f5cf84de..06fc058d 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.77-conf.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.87-conf.patch
@@ -5,7 +5,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="390.77"
++PACKAGE_VERSION="390.87"
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.77.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87.ebuild
index 00243c36..92d75126 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.77.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87.ebuild
@@ -29,7 +29,6 @@ src_unpack() {
 
 src_prepare() {
 	epatch ""${FILESDIR}"/"${P}"-conf.patch"
-	epatch ""${FILESDIR}"/kernel-4.16.patch"
 }
 
 src_install() {
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 899ac468..995b94fb 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-390.77.run 82722543 BLAKE2B 46bc7b365b4a8bd2d9444ccccec0ef427a1bbf19546db21c01d765332e8ff12fd297991166895815c96bb8d1a6153df5178578ebfaffbf7875396a8bb5578ad8 SHA512 6273ab0dee2fb70a5675166d4a49059f2cb46528408e292ac334b6210eb54be7caa56479274404ab773a4e9ba4c5a9a2e0568cb5ca7f15dea448a59ec2e72cde
+DIST NVIDIA-Linux-x86_64-390.87.run 82690871 BLAKE2B b43a45a7d48160a72185417360a4ff4238922f6d77c7b58c0562f0e01c8aa33e89057e8a5d354e8d3c8e6fa86acf8908a6c2eab81e06158a92908eec18a9b02e SHA512 f4883744f5e07150677918669eed03c7b87774f752112aabd52d903a09ae16351b34105075da2ff0fcb7a847cf66ec17e9797826859fcaecc44fdcd464a61805
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.77-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
index f6c045ef..f6c045ef 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.77-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest
index 72487dc1..585794b0 100644
--- a/x11-misc/nvidia-settings/Manifest
+++ b/x11-misc/nvidia-settings/Manifest
@@ -1 +1 @@
-DIST nvidia-settings-390.77.tar.gz 1296869 BLAKE2B fd70a03355354d13a52355e328c635e3b138675a17205a3b8de172062d066a78cade69d92b6daed77a6be9b2e900a7500708395c6cf8b6ede3f3ac0bec37f8e5 SHA512 59b737f2257284b978a00e78be2d95e63242b19358b2a8225c80553f37406eb5d30d752a79894a7338c2053f36c2dbda756edccf264929a03f0de0927c4c57e2
+DIST nvidia-settings-390.87.tar.gz 1296851 BLAKE2B 7f7b5a6c4f090ae7835e7db3e5f5ccc42256a6792e81f708bf97dde185f9cf08f29a840043ef892ef3fe32aadbd0dabb46be5052ae5aee971a0edeb9f9c95d3b SHA512 2fb98c8a2e7633ead1e40acb5539e1f66cc6f12667ad2ed12599c0f0500fc92754915c286030a5f31673047ff100066f689741b4aa5c3e2be2bc2259b7a5a8f7
diff --git a/x11-misc/nvidia-settings/nvidia-settings-390.77.ebuild b/x11-misc/nvidia-settings/nvidia-settings-390.87.ebuild
index 1e8bbe5f..1e8bbe5f 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-390.77.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-390.87.ebuild