aboutsummaryrefslogtreecommitdiffstats
path: root/x11/nvidia-driver
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2011-10-11 22:59:02 +0800
committerdanfe <danfe@FreeBSD.org>2011-10-11 22:59:02 +0800
commitc3ecbcbef4ec614706fd21bdb645f38a4974674a (patch)
treeb5f3081fc3fe30d38fe54f4151a7906094169a61 /x11/nvidia-driver
parent65b9eaca67ae07d5fc8bdd8834a805674ab321e2 (diff)
downloadfreebsd-ports-gnome-c3ecbcbef4ec614706fd21bdb645f38a4974674a.tar.gz
freebsd-ports-gnome-c3ecbcbef4ec614706fd21bdb645f38a4974674a.tar.zst
freebsd-ports-gnome-c3ecbcbef4ec614706fd21bdb645f38a4974674a.zip
Update to version 285.05.09, which should remedy system hangs people were
reporting with 280.13.
Diffstat (limited to 'x11/nvidia-driver')
-rw-r--r--x11/nvidia-driver/Makefile18
-rw-r--r--x11/nvidia-driver/distinfo8
2 files changed, 7 insertions, 19 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 7755fa759d47..837b58da0320 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= nvidia-driver
-DISTVERSION?= 280.13
+DISTVERSION?= 285.05.09
PORTREVISION?= 0 # As a reminder it can be overridden
CATEGORIES= x11 kld
MASTER_SITES= ${MASTER_SITE_NVIDIA}
@@ -28,7 +28,8 @@ USE_LDCONFIG= yes
# NVIDIA_ROOT is not set in src/Makefile, which results in bogus -I/src
# passed to compiler and broken build on HEAD since r221320 when option
# -Wmissing-include-dirs was added for kernel sources. Until properly
-# fixed upstream, use this hack below to universally set NVIDIA_ROOT.
+# fixed upstream across all versions (including legacy ones), use this
+# hack below to universally set NVIDIA_ROOT.
MAKE_ENV= NVIDIA_ROOT=${WRKSRC}
SUB_FILES= pkg-message
DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
@@ -102,19 +103,6 @@ post-patch: .SILENT
s/int nprot/&, vm_memattr_t *memattr/' \
${WRKSRC}/src/nvidia_dev.c
.endif
-# Fix the build against Clang (also GCC with -Wformat-security)
-.if ${NVVERSION} >= 2704106
- ${REINPLACE_CMD} -E \
- 's/(^ +)snprintf(\(.+)(, .+)(, .+)\)/\1strlcpy\2\4\3)/' \
- ${WRKSRC}/src/nvidia_os.c
-.endif
-# Fix an apparent typo (present in several versions since 260.19.12)
- ${REINPLACE_CMD} -e 's/status != status/status != RM_OK/' \
- ${WRKSRC}/src/nvidia_os.c
-# Fix the build after fget(9) KPI was changed in r224778
-.if ${OSVERSION} > 900040 && ${NVVERSION} >= 1952200
- ${REINPLACE_CMD} -e '/fget/s/&fp/0, &/' ${WRKSRC}/src/nvidia_linux.c
-.endif
.if defined(WITH_FREEBSD_AGP)
${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
${WRKSRC}/src/nv-freebsd.h
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index f23c04b7f79e..196f2d9455c2 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,7 +1,7 @@
-SHA256 (NVIDIA-FreeBSD-x86_64-280.13.tar.gz) = 7783d5edcc06b4ebfb8d07c1ce451dff713a32a1b28e1e1fabaca7c75d9addf4
-SIZE (NVIDIA-FreeBSD-x86_64-280.13.tar.gz) = 30310021
-SHA256 (NVIDIA-FreeBSD-x86-280.13.tar.gz) = 2ad1882467a2d8a0b65dfa15e710e4938786e51f688e1d02d4d3343868b9239e
-SIZE (NVIDIA-FreeBSD-x86-280.13.tar.gz) = 29589886
+SHA256 (NVIDIA-FreeBSD-x86_64-285.05.09.tar.gz) = 757db4e25168a21419e33e1a9f0a3bb4bfbdad4ba79313bee90869903c96a336
+SIZE (NVIDIA-FreeBSD-x86_64-285.05.09.tar.gz) = 31650196
+SHA256 (NVIDIA-FreeBSD-x86-285.05.09.tar.gz) = d3ad51145cd57c70678ee659112a0973187b1b02e3062addadd0fe094b3c46fb
+SIZE (NVIDIA-FreeBSD-x86-285.05.09.tar.gz) = 30697710
SHA256 (NVIDIA-FreeBSD-x86-173.14.31.tar.gz) = 98699bc8dc1dad86cebc2ed067b4fc5cd37b8540e897bb218f38ac80c4b4d875
SIZE (NVIDIA-FreeBSD-x86-173.14.31.tar.gz) = 17991684
SHA256 (NVIDIA-FreeBSD-x86-96.43.20.tar.gz) = e75fce272e72644d53e6ad3c0957fe173735a4b621726ce227ba8ecf9bd9c5cf