svn commit: r372198 - in head/x11: nvidia-driver nvidia-driver-304

[Alexey Dokuchaev]

Author: danfe
Date: Wed Nov  5 17:00:29 2014
New Revision: 372198
URL: https://svnweb.freebsd.org/changeset/ports/372198
QAT: https://qat.redports.org/buildarchive/r372198/

Log:
  Update two most recent branches of nVidia drivers to versions 340.46
  and 304.123.

Modified:
  head/x11/nvidia-driver-304/Makefile
  head/x11/nvidia-driver/Makefile
  head/x11/nvidia-driver/distinfo

Modified: head/x11/nvidia-driver-304/Makefile
==============================================================================
--- head/x11/nvidia-driver-304/Makefile	Wed Nov  5 16:08:41 2014	(r372197)
+++ head/x11/nvidia-driver-304/Makefile	Wed Nov  5 17:00:29 2014	(r372198)
@@ -1,9 +1,9 @@
 # Created by: Alexey Dokuchaev <danfe at FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION=	304.88
+DISTVERSION=	304.123
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	2
+PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-304

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Wed Nov  5 16:08:41 2014	(r372197)
+++ head/x11/nvidia-driver/Makefile	Wed Nov  5 17:00:29 2014	(r372198)
@@ -11,9 +11,9 @@
 # or `x11/nvidia-driver-304' slave ports.
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	331.67
+DISTVERSION?=	340.46
 # 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
@@ -187,12 +187,18 @@ post-patch: .SILENT
 			${WRKSRC}/src/nvidia_linux.c
 .endif
 # Argument count of vm_map_find() changed in FreeBSD src SVN r255426
-.if ${OSVERSION} > 1000054 && ${NVVERSION} < 331.067
+.if ${OSVERSION} > 1000054 && ${NVVERSION} < 304.123 # < 331.067
 	${REINPLACE_CMD} -e 's/virtual_address, size,/& 0,/' \
 		${WRKSRC}/src/nvidia_subr.c
 .endif
+# Fix CTLFLAG_* values for SYSCTL_ADD_PROC() after FreeBSD src SVN r273377
+.if ${OSVERSION} > 1100039 || ${OSVERSION} > 1001501 && ${OSVERSION} < 1100000
+	${REINPLACE_CMD} -e '/SYSCTL_ADD_PROC/,/;/ \
+		s/^[[:blank:]]*CTLFLAG_RD/CTLTYPE_STRING |&/' \
+			${WRKSRC}/src/nvidia_sysctl.c
+.endif
 # Fix stack buffer overflow in nvidia_sysctl_bus_type()
-.if ${NVVERSION} < 319.023
+.if ${NVVERSION} < 304.123 # < 319.023
 	${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \
 		s/sprintf\(bus_type, (".+")/return SYSCTL_OUT(req, \1, sizeof(\1)/ ; \
 		/return SYSCTL_OUT\(req, bus_type/d' \
@@ -255,6 +261,13 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \
 		${WRKSRC}/lib/Makefile ${WRKSRC}/src/Makefile
+# /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we
+# won't adhere to this stupidity and install nvidia-application-profiles-*
+# files as part of documentation
+.if ${NVVERSION} >= 334.016
+	${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \
+		${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
+.endif
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \
@@ -286,7 +299,7 @@ post-install: .SILENT
 	${LN} -sf libXvMCNVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 .endif
-.if ${NVVERSION} < 331.013 || ${ARCH} == amd64
+.if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016
 	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \
 		${TMPPLIST}
 .endif

Modified: head/x11/nvidia-driver/distinfo
==============================================================================
--- head/x11/nvidia-driver/distinfo	Wed Nov  5 16:08:41 2014	(r372197)
+++ head/x11/nvidia-driver/distinfo	Wed Nov  5 17:00:29 2014	(r372198)
@@ -1,9 +1,9 @@
-SHA256 (NVIDIA-FreeBSD-x86_64-331.67.tar.gz) = 5781bba8b7783f96c1f239961140317426910633fbfa3ba80fdcefe54aec7e92
-SIZE (NVIDIA-FreeBSD-x86_64-331.67.tar.gz) = 46997728
-SHA256 (NVIDIA-FreeBSD-x86-331.67.tar.gz) = 0c88c363db516ef09b0027aacb1e686191d3d4676f44445bab2156c2197a6cae
-SIZE (NVIDIA-FreeBSD-x86-331.67.tar.gz) = 55876749
-SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
-SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
+SHA256 (NVIDIA-FreeBSD-x86_64-340.46.tar.gz) = 699a65b5184f8705ba4ddbefb5776136bec98619ea00af3304725e5e028b7346
+SIZE (NVIDIA-FreeBSD-x86_64-340.46.tar.gz) = 59835566
+SHA256 (NVIDIA-FreeBSD-x86-340.46.tar.gz) = 5aa4ec5f9ca4425cd3fdc47ac19c76900cecae8a9606632a8063514481363571
+SIZE (NVIDIA-FreeBSD-x86-340.46.tar.gz) = 59013852
+SHA256 (NVIDIA-FreeBSD-x86_64-304.123.tar.gz) = 32ea8ce22b4fe50f59782c390b8ec1d90bb44e02787255476f0304c60f11e877
+SIZE (NVIDIA-FreeBSD-x86_64-304.123.tar.gz) = 35144064
 SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d
 SIZE (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 33651825
 SHA256 (NVIDIA-FreeBSD-x86-173.14.35.tar.gz) = 51e82a12db81b5af4ae5ee59612875c0dbef52cb641d61a44c72f2e1cd7f4c78