Update NVidia driver to the latest long lived branch version 430.50.

PR:	232645, 241307

3 files changed, 24 insertions, 7 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 3ca183dc6561..d1d27d050eef 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -10,7 +10,7 @@
 # slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304').
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	410.104
+DISTVERSION?=	430.50
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
@@ -24,7 +24,8 @@ COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
-# Pull GNU sed(1) for "binary" patching of libEGL.so.1 (see below)
+# Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and
+# obj/libEGL_nvidia.so.0 (see below)
 .if ${NVVERSION} >= 410.057
 PATCH_DEPENDS=	gsed:textproc/gsed
 .endif
@@ -41,9 +42,14 @@ USE_LDCONFIG=	yes
 # hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
 # since it is still used by legacy drivers.
 GLVND_JSON_PATH=	${PREFIX}/share/glvnd/egl_vendor.d
+WAYLAND_JSON_PATH=	${PREFIX}/share/egl/egl_external_platform.d
 MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE} \
-		EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH}
-SUB_FILES=	pkg-deinstall pkg-install pkg-message nvidia.conf
+		EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
+		EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH}
+SUB_FILES=	pkg-message nvidia.conf
+.if ${NVVERSION} < 410.057
+SUB_FILES+=	pkg-deinstall pkg-install
+.endif
 SUB_PATCHES=	extra-patch-src-Makefile \
 		extra-patch-src-nv-freebsd.h \
 		extra-patch-src-nv-misc.h \
@@ -171,6 +177,11 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \
 		${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
 .endif
+.if ${NVVERSION} >= 415.013
+	prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \
+	gsed ${REINPLACE_ARGS} -E "s,/etc/egl/egl_external_platform\.d.{$$padding},${WAYLAND_JSON_PATH}\x00," \
+		${WRKSRC}/obj/libEGL_nvidia.so.0
+.endif
 # Finally, process OPTIONS
 .if ${PORT_OPTIONS:MFREEBSD_AGP}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
@@ -236,6 +247,10 @@ post-install: .SILENT
 .else
 	${REINPLACE_CMD} -e '/extensions\/\.nvidia\/libglx/d' ${TMPPLIST}
 .endif
+.if ${NVVERSION} < 415.013
+	${REINPLACE_CMD} -e '/libnvidia-egl-wayland\.so/d ; \
+		/10_nvidia_wayland\.json/d' ${TMPPLIST}
+.endif
 # Rename some libraries and install a libmap file to resolve conflict with
 # Mesa libraries.
 	${LN} -sf libGL-NVIDIA.so.1 \
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index d053fb310274..6ea2ca07a26e 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,9 +1,8 @@
 TIMESTAMP = 1482026038
-SHA256 (NVIDIA-FreeBSD-x86_64-410.104.tar.gz) = 39bafa652026fae3dc077ceff8bea0a15401c36fd13c4770842f546b2e27498f
-SIZE (NVIDIA-FreeBSD-x86_64-410.104.tar.gz) = 61995820
+SHA256 (NVIDIA-FreeBSD-x86_64-430.50.tar.gz) = 6f797e6e513fb74acfdf2738efa382afb640df07b2858f1b29185e4612c6c301
+SIZE (NVIDIA-FreeBSD-x86_64-430.50.tar.gz) = 62715888
 SHA256 (NVIDIA-FreeBSD-x86_64-390.129.tar.gz) = fa109c9737a529c87efe66c3bc0a47bffa49278d6361aebc1bf6b784eb5d6968
 SIZE (NVIDIA-FreeBSD-x86_64-390.129.tar.gz) = 63905694
-TIMESTAMP = 1572354940
 SHA256 (NVIDIA-FreeBSD-x86-390.129.tar.gz) = 58e537c1a016e4fd362590e32c6f874ccdd90ce265839eb30cf370afcdc22bae
 SIZE (NVIDIA-FreeBSD-x86-390.129.tar.gz) = 64565178
 SHA256 (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 047efae28cc81e4d56c64d2a0c15d9b7ff07f09bba22696464de8276334a4df7
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index ee181260f904..4004774a278c 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -31,6 +31,8 @@ lib/libXvMCNVIDIA.so.1
 lib/libXvMCNVIDIA_dynamic.so.1
 lib/libnvidia-cfg.so
 lib/libnvidia-cfg.so.1
+lib/libnvidia-egl-wayland.so
+lib/libnvidia-egl-wayland.so.1
 lib/libnvidia-eglcore.so
 lib/libnvidia-eglcore.so.1
 lib/libnvidia-glcore.so
@@ -44,6 +46,7 @@ lib/libnvidia-tls.so.1
 lib/libvdpau_nvidia.so
 lib/vdpau/libvdpau_nvidia.so.1
 man/man1/nvidia-smi.1.gz
+share/egl/egl_external_platform.d/10_nvidia_wayland.json
 share/glvnd/egl_vendor.d/10_nvidia.json
 %%MODULESDIR%%/drivers/nvidia_drv.so
 %%MODULESDIR%%/extensions/.nvidia/libglx.so