3 files changed, 42 insertions, 17 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 1e3402a5202d..8f0df4105048 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,18 +6,23 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	185.18.36
+DISTVERSION?=	195.22
 PORTREVISION?=	0			# As a reminder it can be overridden
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
+ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
+.if ${DISTVERSION} == 195.22
+MASTER_SITE_SUBDIR=	XFree86/FreeBSD-x86${ARCH_SUFX}/${DISTVERSION}
+ONLY_FOR_ARCHS=	i386 amd64
+.else
 MASTER_SITE_SUBDIR=	freebsd/${DISTVERSION}
-DISTNAME=	NVIDIA-FreeBSD-x86-${DISTVERSION}
+ONLY_FOR_ARCHS=	i386
+.endif
+DISTNAME=	NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering
 
-ONLY_FOR_ARCHS=	i386
-
 NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
 USE_GL=		gl
 USE_LDCONFIG=	yes
@@ -27,8 +32,11 @@ MODULESDIR=	lib/xorg/modules
 PORTDOCS=	*
 
 OPTIONS=	FREEBSD_AGP	"Use FreeBSD AGP GART driver" off \
-		ACPI		"Enable support for ACPI Power Management" off \
+		ACPI_PM		"Enable support for ACPI Power Management" off \
 		LINUX		"Build with support for Linux compatibility" on
+.if ${DISTVERSION} == 195.22	# XXX should check against NVVERSION XXX
+OPTIONS+=	WBINVD		"Enable heavy-weight cache-flush logic" off
+.endif
 
 # Starting with version 1.0-7667, NVidia has dropped support for numerous
 # "legacy" GPUs.  Consult NVidia README (the Appendix) to find out whether
@@ -37,7 +45,7 @@ OPTIONS=	FREEBSD_AGP	"Use FreeBSD AGP GART driver" off \
 # slave ports.
 #
 # XXX Until NVidia starts to name their releases consistently, employ this
-# ugly hack to derive NVVERSION. XXX
+# ugly hack below to derive NVVERSION. XXX
 #
 .if ${DISTVERSION:C/[0-9]+//g} == ".."			# major.minor.update
 NVVERSION=	${DISTVERSION:S/.//g}
@@ -71,7 +79,13 @@ PLIST_SUB+=	LINUX="@comment "
 MAKE_ENV+=	WITHOUT_LINUX=yes
 .endif
 
+.if ${OSVERSION} < 702106
+IGNORE=		requires fairly recent FreeBSD-STABLE, or FreeBSD-CURRENT
+.endif
+
+.if ${NVVERSION} < 1952200
 LIB_DEPENDS+=	m.3:${PORTSDIR}/misc/compat5x
+.endif
 
 post-patch: .SILENT
 # We should support -CURRENT: kill the check
@@ -80,7 +94,7 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
-.if defined(WITH_ACPI)
+.if defined(WITH_ACPI_PM)
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
@@ -88,8 +102,12 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
+.if defined(WITH_WBINVD)
+	${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \
+		${WRKSRC}/src/nv-freebsd.h
+.endif
 # Don't build any binaries (nvidia-settings and nvidia-xconfig) and manuals
-.if ${NVVERSION} < 974600
+.if ${NVVERSION} < 974600 || ${NVVERSION} == 1952200
 	${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile
 .else
 	${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile
@@ -111,11 +129,11 @@ post-install:
 .if ${NVVERSION} < 817400
 	@${REINPLACE_CMD} '/libnvidia-cfg/d' ${TMPPLIST}
 .endif
-.if ${NVVERSION} < 974600
+.if ${NVVERSION} < 974600 || ${NVVERSION} == 1952200
 	@${REINPLACE_CMD} '/wfb/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 1802900
-	@${REINPLACE_CMD} '/libvdpau/d' ${TMPPLIST}
+	@${REINPLACE_CMD} '/vdpau/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 1851829
 	@${REINPLACE_CMD} '/libcuda/d' ${TMPPLIST}
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index f0c75a7303ee..242b877ea77b 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,6 +1,9 @@
-MD5 (NVIDIA-FreeBSD-x86-185.18.36.tar.gz) = feff4da79a8c3a2f194f46c95c545adb
-SHA256 (NVIDIA-FreeBSD-x86-185.18.36.tar.gz) = 890b9543d3c81bccc72d60c653647a719c9037f8fc7a88144a18b2a012fbd4a7
-SIZE (NVIDIA-FreeBSD-x86-185.18.36.tar.gz) = 19245550
+MD5 (NVIDIA-FreeBSD-x86-195.22.tar.gz) = 2c7faa5baa155693be978c446c5d44a3
+SHA256 (NVIDIA-FreeBSD-x86-195.22.tar.gz) = 2299aeadeec81a1210d65529c17c2829fdc4d5586c46b1ae6f8b20089a2122e8
+SIZE (NVIDIA-FreeBSD-x86-195.22.tar.gz) = 24784839
+MD5 (NVIDIA-FreeBSD-x86_64-195.22.tar.gz) = c9b0cdeb68d573556a38e16c02ffed55
+SHA256 (NVIDIA-FreeBSD-x86_64-195.22.tar.gz) = 3a6a0fc3003615c07090c04f2d5b41fa86cf8493309bf48eff8bcaa37126508c
+SIZE (NVIDIA-FreeBSD-x86_64-195.22.tar.gz) = 25503618
 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
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index ea374077f974..a3a9990c4a0e 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -18,14 +18,15 @@ lib/libGLcore.so.1
 lib/libGLcore.so
 lib/libvdpau.so.1
 lib/libvdpau.so
-lib/libvdpau_nvidia.so.1
+lib/vdpau/libvdpau_nvidia.so.1
 lib/libvdpau_nvidia.so
-lib/libvdpau_trace.so.1
+lib/vdpau/libvdpau_trace.so.1
 lib/libvdpau_trace.so
 lib/libXvMCNVIDIA.so.1
 lib/libXvMCNVIDIA.so
 lib/libXvMCNVIDIA.a
 lib/libXvMCNVIDIA_dynamic.so.1
+@dirrm lib/vdpau
 %%MODULESDIR%%/libnvidia-wfb.so.1
 %%MODULESDIR%%/drivers/nvidia_drv.so
 %%MODULESDIR%%/extensions/libglx.so.1
@@ -44,9 +45,12 @@ nvidia.ko
 %%LINUX%%usr/lib/libnvidia-tls.so.1
 %%LINUX%%usr/lib/libvdpau.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libvdpau.so.1
-%%LINUX%%usr/lib/libvdpau_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libvdpau_nvidia.so
-%%LINUX%%usr/lib/libvdpau_trace.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libvdpau_trace.so
+%%LINUX%%usr/lib/vdpau/libvdpau_nvidia.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/vdpau/libvdpau_nvidia.so.1
+%%LINUX%%usr/lib/vdpau/libvdpau_trace.so.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/vdpau/libvdpau_trace.so.1
+%%LINUX%%@dirrm usr/lib/vdpau
 %%LINUX%%@exec %D/sbin/ldconfig -r %D
 %%LINUX%%@unexec %D/sbin/ldconfig -r %D