From 538dc1b01b248997a8de00e641da14f1d36e2620 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Mon, 4 Jan 2010 16:08:32 +0100
Subject: [PATCH] xf86-video-nvidia: - add patches to build with linux-2.6.33+

---
 packages/linux/build                          |  1 +
 .../patches.upstream/autoconf-location.diff   | 47 +++++++++++++++++++
 ...drivers-190.42-r4-acpi_walk_namespace.diff | 17 +++++++
 packages/x11/driver/xf86-video-nvidia/unpack  |  7 +++
 4 files changed, 72 insertions(+)
 create mode 100644 packages/x11/driver/xf86-video-nvidia/patches.upstream/autoconf-location.diff
 create mode 100644 packages/x11/driver/xf86-video-nvidia/patches.upstream/nvidia-drivers-190.42-r4-acpi_walk_namespace.diff

diff --git a/packages/linux/build b/packages/linux/build
index 9ea4495569..5ef41aa679 100755
--- a/packages/linux/build
+++ b/packages/linux/build
@@ -23,3 +23,4 @@ rm -f modules/lib/modules/*/build
 rm -f modules/lib/modules/*/source
 
 make bzImage
+
diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/autoconf-location.diff b/packages/x11/driver/xf86-video-nvidia/patches.upstream/autoconf-location.diff
new file mode 100644
index 0000000000..3170060b2d
--- /dev/null
+++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/autoconf-location.diff
@@ -0,0 +1,47 @@
+diff -urN NVIDIA-Linux-x86_64-190.53-pkg2/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-190.53-pkg2.new/usr/src/nv/conftest.sh
+--- NVIDIA-Linux-x86_64-190.53-pkg2/usr/src/nv/conftest.sh	2009-12-09 18:41:17.000000000 -0600
++++ NVIDIA-Linux-x86_64-190.53-pkg2.new/usr/src/nv/conftest.sh	2009-12-22 04:37:34.000000000 -0600
+@@ -32,14 +32,14 @@
+     # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
+     # the kernel as a stand-alone kernel.
+     #
+-    FILE="linux/autoconf.h"
++    FILE="generated/autoconf.h"
+ 
+     if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
+         #
+         # We are looking at a configured source tree; verify
+         # that it's not a Xen kernel.
+         #
+-        echo "#include <linux/autoconf.h>
++        echo "#include <generated/autoconf.h>
+         #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
+         #error CONFIG_XEN defined!
+         #endif
+@@ -111,7 +111,7 @@
+     fi
+ }
+ 
+-CONFTEST_PREAMBLE="#include <linux/autoconf.h>
++CONFTEST_PREAMBLE="#include <generated/autoconf.h>
+     #if defined(CONFIG_XEN) && \
+         defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
+     #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
+@@ -1375,7 +1375,7 @@
+         #
+         RET=1
+         VERBOSE=$6
+-        FILE="linux/autoconf.h"
++        FILE="generated/autoconf.h"
+ 
+         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
+             #
+@@ -1429,7 +1429,7 @@
+         #
+         RET=1
+         VERBOSE=$6
+-        FILE="linux/autoconf.h"
++        FILE="generated/autoconf.h"
+ 
+         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
+             #
diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/nvidia-drivers-190.42-r4-acpi_walk_namespace.diff b/packages/x11/driver/xf86-video-nvidia/patches.upstream/nvidia-drivers-190.42-r4-acpi_walk_namespace.diff
new file mode 100644
index 0000000000..5fbeac5e92
--- /dev/null
+++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/nvidia-drivers-190.42-r4-acpi_walk_namespace.diff
@@ -0,0 +1,17 @@
+--- NVIDIA-Linux-x86_64-190.42-pkg2/usr/src/nv/nvacpi.c.orig	2009-12-14 02:52:35.000000000 +0100
++++ NVIDIA-Linux-x86_64-190.42-pkg2/usr/src/nv/nvacpi.c	2009-12-14 02:51:45.000000000 +0100
+@@ -507,8 +507,14 @@
+ 
+     *handlesPresent = 0;
+ 
++    #if ACPI_CA_VERSION < 0x20091112
+     acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, 
+                         ACPI_UINT32_MAX, nv_acpi_find_methods, NULL, NULL);
++    #else
++    acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, 
++                        ACPI_UINT32_MAX, nv_acpi_find_methods, NULL, NULL, NULL);
++    #endif
++
+ 
+     if (nvif_handle)
+     {
diff --git a/packages/x11/driver/xf86-video-nvidia/unpack b/packages/x11/driver/xf86-video-nvidia/unpack
index 51b870c57a..8839d94045 100755
--- a/packages/x11/driver/xf86-video-nvidia/unpack
+++ b/packages/x11/driver/xf86-video-nvidia/unpack
@@ -13,3 +13,10 @@ NV_PKG="`grep $NV_ARCH- $PKG_DIR/url | sed 's%.*/\(.*\)$%\1%'`"
 [ -d $BUILD/$1 ] && rm -rf $BUILD/$1
 
 sh $SOURCES/$1/$NV_PKG --extract-only --target $BUILD/$1
+
+echo "### Applying upstream patches ###"
+
+for patch in `ls $PKG_DIR/patches.upstream`; do
+  cat $PKG_DIR/patches.upstream/$patch | patch -d \
+    `echo $BUILD/$1 | cut -f1 -d\ ` -p1
+done