[Midnightbsd-cvs] mports [16378] trunk/x11/nvidia-driver: nvidia-driver 331.67
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 8 13:18:40 EDT 2014
Revision: 16378
http://svnweb.midnightbsd.org/mports/?rev=16378
Author: laffer1
Date: 2014-06-08 13:18:39 -0400 (Sun, 08 Jun 2014)
Log Message:
-----------
nvidia-driver 331.67
Modified Paths:
--------------
trunk/x11/nvidia-driver/Makefile
trunk/x11/nvidia-driver/distinfo
Added Paths:
-----------
trunk/x11/nvidia-driver/files/extra-patch-src-Makefile
trunk/x11/nvidia-driver/files/extra-patch-src-nv-freebsd.h
trunk/x11/nvidia-driver/files/extra-patch-src-nv-misc.h
Removed Paths:
-------------
trunk/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk
trunk/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c
Modified: trunk/x11/nvidia-driver/Makefile
===================================================================
--- trunk/x11/nvidia-driver/Makefile 2014-06-04 13:11:38 UTC (rev 16377)
+++ trunk/x11/nvidia-driver/Makefile 2014-06-08 17:18:39 UTC (rev 16378)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= nvidia-driver
-DISTVERSION?= 331.49
+DISTVERSION?= 331.67
# Always try to set PORTREVISION as it can be overridden by the slave ports
PORTREVISION?= 0
CATEGORIES= x11
@@ -14,6 +14,7 @@
LICENSE= nvidia
LICENSE_FILE= ${WRKSRC}/doc/license.txt
+LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
ARCH_SUFX= ${ARCH:S/i386//:S/amd/_/}
USES= kmod uidfix
@@ -57,6 +58,12 @@
EXTRA_PATCHES= ${FILESDIR}/extra-patch-mk-nvidia.lib.mk
.endif
+.if ${NVVERSION} >= 3048800
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-Makefile \
+ ${FILESDIR}/extra-patch-src-nv-freebsd.h \
+ ${FILESDIR}/extra-patch-src-nv-misc.h
+.endif
+
.if ${NVVERSION} >= 3312000
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11-driver-Makefile
.else
@@ -87,6 +94,11 @@
WBINVD_DESC= Flush CPU caches directly with WBINVD
.endif
+.if ${NVVERSION} >= 3048800
+OPTIONS_DEFINE_i386= PAE
+PAE_DESC= Physical Address Extensions Kernel
+.endif
+
PLIST_SUB+= LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
MODULESDIR=${MODULESDIR}
@@ -197,6 +209,10 @@
${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \
${WRKSRC}/src/nv-freebsd.h
.endif
+.if ${PORT_OPTIONS:MPAE}
+ ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_PAE)/define \1/' \
+ ${WRKSRC}/src/nv-freebsd.h
+.endif
.if ${PORT_OPTIONS:MWBINVD}
${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \
${WRKSRC}/src/nv-freebsd.h
Modified: trunk/x11/nvidia-driver/distinfo
===================================================================
--- trunk/x11/nvidia-driver/distinfo 2014-06-04 13:11:38 UTC (rev 16377)
+++ trunk/x11/nvidia-driver/distinfo 2014-06-08 17:18:39 UTC (rev 16378)
@@ -1,7 +1,7 @@
-SHA256 (NVIDIA-FreeBSD-x86_64-331.49.tar.gz) = 9ac938b54b85b4dd3fc22f10c6feee3d9c777d678dbc08dfa8214e7d917ae67d
-SIZE (NVIDIA-FreeBSD-x86_64-331.49.tar.gz) = 46988453
-SHA256 (NVIDIA-FreeBSD-x86-331.49.tar.gz) = 0686d20e647553f81afebc646b135b780c510679715344547ecc9244aff18cca
-SIZE (NVIDIA-FreeBSD-x86-331.49.tar.gz) = 55867593
+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-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d
Added: trunk/x11/nvidia-driver/files/extra-patch-src-Makefile
===================================================================
--- trunk/x11/nvidia-driver/files/extra-patch-src-Makefile (rev 0)
+++ trunk/x11/nvidia-driver/files/extra-patch-src-Makefile 2014-06-08 17:18:39 UTC (rev 16378)
@@ -0,0 +1,18 @@
+--- src/Makefile.orig 2014-04-04 23:24:59.000000000 +0200
++++ src/Makefile 2014-05-06 14:31:07.000000000 +0200
+@@ -24,6 +24,15 @@
+ stdarg.h:
+ @ln -s machine/stdarg.h stdarg.h
+
++SRCS+= opt_global.h
++.if ${MACHINE_ARCH} == "i386" && !defined(KERNBUILDDIR)
++PAE!= sed -n '/define NV_SUPPORT_PAE/p' nv-freebsd.h
++.if !empty(PAE)
++opt_global.h:
++ echo "#define PAE 1" > ${.TARGET}
++.endif
++.endif
++
+ *.c: stdarg.h
+
+ beforeinstall: ${KMOD}.ko
Added: trunk/x11/nvidia-driver/files/extra-patch-src-nv-freebsd.h
===================================================================
--- trunk/x11/nvidia-driver/files/extra-patch-src-nv-freebsd.h (rev 0)
+++ trunk/x11/nvidia-driver/files/extra-patch-src-nv-freebsd.h 2014-06-08 17:18:39 UTC (rev 16378)
@@ -0,0 +1,14 @@
+--- src/nv-freebsd.h.orig 2014-02-13 05:07:44.000000000 +0100
++++ src/nv-freebsd.h 2014-05-05 18:38:59.000000000 +0200
+@@ -143,6 +143,11 @@
+ #define NV_SUPPORT_ACPI_PM
+
+ /*
++ * Enable/Disable support for PAE on i386.
++ */
++#undef NV_SUPPORT_PAE
++
++/*
+ * Enable/Disable heavy-weight cache-flush logic. By default, the driver
+ * relies on the kernel to perform cache flushes using optimized
+ * routines.
Added: trunk/x11/nvidia-driver/files/extra-patch-src-nv-misc.h
===================================================================
--- trunk/x11/nvidia-driver/files/extra-patch-src-nv-misc.h (rev 0)
+++ trunk/x11/nvidia-driver/files/extra-patch-src-nv-misc.h 2014-06-08 17:18:39 UTC (rev 16378)
@@ -0,0 +1,11 @@
+--- src/nv-misc.h.orig 2014-02-13 05:07:44.000000000 +0100
++++ src/nv-misc.h 2014-05-05 18:45:44.000000000 +0200
+@@ -11,6 +11,8 @@
+ #ifndef _NV_MISC_H_
+ #define _NV_MISC_H_
+
++#include "opt_global.h"
++
+ #include "nvtypes.h"
+ #include "rmretval.h"
+
Deleted: trunk/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk
===================================================================
--- trunk/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk 2014-06-04 13:11:38 UTC (rev 16377)
+++ trunk/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk 2014-06-08 17:18:39 UTC (rev 16378)
@@ -1,10 +0,0 @@
---- mk/nvidia.lib.mk.orig
-+++ mk/nvidia.lib.mk
-@@ -17,6 +17,7 @@
-
- install:
- .if defined(SHLIB_NAME)
-+ @mkdir -p ${DESTDIR}${LIBDIR}
- @rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME}
- @${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${NVIDIA_ROOT}/${OBJDIR}/${SHLIB_NAME} \
Deleted: trunk/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c
===================================================================
--- trunk/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c 2014-06-04 13:11:38 UTC (rev 16377)
+++ trunk/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c 2014-06-08 17:18:39 UTC (rev 16378)
@@ -1,14 +0,0 @@
---- src/nvidia_linux.c.orig 2012-10-30 13:54:06.000000000 -0400
-+++ src/nvidia_linux.c 2013-02-13 19:48:17.000000000 -0500
-@@ -21,9 +21,11 @@
- #if defined(NVCPU_X86)
- #include "machine/../linux/linux.h"
- #include "machine/../linux/linux_proto.h"
-+#include "machine/../../compat/linux/linux_ioctl.h"
- #elif defined(NVCPU_X86_64)
- #include "machine/../linux32/linux.h"
- #include "machine/../linux32/linux32_proto.h"
-+#include "machine/../../compat/linux/linux_ioctl.h"
- #endif
-
- int linux_ioctl_nvidia(d_thread_t *, struct linux_ioctl_args *);
More information about the Midnightbsd-cvs
mailing list