From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sun, 7 Mar 2010 18:19:43 +0000 (+0000)
Subject: - 2.6.33 fix
X-Git-Tag: auto/th/xorg-driver-video-nvidia-190_53-6~1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=commitdiff_plain;h=e967396c51a7e2a53b2d951b7375d762148de3f2

- 2.6.33 fix

Changed files:
    xorg-driver-video-nvidia-kernel.patch -> 1.1
    xorg-driver-video-nvidia.spec -> 1.252
---

diff --git a/xorg-driver-video-nvidia-kernel.patch b/xorg-driver-video-nvidia-kernel.patch
new file mode 100644
index 0000000..7952e2e
--- /dev/null
+++ b/xorg-driver-video-nvidia-kernel.patch
@@ -0,0 +1,33 @@
+Index: usr/src/nv/conftest.sh
+===================================================================
+--- usr/src/nv/conftest.sh
++++ usr/src/nv/conftest.sh	2009-12-20 04:15:47.194130196 +0200
+@@ -111,7 +111,12 @@
+     fi
+ }
+ 
+-CONFTEST_PREAMBLE="#include <linux/autoconf.h>
++CONFTEST_PREAMBLE="#include <linux/version.h>
++    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++    #include <generated/autoconf.h>
++    #else
++    #include <linux/autoconf.h>
++    #endif
+     #if defined(CONFIG_XEN) && \
+         defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
+     #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
+Index: usr/src/nv/nvacpi.c
+===================================================================
+--- usr/src/nv/nvacpi.c
++++ usr/src/nv/nvacpi.c	2009-12-20 03:48:28.497758783 +0200
+@@ -49,6 +49,10 @@
+ };
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
++#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
++#endif
++
+ static struct acpi_driver *nv_acpi_driver;
+ static acpi_handle nvif_handle = NULL;
+ static acpi_handle dsm_handle  = NULL;
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 8680bfb..e672d6b 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -43,6 +43,7 @@ Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
+Patch2:		xorg-driver-video-nvidia-kernel.patch
 URL:		http://www.nvidia.com/object/unix.html
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -229,6 +230,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
 
 %build