ports/84481: [fix] nvidia-driver on 6.x
Andrej Zverev
az at inec.ru
Tue Aug 2 13:40:24 UTC 2005
>Number: 84481
>Category: ports
>Synopsis: [fix] nvidia-driver on 6.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 02 13:40:21 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Andrej Zverev
>Release: FreeBSD 5.4-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD az.inec.ru 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #2: Wed Jul 6 12:10:32 MSD 2005 root at az.inec.ru:/usr/obj/usr/src/sys/GENERIC i386
>Description:
I wrote about it danfe@ but seems he on vacation.
Since >= 6.x don't have <machine/bus_memio.h> (it can be
present if you upgraded from 5.x) buld fail.
Fix it and close PR: 84473 too.
>How-To-Repeat:
>Fix:
--- nvidia-driver.diff begins here ---
diff -Nru nvidia-driver.orig/files/patch-src::nv-freebsd.h nvidia-driver/files/patch-src::nv-freebsd.h
--- nvidia-driver.orig/files/patch-src::nv-freebsd.h Wed Feb 25 16:05:12 2004
+++ nvidia-driver/files/patch-src::nv-freebsd.h Tue Aug 2 16:39:25 2005
@@ -1,6 +1,36 @@
---- src/nv-freebsd.h.orig Wed Feb 25 18:55:35 2004
-+++ src/nv-freebsd.h Wed Feb 25 18:55:49 2004
-@@ -217,7 +217,9 @@
+--- src/nv-freebsd.h.orig Fri Jun 17 18:44:23 2005
++++ src/nv-freebsd.h Tue Aug 2 16:38:36 2005
+@@ -21,9 +21,6 @@
+
+ #include <sys/param.h>
+
+-#if __FreeBSD_version > 600000
+-#error This driver does not support FreeBSD 6.x/-CURRENT!
+-#endif
+ #if __FreeBSD_version < 503000
+ #error This driver requires FreeBSD 5.3 or later!
+ #endif
+@@ -46,8 +43,9 @@
+ #include <machine/clock.h>
+ #include <machine/stdarg.h>
+ #include <machine/bus.h>
++#if __FreeBSD_version < 600000
+ #include <machine/bus_memio.h>
+-
++#endif
+ #include <sys/conf.h>
+ #include <sys/rman.h>
+ #include <sys/proc.h>
+@@ -190,7 +188,7 @@
+ * thus disabled by default (this is 5.x/-CURRENT only).
+ */
+
+-#undef NV_SUPPORT_ACPI_PM
++#define NV_SUPPORT_ACPI_PM
+
+
+ /*
+@@ -270,7 +268,9 @@
} nvidia_softc_t;
--- nvidia-driver.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list