Date: Sun, 25 Jan 2004 11:00:39 +0600 (NOVT) From: Alexey Dokuchaev <danfe@regency.nsu.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61867: PORT UPDATE: x11/nvidia-driver Message-ID: <200401250500.i0P50dkU078603@regency.nsu.ru> Resent-Message-ID: <200401250500.i0P50Uhm000394@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61867
>Category: ports
>Synopsis: PORT UPDATE: x11/nvidia-driver
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 24 21:00:30 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Alexey Dokuchaev
>Release: FreeBSD 4.9-RC i386
>Organization:
CNIT NSU
>Environment:
System: FreeBSD styx.weblab.nsu.ru 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Fri Jan 23 17:10:41 NOVT 2004 root@styx.weblab.nsu.ru:/usr/obj/usr/src/sys/STYX i386
>Description:
This is long-awaited update of x11/nvidia-driver port. It features two
things:
- handles the rename of PCIR_HEADERTYPE -> PCIR_HDRTYPE #define [1]
- nvidia.ko is now installed under /boot/modules rather than
/boot/kernel on 5.x [2]
Reminded by: many [1]
OSVERSION suggested by: petef [1]
Pointed out by: Rick C. Petty <rick@megan.kiwi-computer.com> [2]
Also, rename patch-nvidia_pci.c to patch-src::nvidia_pci.c to better
representation of patched file path.
PORTREVISION bump is probably not necessary for this update (since it does
not really change anything for people who have this port installed, modulus
nvidia.ko location).
>How-To-Repeat:
N/A
>Fix:
%%%
diff -Naur /usr/ports/x11/nvidia-driver/Makefile nvidia-driver/Makefile
--- /usr/ports/x11/nvidia-driver/Makefile Thu Jan 22 21:52:56 2004
+++ nvidia-driver/Makefile Sun Jan 25 11:24:42 2004
@@ -59,7 +59,7 @@
@${ECHO_MSG} "Define WITH_NVIDIA_HACKS to enable work-arounds to override basic AGP setup"
.endif
-.if defined(WITH_FREEBSD_AGP) || defined(FORCE_AGP_RATE) || defined(WITH_NVIDIA_HACKS)
+.if defined(WITH_FREEBSD_AGP) || defined(FORCE_AGP_RATE) || defined(WITH_NVIDIA_HACKS) || ${OSVERSION} > 501106
USE_REINPLACE= yes
post-patch:
@@ -72,6 +72,9 @@
. endif
. if defined(WITH_NVIDIA_HACKS)
@${REINPLACE_CMD} 's/NVreg_UpdateKernelAGP,[[:blank:]]*1/NVreg_UpdateKernelAGP, 0/' ${WRKSRC}/src/nvidia_os_registry.c
+. endif
+. if ${OSVERSION} > 501106
+ @${REINPLACE_CMD} 's/PCIR_HEADERTYPE/PCIR_HDRTYPE/' ${WRKSRC}/src/nvidia_sysctl.c
. endif
.endif
diff -Naur /usr/ports/x11/nvidia-driver/files/patch-module::Makefile nvidia-driver/files/patch-module::Makefile
--- /usr/ports/x11/nvidia-driver/files/patch-module::Makefile Thu Jan 1 07:00:00 1970
+++ nvidia-driver/files/patch-module::Makefile Sun Jan 25 11:51:25 2004
@@ -0,0 +1,11 @@
+--- module/Makefile.orig Wed May 28 23:51:52 2003
++++ module/Makefile Sun Jan 25 11:47:48 2004
+@@ -14,6 +14,8 @@
+ BUILD_DONE= ${.CURDIR}/.build_done
+ CLEANFILES+= ${BUILD_DONE}
+
++KMODDIR?= /boot/modules
++
+ #
+ # To enable debugging see nvidia_debug.h
+ # uncomment the following line and change the 'debug'
diff -Naur /usr/ports/x11/nvidia-driver/files/patch-nvidia_pci.c nvidia-driver/files/patch-nvidia_pci.c
--- /usr/ports/x11/nvidia-driver/files/patch-nvidia_pci.c Mon Dec 8 06:50:59 2003
+++ nvidia-driver/files/patch-nvidia_pci.c Thu Jan 1 07:00:00 1970
@@ -1,21 +0,0 @@
---- src/nvidia_pci.c.orig Thu May 29 02:51:52 2003
-+++ src/nvidia_pci.c Fri Oct 3 01:19:55 2003
-@@ -33,6 +33,18 @@
- if (vendor != NVIDIA_VENDORID || device < 0x0020)
- return ENXIO;
-
-+ /* Exclude nForce MCP devices from detection */
-+ if (device >= 0x01A4 && device <= 0x01ef)
-+ return ENXIO;
-+
-+ /* Exclude nForce2 MCP2 devices from detection */
-+ if (device >= 0x0060 && device <= 0x006e)
-+ return ENXIO;
-+
-+ /* Exclude nForce3 MCP3 devices from detection */
-+ if (device >= 0x00d4 && device <= 0x00da)
-+ return ENXIO;
-+
- if (rm_get_device_name(device, NV_DEVICE_NAME_LENGTH, name)
- != RM_OK) {
- strcpy(name, "Unknown");
diff -Naur /usr/ports/x11/nvidia-driver/files/patch-src::nvidia_pci.c nvidia-driver/files/patch-src::nvidia_pci.c
--- /usr/ports/x11/nvidia-driver/files/patch-src::nvidia_pci.c Thu Jan 1 07:00:00 1970
+++ nvidia-driver/files/patch-src::nvidia_pci.c Sun Jan 25 12:00:51 2004
@@ -0,0 +1,21 @@
+--- src/nvidia_pci.c.orig Thu May 29 02:51:52 2003
++++ src/nvidia_pci.c Fri Oct 3 01:19:55 2003
+@@ -33,6 +33,18 @@
+ if (vendor != NVIDIA_VENDORID || device < 0x0020)
+ return ENXIO;
+
++ /* Exclude nForce MCP devices from detection */
++ if (device >= 0x01A4 && device <= 0x01ef)
++ return ENXIO;
++
++ /* Exclude nForce2 MCP2 devices from detection */
++ if (device >= 0x0060 && device <= 0x006e)
++ return ENXIO;
++
++ /* Exclude nForce3 MCP3 devices from detection */
++ if (device >= 0x00d4 && device <= 0x00da)
++ return ENXIO;
++
+ if (rm_get_device_name(device, NV_DEVICE_NAME_LENGTH, name)
+ != RM_OK) {
+ strcpy(name, "Unknown");
diff -Naur /usr/ports/x11/nvidia-driver/pkg-plist nvidia-driver/pkg-plist
--- /usr/ports/x11/nvidia-driver/pkg-plist Sat Aug 23 11:54:12 2003
+++ nvidia-driver/pkg-plist Sun Jan 25 11:25:19 2004
@@ -28,7 +28,7 @@
share/doc/NVIDIA/XF86Config.sample
share/doc/NVIDIA/license.txt
%%FREEBSD4%%@cwd /modules
-%%FREEBSD5%%@cwd /boot/kernel
+%%FREEBSD5%%@cwd /boot/modules
nvidia.ko
%%FREEBSD4%%@cwd /dev
%%FREEBSD4%%MAKEDEV.nvidia
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401250500.i0P50dkU078603>