x11-drivers/nvidia-drivers : version bump

8 files changed, 11 insertions, 26 deletions

diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest
index 784268fc..b690a5f6 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-384.111.run 81005322 BLAKE2B f3359ee60d11e823981583669ed598f4dfb549c0cc208e34671af81ad4f88eb23581d86309442a5c6aa1f83a0fb9dc7376c171b7d09ef42ee3d26e67c6350f44 SHA512 ddfe787a37f2a0e5409b302b13da16bd32a4a018958aa6f3b046eae7bf06d140f8d8f496e04726c57057139ebfce40811240b13d6a4ac6412655af6b257a0c5e
+DIST NVIDIA-Linux-x86_64-390.48.run 81341723 BLAKE2B 0b787e7f667bf1edb6e5c4c1bfc7c6bea2546208148f84f044c405a857bdbee5c8fbeb4ce325375acf32b4d27d8a10c7f18fbcd880afe1e1e06f31997642c092 SHA512 47f4bcc0d88d1e80ed0c03cacde96301b1c657bec88935ee2edf9b96726620f70c747a174f1a8725b56f4812961878c01df02c249ac4810dc4aedf62d1152a7f
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch
deleted file mode 100644
index 89ad2df3..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -durN a/kernel/nvidia-uvm/uvm8_va_block.c b/kernel/nvidia-uvm/uvm8_va_block.c
---- a/kernel/nvidia-uvm/uvm8_va_block.c	2017-12-26 11:20:17.097715622 +0100
-+++ b/kernel/nvidia-uvm/uvm8_va_block.c	2017-12-26 11:20:29.674381760 +0100
-@@ -36,6 +36,10 @@
- #include "uvm8_perf_prefetch.h"
- #include "uvm8_mem.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,9)
-+#include <linux/sched/task_stack.h>
-+#endif
-+
- typedef enum
- {
-     BLOCK_PTE_OP_MAP,
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.48-conf.patch
index e620e19f..e079c930 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-conf.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.48-conf.patch
@@ -1,11 +1,11 @@
 diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2016-09-02 02:32:09.000000000 +0100
-+++ b/kernel/dkms.conf	2016-10-23 17:36:01.946597121 +0100
+--- a/kernel/dkms.conf	2018-03-22 05:39:53.000000000 +0000
++++ b/kernel/dkms.conf	2018-04-09 16:18:23.177125417 +0100
 @@ -1,12 +1,20 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="384.1111"
++PACKAGE_VERSION="390.48"
  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-384.111.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.48.ebuild
index 6c7d4f2c..ef3793ef 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.111.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.48.ebuild
@@ -29,7 +29,6 @@ src_unpack() {
 
 src_prepare() {
 	epatch ""${FILESDIR}"/"${P}"-conf.patch"
-	epatch ""${FILESDIR}"/"${P}"-kernel-4.14.9.patch"
 }
 
 src_install() {
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 784268fc..b690a5f6 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-384.111.run 81005322 BLAKE2B f3359ee60d11e823981583669ed598f4dfb549c0cc208e34671af81ad4f88eb23581d86309442a5c6aa1f83a0fb9dc7376c171b7d09ef42ee3d26e67c6350f44 SHA512 ddfe787a37f2a0e5409b302b13da16bd32a4a018958aa6f3b046eae7bf06d140f8d8f496e04726c57057139ebfce40811240b13d6a4ac6412655af6b257a0c5e
+DIST NVIDIA-Linux-x86_64-390.48.run 81341723 BLAKE2B 0b787e7f667bf1edb6e5c4c1bfc7c6bea2546208148f84f044c405a857bdbee5c8fbeb4ce325375acf32b4d27d8a10c7f18fbcd880afe1e1e06f31997642c092 SHA512 47f4bcc0d88d1e80ed0c03cacde96301b1c657bec88935ee2edf9b96726620f70c747a174f1a8725b56f4812961878c01df02c249ac4810dc4aedf62d1152a7f
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-384.111-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.48.ebuild
index 3422849e..784c3a00 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-384.111-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.48.ebuild
@@ -220,12 +220,12 @@ src_install-libs() {
 
 	if use X; then
 		NV_GLX_LIBRARIES=(
-			"libEGL.so.$(usex compat ${NV_SOVER} 1) ${GL_ROOT}"
+			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
 			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1 ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
 			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2 ${GL_ROOT}"
+			"libGLESv2.so.2.1.0 ${GL_ROOT}"
 			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
 			"libGLX.so.0 ${GL_ROOT}"
 			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
@@ -250,7 +250,7 @@ src_install-libs() {
 		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
 		then
 			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.0.1"
+				"libnvidia-egl-wayland.so.1.0.2"
 			)
 		fi
 
diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest
index e04a0ffd..bbbbbdee 100644
--- a/x11-misc/nvidia-settings/Manifest
+++ b/x11-misc/nvidia-settings/Manifest
@@ -1 +1 @@
-DIST nvidia-settings-384.98.tar.gz 2136346 BLAKE2B 446944f619a832583d0db61b0d738d562c41d505f1a9025de381f88fa24b8104fc4b2b1d225ceda4b7b3c25e9d6fb4c8c14b6d896ad4ad59c02802b4df2c97ee SHA512 c4427241b15ffe5ecb0355d3e512c517d5ad1a5f5335c187dcde379074021a4990db9c048502e62a7ce9dda651b017e06d8117fb7c724bd3a08f6fbd10b49e26
+DIST nvidia-settings-390.48.tar.gz 1296872 BLAKE2B 0f8669c043145b040addc3fa06ca917a1e45bf74b252b8db0c0ff95cada09bd5a3da68691b532c03e5001ea792273dfc239909436d423434efa47524f43dfbf0 SHA512 5f8a6403edf8636cfb2aec8f01fb160030a2538140fe3d10a71863fd1f793eea3f8a6f1bc55baa7dff047bd1bef9c3bd579cf818af38b535fa172b3aaf122e55
diff --git a/x11-misc/nvidia-settings/nvidia-settings-384.98-r1.ebuild b/x11-misc/nvidia-settings/nvidia-settings-390.48.ebuild
index acf0246c..acf0246c 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-384.98-r1.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-390.48.ebuild