Author: arekm Date: Sun Mar 7 18:19:48 2010 GMT Module: packages Tag: HEAD ---- Log message: - 2.6.33 fix
---- Files affected: packages/xorg-driver-video-nvidia: xorg-driver-video-nvidia.spec (1.251 -> 1.252) , xorg-driver-video-nvidia-kernel.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec diff -u packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.251 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.252 --- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.251 Tue Feb 16 18:06:33 2010 +++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec Sun Mar 7 19:19:43 2010 @@ -44,6 +44,7 @@ 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} @@ -230,6 +231,7 @@ %endif %patch0 -p1 %patch1 -p1 +%patch2 -p0 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild %build @@ -450,6 +452,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.252 2010/03/07 18:19:43 arekm +- 2.6.33 fix + Revision 1.251 2010/02/16 17:06:33 baggins - rel 5 - reveted glen's "reorganization in prep", it caused the installation ================================================================ Index: packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia-kernel.patch diff -u /dev/null packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia-kernel.patch:1.1 --- /dev/null Sun Mar 7 19:19:48 2010 +++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia-kernel.patch Sun Mar 7 19:19:43 2010 @@ -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; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec?r1=1.251&r2=1.252&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
