[Midnightbsd-cvs] mports [20983] trunk/x11/nvidia-driver: update nvidia graphics driver

[laffer1 at midnightbsd.org]

Revision: 20983
          http://svnweb.midnightbsd.org/mports/?rev=20983
Author:   laffer1
Date:     2016-02-03 19:02:12 -0500 (Wed, 03 Feb 2016)
Log Message:
-----------
update nvidia graphics driver

Modified Paths:
--------------
    trunk/x11/nvidia-driver/Makefile
    trunk/x11/nvidia-driver/distinfo

Modified: trunk/x11/nvidia-driver/Makefile
===================================================================
--- trunk/x11/nvidia-driver/Makefile	2016-02-03 23:50:43 UTC (rev 20982)
+++ trunk/x11/nvidia-driver/Makefile	2016-02-04 00:02:12 UTC (rev 20983)
@@ -1,9 +1,9 @@
 # $MidnightBSD$
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	346.47
+DISTVERSION?=	346.96
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
 # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
@@ -129,7 +129,7 @@
 # We should support -CURRENT: kill the check
 	${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/nv-freebsd.h
 # Adjust legacy drivers for updated d_mmap() since FreeBSD src SVN r201223
-.if ${OSVERSION} > 4015 && ${NVVERSION} < 195.022
+.if ${NVVERSION} < 195.022
 	${REINPLACE_CMD} -e 's/vm_offset_t offset/vm_ooffset_t offset/ ; \
 		s/vm_offset_t \*address/vm_paddr_t *address/ ; \
 		s/int nprot/&, vm_memattr_t *memattr/' \
@@ -139,13 +139,13 @@
 # around vm_page_(un)wire() after FreeBSD src SVN r207410, r207617, and
 # r207644; also remove page queue locking around vm_page_wakeup() after
 # FreeBSD src SVN r163622
-.if ${OSVERSION} > 4014 && ${NVVERSION} < 304.064
+.if ${NVVERSION} < 304.064
 	${REINPLACE_CMD} -E '/vm_page_(un)?lock_queues\(\);/d ; \
 		s/(vm_page_(un)?wire\()([^,]+)(, 0)?(\);)/vm_page_lock(\3); & vm_page_unlock(\3);/' \
 			${WRKSRC}/src/nvidia_subr.c
 .endif
 # Catch up legacy drivers with FreeBSD src SVN r225617
-.if ${OSVERSION} > 4015 && ${NVVERSION} < 195.022
+.if ${NVVERSION} < 195.022
 	${REINPLACE_CMD} -e '/return/s/ioctl/sys_&/' \
 		${WRKSRC}/src/nvidia_linux.c
 .endif
@@ -277,6 +277,8 @@
 .endif
 .if ${NVVERSION} < 180.029
 	${REINPLACE_CMD} -e '/vdpau/d' ${TMPPLIST}
+.elif ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019
+	${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 185.01829
 	${REINPLACE_CMD} -e '/libcuda/d' ${TMPPLIST}

Modified: trunk/x11/nvidia-driver/distinfo
===================================================================
--- trunk/x11/nvidia-driver/distinfo	2016-02-03 23:50:43 UTC (rev 20982)
+++ trunk/x11/nvidia-driver/distinfo	2016-02-04 00:02:12 UTC (rev 20983)
@@ -1,14 +1,14 @@
-SHA256 (NVIDIA-FreeBSD-x86_64-346.47.tar.gz) = 663d7cb9570d594e7b49ec7560cdc86e80bf4fdba97580406a28286d031fe3f9
-SIZE (NVIDIA-FreeBSD-x86_64-346.47.tar.gz) = 58745451
-SHA256 (NVIDIA-FreeBSD-x86-346.47.tar.gz) = f72639ef6474c9e0127a7ea85b54192353e49a5993f256b7e360b38e25ca5016
-SIZE (NVIDIA-FreeBSD-x86-346.47.tar.gz) = 57996755
-SHA256 (NVIDIA-FreeBSD-x86_64-340.76.tar.gz) = 60037d035b9af9f1d4dcdd5033e1b28b0cd4c7ca94f6bcb8d267e037a930fdc0
-SIZE (NVIDIA-FreeBSD-x86_64-340.76.tar.gz) = 60206978
-SHA256 (NVIDIA-FreeBSD-x86-340.76.tar.gz) = 0abbcc3bed3f017e7f1887a5c2d014e2b5a020462071998986ed49cdb8e7119f
-SIZE (NVIDIA-FreeBSD-x86-340.76.tar.gz) = 59362290
-SHA256 (NVIDIA-FreeBSD-x86_64-304.125.tar.gz) = 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d
-SIZE (NVIDIA-FreeBSD-x86_64-304.125.tar.gz) = 35498616
-SHA256 (NVIDIA-FreeBSD-x86-304.125.tar.gz) = 806d0bff9d394390b3a257472bc342857f150e9dba6673e6b930f47a93ec0269
-SIZE (NVIDIA-FreeBSD-x86-304.125.tar.gz) = 34494889
+SHA256 (NVIDIA-FreeBSD-x86_64-346.96.tar.gz) = 89daaff29afe92d825ec8c00149a703b4eb234e4f16bbfb98673f077521bcff9
+SIZE (NVIDIA-FreeBSD-x86_64-346.96.tar.gz) = 58774970
+SHA256 (NVIDIA-FreeBSD-x86-346.96.tar.gz) = a27d7b79c053702bf6524b2c4725321fa557be18a585735e0b8122d884348c3e
+SIZE (NVIDIA-FreeBSD-x86-346.96.tar.gz) = 58010757
+SHA256 (NVIDIA-FreeBSD-x86_64-340.93.tar.gz) = 07208f6a832c2da8748b1c4f8b5ce42a7b617f2ee1ac59155fecaff952c30988
+SIZE (NVIDIA-FreeBSD-x86_64-340.93.tar.gz) = 60215584
+SHA256 (NVIDIA-FreeBSD-x86-340.93.tar.gz) = 094dc6df60b8e57cf9b94d982cb29c32d5e0c1d81796dbadb39145e78a3b0086
+SIZE (NVIDIA-FreeBSD-x86-340.93.tar.gz) = 59385673
+SHA256 (NVIDIA-FreeBSD-x86_64-304.128.tar.gz) = ee38635fb02eb598dd0cdfdbc9014096774104d75ba42fee7688126e531fed8f
+SIZE (NVIDIA-FreeBSD-x86_64-304.128.tar.gz) = 35481444
+SHA256 (NVIDIA-FreeBSD-x86-304.128.tar.gz) = c26d0ce5bda8965b37a8b8f91e8580f98b740e16dd21f3aaf7fb6bc84d3dd363
+SIZE (NVIDIA-FreeBSD-x86-304.128.tar.gz) = 34479549
 SHA256 (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b
 SIZE (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 20038266