ports/176146: [PATCH] x11/nvidia-driver: fix the build after linux header changes in -CURRENT

[b.f.]

>Number:         176146
>Category:       ports
>Synopsis:       [PATCH] x11/nvidia-driver: fix the build after linux header changes in -CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 14 14:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     b.f.
>Release:        10.0-CURRENT amd64
>Organization:
-
>Environment:
>Description:
Some of the linux headers were refactored recently in -CURRENT:

http://svnweb.freebsd.org/changeset/base/246085

In particular, some of the linux ioctl functions were moved to a machine-independent header.  Include this header to fix the driver when built WITH_LINUX.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 312212)
+++ Makefile	(working copy)
@@ -88,6 +88,9 @@
 CONFLICTS=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
 USE_LINUX=	yes
 PLIST_SUB+=	LINUX=""
+.if ${OSVERSION} > 1000026
+EXTRA_PATCHES+=	${FILESDIR}/r246085-patch-src__nvidia_linux.c
+.endif
 .else
 PLIST_SUB+=	LINUX="@comment "
 # Propagate WITHOUT_LINUX variable down to inner Makefiles
Index: files/r246085-patch-src__nvidia_linux.c
===================================================================
--- files/r246085-patch-src__nvidia_linux.c	(revision 0)
+++ files/r246085-patch-src__nvidia_linux.c	(working copy)
@@ -0,0 +1,14 @@
+--- src/nvidia_linux.c.orig	2012-10-30 13:54:06.000000000 -0400
++++ src/nvidia_linux.c	2013-02-13 19:48:17.000000000 -0500
+@@ -21,9 +21,11 @@
+ #if defined(NVCPU_X86)
+ #include "machine/../linux/linux.h"
+ #include "machine/../linux/linux_proto.h"
++#include "machine/../../compat/linux/linux_ioctl.h"
+ #elif defined(NVCPU_X86_64)
+ #include "machine/../linux32/linux.h"
+ #include "machine/../linux32/linux32_proto.h"
++#include "machine/../../compat/linux/linux_ioctl.h"
+ #endif
+ 
+ int linux_ioctl_nvidia(d_thread_t *, struct linux_ioctl_args *);


>Release-Note:
>Audit-Trail:
>Unformatted: