From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 9 10:50:01 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CCB3716A41B for ; Sun, 9 Dec 2007 10:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AC79E13C465 for ; Sun, 9 Dec 2007 10:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id lB9Ao1mv072471 for ; Sun, 9 Dec 2007 10:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id lB9Ao1bO072470; Sun, 9 Dec 2007 10:50:01 GMT (envelope-from gnats) Resent-Date: Sun, 9 Dec 2007 10:50:01 GMT Resent-Message-Id: <200712091050.lB9Ao1bO072470@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Armin Pirkovitsch Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 450EB16A417 for ; Sun, 9 Dec 2007 10:45:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 3530D13C461 for ; Sun, 9 Dec 2007 10:45:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id lB9AjJba081787 for ; Sun, 9 Dec 2007 10:45:19 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id lB9AjJOZ081786; Sun, 9 Dec 2007 10:45:19 GMT (envelope-from nobody) Message-Id: <200712091045.lB9AjJOZ081786@www.freebsd.org> Date: Sun, 9 Dec 2007 10:45:19 GMT From: Armin Pirkovitsch To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/118506: nvidia-driver broken due to structure change of agp driver in sys X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 10:50:01 -0000 >Number: 118506 >Category: ports >Synopsis: nvidia-driver broken due to structure change of agp driver in sys >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Dec 09 10:50:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Armin Pirkovitsch >Release: 8.0 CURRENT >Organization: >Environment: FreeBSD oh-sub2.local 8.0-CURRENT FreeBSD 8.0-CURRENT #4: Sun Dec 9 10:45:08 CET 2007 sperber@oh-sub2.local:/usr/obj/usr/src/sys/OH-SUB2 i386 >Description: Due to jhb's commit on the 2007-11-12, 21:51:38 UTC agpvar.h has to be included from a diffrent place. (version bumped to 800004) Furthermore sys/priv.h has to be included to provide the driver with the suser function (I haven't found out which change in the repo caused that problem) >How-To-Repeat: Try to compile nvidia-driver on FreeBSD >= 800004 >Fix: Patch attached with submission follows: --- src/nv-freebsd.h.orig 2007-09-18 23:28:13.000000000 +0200 +++ src/nv-freebsd.h 2007-12-09 11:29:57.000000000 +0100 @@ -21,12 +21,6 @@ #include -#if __FreeBSD_version >= 700000 -#error This driver does not support FreeBSD 7.x/-CURRENT! -#endif -#if __FreeBSD_version >= 600000 && __FreeBSD_version < 600034 -#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 @@ -75,7 +69,11 @@ #include #include +#if __FreeBSD_version >= 800004 +#include +#else #include +#endif #include #if defined(NVCPU_X86_64) @@ -97,6 +95,8 @@ #include #include +#include + #if defined(NVCPU_X86) && defined(PAE) #error This driver does not support PAE enabled kernels! #endif @@ -228,7 +228,9 @@ } nvidia_softc_t; +#if __FreeBSD_version < 502103 #define CDEV_MAJOR 180 +#endif #define CDEV_CTL_MINOR 255 extern devclass_t nvidia_devclass; >Release-Note: >Audit-Trail: >Unformatted: