Update to version 331.20.

3 files changed, 28 insertions, 6 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 6bd8557f6d8e..c0c14fd102a8 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	319.32
+DISTVERSION?=	331.20
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
@@ -99,7 +99,7 @@ IGNORE=		requires fairly recent FreeBSD-STABLE, or FreeBSD-CURRENT
 .endif
 
 .if ${NVVERSION} < 1952200
-# ABI version is hardcoded inside the binary, so specify it explicitly
+# ABI version is hardcoded inside the binary, so specify it explicitly here
 LIB_DEPENDS=	libm.so.3:${PORTSDIR}/misc/compat5x
 .endif
 
@@ -243,6 +243,10 @@ post-install: .SILENT
 .else	# some applications need this symlink (see PR ports/72877)
 	${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 .endif
+.if ${NVVERSION} < 3311300
+	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \
+		${TMPPLIST}
+.endif
 .if ${NVVERSION} >= 1952200
 	${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE}
 .endif
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 8dfc95ad5d55..fc78561c1d37 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,7 +1,7 @@
-SHA256 (NVIDIA-FreeBSD-x86_64-319.32.tar.gz) = d434055e1c11e5d091054531049d2fcaecdc4856756ce5998fe70130c542426f
-SIZE (NVIDIA-FreeBSD-x86_64-319.32.tar.gz) = 34441850
-SHA256 (NVIDIA-FreeBSD-x86-319.32.tar.gz) = 7aa65881e014a001a2b19b17f3ff8a510c306062466cdf1acb1a4c993466487e
-SIZE (NVIDIA-FreeBSD-x86-319.32.tar.gz) = 34048762
+SHA256 (NVIDIA-FreeBSD-x86_64-331.20.tar.gz) = 6a0396e828427fb928f18faa72288208702c3067c25c29ed3815a68a06e244c5
+SIZE (NVIDIA-FreeBSD-x86_64-331.20.tar.gz) = 46616176
+SHA256 (NVIDIA-FreeBSD-x86-331.20.tar.gz) = dca5c90a99ab151d97c1cbb23f37c7834867ce32f88c6916b2295b3945363b7e
+SIZE (NVIDIA-FreeBSD-x86-331.20.tar.gz) = 55524337
 SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
 SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
 SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 7c2a9de4bb3b..4e027615f453 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -2,6 +2,12 @@ bin/nvidia-bug-report.sh
 lib/.nvidia/libGL.so
 lib/.nvidia/libGL.so.1
 @dirrm lib/.nvidia
+lib/libEGL.so
+lib/libEGL.so.1
+lib/libGLESv1_CM.so
+lib/libGLESv1_CM.so.1
+lib/libGLESv2.so
+lib/libGLESv2.so.2
 lib/libGLcore.so
 lib/libGLcore.so.1
 lib/libXvMCNVIDIA.a
@@ -10,6 +16,10 @@ lib/libXvMCNVIDIA.so.1
 lib/libXvMCNVIDIA_dynamic.so.1
 lib/libnvidia-cfg.so
 lib/libnvidia-cfg.so.1
+lib/libnvidia-eglcore.so
+lib/libnvidia-eglcore.so.1
+lib/libnvidia-glsi.so
+lib/libnvidia-glsi.so.1
 lib/libnvidia-tls.so
 lib/libnvidia-tls.so.1
 lib/libvdpau_nvidia.so
@@ -24,12 +34,20 @@ lib/vdpau/libvdpau_nvidia.so.1
 @cwd /%%KMODDIR%%
 nvidia.ko
 %%LINUX%%@cwd %%LINUXBASE%%
+%%LINUX%%usr/lib/libEGL.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libEGL.so.1
 %%LINUX%%usr/lib/libGL.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libGL.so.1
+%%LINUX%%usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libGLESv1_CM.so.1
+%%LINUX%%usr/lib/libGLESv2.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libGLESv2.so.2
 %%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-eglcore.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libnvidia-tls.so.1
 %%LINUX%%usr/lib/libvdpau.so.%%SHLIB_VERSION%%