Update NVidia drivers to most recent versions.

6 files changed, 19 insertions, 23 deletions

diff --git a/x11/nvidia-driver-173/Makefile b/x11/nvidia-driver-173/Makefile
index df25265daa31..60fabbb8864f 100644
--- a/x11/nvidia-driver-173/Makefile
+++ b/x11/nvidia-driver-173/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	173.14.18
+DISTVERSION=	173.14.20
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 NO_LATEST_LINK=	yes
diff --git a/x11/nvidia-driver-71/Makefile b/x11/nvidia-driver-71/Makefile
index e0e4772a87ae..20c73bdd448e 100644
--- a/x11/nvidia-driver-71/Makefile
+++ b/x11/nvidia-driver-71/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	71.86.09
+DISTVERSION=	71.86.11
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 NO_LATEST_LINK=	yes
diff --git a/x11/nvidia-driver-96/Makefile b/x11/nvidia-driver-96/Makefile
index 359d9c920407..13cee339bf5e 100644
--- a/x11/nvidia-driver-96/Makefile
+++ b/x11/nvidia-driver-96/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	96.43.11
+DISTVERSION=	96.43.13
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 NO_LATEST_LINK=	yes
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index e966be5bda3e..248e9b6ba090 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	180.60
+DISTVERSION?=	185.18.29
 PORTREVISION?=	0			# As a reminder it can be overridden
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
@@ -74,12 +74,6 @@ LIB_DEPENDS+=	m.3:${PORTSDIR}/misc/compat5x
 post-patch: .SILENT
 # We should support -CURRENT: kill the check
 	${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h
-# Switch from suser() to priv_check() API on recent -CURRENT
-.if ${OSVERSION} >= 800049
-	${REINPLACE_CMD} -e \
-		's/suser(CURTHREAD)/priv_check(CURTHREAD, PRIV_DRIVER)/' \
-			${WRKSRC}/src/nvidia_os.c
-.endif
 .if defined(WITH_FREEBSD_AGP)
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
 		${WRKSRC}/src/nv-freebsd.h
@@ -121,7 +115,7 @@ post-install:
 	@${REINPLACE_CMD} '/wfb/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 1802900
-	@${REINPLACE_CMD} '/libvdpau/d' ${TMPPLIST}
+	@${REINPLACE_CMD} '/libcuda/d ; /libvdpau/d' ${TMPPLIST}
 .endif
 # Some applications need this symlink (see PR ports/72877)
 	@${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index e8460069faf1..132d76a7e349 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,12 +1,12 @@
-MD5 (NVIDIA-FreeBSD-x86-180.60.tar.gz) = 08f97cd4e322f5992275bdae15e68be9
-SHA256 (NVIDIA-FreeBSD-x86-180.60.tar.gz) = 7ddf39476b42ccf1f0585340ad6b384d5c7cdc5825cba33f81138156077bf89a
-SIZE (NVIDIA-FreeBSD-x86-180.60.tar.gz) = 18594717
-MD5 (NVIDIA-FreeBSD-x86-173.14.18.tar.gz) = ad9a421ef5a29782a263facce985f00b
-SHA256 (NVIDIA-FreeBSD-x86-173.14.18.tar.gz) = 7c77dd3e442351a5e782888db93a4e2f3832396adb85f65c086ed1f1c906700a
-SIZE (NVIDIA-FreeBSD-x86-173.14.18.tar.gz) = 16203001
-MD5 (NVIDIA-FreeBSD-x86-96.43.11.tar.gz) = fe5ee7c4ae37b91c4d7d1641295af4ea
-SHA256 (NVIDIA-FreeBSD-x86-96.43.11.tar.gz) = 5e17d537ae8ef4c56cb1b95c17672865a49f3aa504775e96d61a6795f6d9c26f
-SIZE (NVIDIA-FreeBSD-x86-96.43.11.tar.gz) = 11051460
-MD5 (NVIDIA-FreeBSD-x86-71.86.09.tar.gz) = bdef215b8a56bd95a54beb8ac63bddf4
-SHA256 (NVIDIA-FreeBSD-x86-71.86.09.tar.gz) = 778f9fedf37ad08f68224b84ef366966021312417e5ec90f71a968a68a775da1
-SIZE (NVIDIA-FreeBSD-x86-71.86.09.tar.gz) = 8020966
+MD5 (NVIDIA-FreeBSD-x86-185.18.29.tar.gz) = 14b054dc1dd2fdfa1a06d95a2b77cfed
+SHA256 (NVIDIA-FreeBSD-x86-185.18.29.tar.gz) = 843fbb119f9cf0d624dbd1efae25caad20e26a5894c245f9b014da09a0e53bca
+SIZE (NVIDIA-FreeBSD-x86-185.18.29.tar.gz) = 19243110
+MD5 (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = 54869428baee8878c04c19751a2a8047
+SHA256 (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = c5a27324d96391ada41b4ccbbf2a321c3d86693e54d1e9d1139d97c3132530f3
+SIZE (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = 16211218
+MD5 (NVIDIA-FreeBSD-x86-96.43.13.tar.gz) = a9bbcc7d0bab6fa3fd64dd7952b14e54
+SHA256 (NVIDIA-FreeBSD-x86-96.43.13.tar.gz) = 614396a11ab8b304c51721cd4b47fb82a5f75884ff77d3d414e0e5739835c738
+SIZE (NVIDIA-FreeBSD-x86-96.43.13.tar.gz) = 11057193
+MD5 (NVIDIA-FreeBSD-x86-71.86.11.tar.gz) = 5f414ee297bff0d9e70e3ce437efdbeb
+SHA256 (NVIDIA-FreeBSD-x86-71.86.11.tar.gz) = 9f7dfbb8acdc46bee3c9dd8a6ca3399946f96120e196bf49b484bacb3796aedd
+SIZE (NVIDIA-FreeBSD-x86-71.86.11.tar.gz) = 8023461
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 38903657fd2b..9498be854bff 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -39,6 +39,8 @@ nvidia.ko
 %%LINUX%%usr/lib/libGL.so.1
 %%LINUX%%usr/lib/libGLcore.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libGLcore.so.1
+%%LINUX%%usr/lib/libcuda.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libcuda.so.1
 %%LINUX%%usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libnvidia-tls.so.1
 %%LINUX%%usr/lib/libvdpau.so.%%SHLIB_VERSION%%