Date: Tue, 30 Aug 2016 16:51:21 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421123 - in head/x11: nvidia-driver nvidia-driver-304 nvidia-driver-340 nvidia-driver/files Message-ID: <201608301651.u7UGpLN7060280@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Aug 30 16:51:21 2016 New Revision: 421123 URL: https://svnweb.freebsd.org/changeset/ports/421123 Log: Fix damage done in r421117: UPDATING entries do not make good `pkg-message' files, especially when there already is existing `files/pkg-message.in'. Unfortunately, this now requires port revision bump in all three ports. Pointy hat to: cem Deleted: head/x11/nvidia-driver/pkg-message Modified: head/x11/nvidia-driver-304/Makefile head/x11/nvidia-driver-340/Makefile head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/files/pkg-message.in Modified: head/x11/nvidia-driver-304/Makefile ============================================================================== --- head/x11/nvidia-driver-304/Makefile Tue Aug 30 16:09:46 2016 (r421122) +++ head/x11/nvidia-driver-304/Makefile Tue Aug 30 16:51:21 2016 (r421123) @@ -3,7 +3,7 @@ DISTVERSION= 304.131 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -304 Modified: head/x11/nvidia-driver-340/Makefile ============================================================================== --- head/x11/nvidia-driver-340/Makefile Tue Aug 30 16:09:46 2016 (r421122) +++ head/x11/nvidia-driver-340/Makefile Tue Aug 30 16:51:21 2016 (r421123) @@ -3,7 +3,7 @@ DISTVERSION= 340.96 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -340 Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Tue Aug 30 16:09:46 2016 (r421122) +++ head/x11/nvidia-driver/Makefile Tue Aug 30 16:51:21 2016 (r421123) @@ -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?= 1 +PORTREVISION?= 2 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} @@ -241,9 +241,6 @@ post-install: .SILENT .endif .if ${NVVERSION} < 358.009 ${REINPLACE_CMD} '/nvidia-modeset.ko/d' ${TMPPLIST} -.else - ${REINPLACE_CMD} 's/nvidia$$/nvidia-modeset/ ; s/nvidia_/nvidia-modeset_/' \ - ${PKGMESSAGE} .endif .if ${NVVERSION} >= 361.028 ${REINPLACE_CMD} -E '/(EGL_nvidia\.so|GLESv[12](_CM)?(\.so\.[0-9]+\.[0-9]+))$$/d' \ Modified: head/x11/nvidia-driver/files/pkg-message.in ============================================================================== --- head/x11/nvidia-driver/files/pkg-message.in Tue Aug 30 16:09:46 2016 (r421122) +++ head/x11/nvidia-driver/files/pkg-message.in Tue Aug 30 16:51:21 2016 (r421123) @@ -1,11 +1,11 @@ To use these drivers, make sure that you have loaded the NVidia kernel module, by doing - # kldload nvidia + # kldload nvidia (or nvidia-modeset, see below) or adding - nvidia_load="YES" + nvidia_load="YES" (or nvidia-modeset_load="YES", see below) to your /boot/loader.conf. @@ -30,4 +30,14 @@ If X.org cannot start and reports in /var/log/Xorg.0.log while actually you have ``options SYSVSHM'' enabled in kernel, the sysctl ``kern.ipc.shmall'' should be increased. +Starting with version 358.09, some important functionality of the driver +has been broken out into a separate kernel module, nvidia-modeset.ko. +Users that experience a hang when starting X11 server, or observe + + (II) NVIDIA(0): Validated MetaModes: + (II) NVIDIA(0): "NULL" + +in /var/log/Xorg.0.log should replace `nvidia.ko' with `nvidia-modeset.ko' +in their /boot/loader.conf or /etc/rc.conf configuration files. + See %%DOCSDIR%%/README for more information.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608301651.u7UGpLN7060280>