diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2010-05-21 08:59:32 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2010-05-21 08:59:32 +0000 |
| commit | eed8ccb3f142663d23609516f6de99df05afcf38 (patch) | |
| tree | ab1e851d2733ad0427cec2482ae4c31a60506bf9 /x11-drivers | |
| parent | Improve native language support. (diff) | |
| download | gentoo-2-eed8ccb3f142663d23609516f6de99df05afcf38.tar.gz gentoo-2-eed8ccb3f142663d23609516f6de99df05afcf38.tar.bz2 gentoo-2-eed8ccb3f142663d23609516f6de99df05afcf38.zip | |
fix bug #317927
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-10.4.ebuild | 3 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch | 10 |
3 files changed, 18 insertions, 2 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index 0edb5319e839..a27f14a39b3c 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.213 2010/04/29 23:47:35 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.214 2010/05/21 08:59:31 lu_zero Exp $ + + 21 May 2010; Luca Barbato <lu_zero@gentoo.org> + +files/ati-drivers-2.6.34.patch, ati-drivers-10.4.ebuild: + Make it work with linux-2.6.34, patch from archlinux as stated in bug + #317927 thanks to Nawwar Kabbani <nawwar@nawwar.net> for reporting *ati-drivers-10.4 (29 Apr 2010) diff --git a/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild index a183f96024ce..e281aea3866c 100644 --- a/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild,v 1.1 2010/04/29 23:47:35 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild,v 1.2 2010/05/21 08:59:31 lu_zero Exp $ EAPI="2" @@ -233,6 +233,7 @@ src_prepare() { # 2.6.33 kernel support epatch "${FILESDIR}"/ati-drivers-2.6.33.patch + epatch "${FILESDIR}"/ati-drivers-2.6.34.patch # Fix a known compilation error epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch new file mode 100644 index 000000000000..1993d134c23c --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch @@ -0,0 +1,10 @@ +--- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c 2010-04-13 20:02:46.494496561 +0200 ++++ work/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" |