aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcem <cem@FreeBSD.org>2016-08-30 23:19:57 +0800
committercem <cem@FreeBSD.org>2016-08-30 23:19:57 +0800
commit17fa06d5e95e1163efb55be71e52c902a239a26f (patch)
treed7bcb0d5c0dddb83d2403eacbfbb95b7bae91774
parent09a294312d60fbe0151cdc46a84fbe3fd8b7f9da (diff)
downloadfreebsd-ports-gnome-17fa06d5e95e1163efb55be71e52c902a239a26f.tar.gz
freebsd-ports-gnome-17fa06d5e95e1163efb55be71e52c902a239a26f.tar.zst
freebsd-ports-gnome-17fa06d5e95e1163efb55be71e52c902a239a26f.zip
nvidia-driver: Add a note about nvidia-modeset.ko for 367.35 update
Add a note in pkg-message and UPDATING. Correct a pkg-plist sorting mistake while here. Reviewed by: dhw, wblock Approved by: brd (previous version) Differential Revision: https://reviews.freebsd.org/D7700
-rw-r--r--UPDATING17
-rw-r--r--x11/nvidia-driver/Makefile2
-rw-r--r--x11/nvidia-driver/pkg-message12
-rw-r--r--x11/nvidia-driver/pkg-plist4
4 files changed, 32 insertions, 3 deletions
diff --git a/UPDATING b/UPDATING
index 833aaf4e4693..edeca27791ba 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,23 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20160829:
+ AFFECTS: users of x11/nvidia-driver
+ AUTHOR: cem@FreeBSD.org
+
+ The Nvidia driver has been updated to 367.35. In this version of the driver,
+ some important functionality has been broken out into a separate
+ nvidia-modeset.ko.
+
+ Users that experience a hang starting X or observe
+
+ [ 43.243] (II) NVIDIA(0): Validated MetaModes:
+ [ 43.243] (II) NVIDIA(0): "NULL"
+
+ in their Xorg.logs should replace 'nvidia.ko' with 'nvidia-modeset.ko' in
+ their loader.conf or rc.conf configurations. (nvidia-modeset.ko has a
+ MODULE_DEPENDS relationship to nvidia.ko and will bring it in automatically.)
+
+20160829:
AFFECTS: users of security/sshguard
AUTHOR: feld@FreeBSD.org
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 489c7cf023fe..6189b32c8a97 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -12,7 +12,7 @@
PORTNAME= nvidia-driver
DISTVERSION?= 367.35
# Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11
MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
diff --git a/x11/nvidia-driver/pkg-message b/x11/nvidia-driver/pkg-message
new file mode 100644
index 000000000000..bf8608d67aea
--- /dev/null
+++ b/x11/nvidia-driver/pkg-message
@@ -0,0 +1,12 @@
+The Nvidia driver has been updated to 367.35. In this version of the driver,
+some important functionality has been broken out into a separate
+nvidia-modeset.ko.
+
+Users that experience a hang starting X or observe
+
+ [ 43.243] (II) NVIDIA(0): Validated MetaModes:
+ [ 43.243] (II) NVIDIA(0): "NULL"
+
+in their Xorg.logs should replace 'nvidia.ko' with 'nvidia-modeset.ko' in their
+loader.conf or rc.conf configurations. (nvidia-modeset.ko has a MODULE_DEPENDS
+relationship to nvidia.ko and will bring it in automatically.)
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index a6256237682f..c4aa8e7cc7b1 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -36,10 +36,10 @@ man/man1/nvidia-smi.1.gz
%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.1
%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.%%SHLIB_VERSION%%
+%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
+%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so
%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.1
-%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so
-%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%%
%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so