packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec, xorg-driver...

[baggins]

Author: baggins                      Date: Sat Jul 17 00:22:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for kernels 2.6.34+

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx.spec (1.170 -> 1.171) , fglrx-2.6.34-rc4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.170 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.171
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.170	Sat Jul 17 01:59:50 2010
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Sat Jul 17 02:22:30 2010
@@ -44,6 +44,7 @@
 Patch0:		%{pname}-kh.patch
 Patch1:		%{pname}-smp.patch
 Patch2:		%{pname}-x86genericarch.patch
+Patch3:		fglrx-2.6.34-rc4.patch
 URL:		http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_userspace:BuildRequires:	OpenGL-GLU-devel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -165,6 +166,7 @@
 %patch1 -p0
 %patch2 -p0
 %endif
+%patch3 -p2
 cd -
 
 install -d common%{_prefix}/{%{_lib},bin,sbin}
@@ -339,6 +341,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.171  2010/07/17 00:22:30  baggins
+- fix for kernels 2.6.34+
+
 Revision 1.170  2010/07/16 23:59:50  baggins
 - 10.6
 - looks working with xserver 1.8

================================================================
Index: packages/xorg-driver-video-fglrx/fglrx-2.6.34-rc4.patch
diff -u /dev/null packages/xorg-driver-video-fglrx/fglrx-2.6.34-rc4.patch:1.1
--- /dev/null	Sat Jul 17 02:22:35 2010
+++ packages/xorg-driver-video-fglrx/fglrx-2.6.34-rc4.patch	Sat Jul 17 02:22:30 2010
@@ -0,0 +1,10 @@
+--- xorg-driver-video-fglrx-10.6/common/lib/modules/fglrx/build_mod/kcl_wait.c.orig	2010-04-13 20:02:46.494496561 +0200
++++ xorg-driver-video-fglrx-10.6/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-13 19:52:00.054563389 +0200
+@@ -39,6 +39,7 @@
+ #include <linux/wait.h>
+ #include <linux/highmem.h>
+ #include <linux/sched.h>
++#include <linux/slab.h>
+
+ #include "kcl_config.h"
+ #include "kcl_wait.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.170&r2=1.171&f=u