diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2006-01-03 19:56:32 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2006-01-03 19:56:32 +0000 |
| commit | 7a6d68d0d224ac7444b76252c93e7ced288769f2 (patch) | |
| tree | 6a21120e5c7a4107f05b64b27f93d68075d472e6 /x11-drivers/ati-drivers | |
| parent | changing postfix mailgid. (diff) | |
| download | gentoo-2-7a6d68d0d224ac7444b76252c93e7ced288769f2.tar.gz gentoo-2-7a6d68d0d224ac7444b76252c93e7ced288769f2.tar.bz2 gentoo-2-7a6d68d0d224ac7444b76252c93e7ced288769f2.zip | |
patched 8.20.8 for linux 2.6.15
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-drivers/ati-drivers')
| -rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/Manifest | 3 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild | 8 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/files/ati-drivers-8.20.8-linux-2.6.15.patch | 12 |
4 files changed, 26 insertions, 5 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index 8478be91389d..112eeb11e6c5 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/ati-drivers -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.14 2005/12/19 01:14:41 anarchy Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.15 2006/01/03 19:56:32 anarchy Exp $ + + 03 Jan 2006; Jory A. Pratt <anarchy@gentoo.org> + +files/ati-drivers-8.20.8-linux-2.6.15.patch, ati-drivers-8.20.8.ebuild: + patched 8.20.8 for kernel-2.6.15 19 Dec 2005; Jory A. Pratt <anarchy@gentoo.org> ati-drivers-8.20.8.ebuild: fixed for modular X diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 1f93c773810d..d17bf0ebbf9e 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -11,10 +11,11 @@ MD5 5d3dbd42e474d44115bc1a882763e204 ati-drivers-8.18.8-r1.ebuild 8174 MD5 224722f6f6fe46600354602a1a858d7b ati-drivers-8.18.8-r2.ebuild 8167 MD5 c9629a18ef6fc50af7d610577e287d58 ati-drivers-8.18.8.ebuild 7857 MD5 d870b6a0318da9f732c271d923aea32e ati-drivers-8.19.10.ebuild 8221 -MD5 d36214f2e31ebd68ff1d0560037b3242 ati-drivers-8.20.8.ebuild 8112 +MD5 55c1df3d2d948be38fc2d02c9b6d52d5 ati-drivers-8.20.8.ebuild 8155 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198 +MD5 193e384c325f1483353da6ea4ca87da3 files/ati-drivers-8.20.8-linux-2.6.15.patch 522 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild index 5c9ac5ceec57..20e637111ee7 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild,v 1.3 2005/12/19 01:43:36 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild,v 1.4 2006/01/03 19:56:32 anarchy Exp $ IUSE="opengl" @@ -115,6 +115,10 @@ src_unpack() { cd ${WORKDIR}/common/lib/modules/fglrx/build_mod + # fix kernel oops for acpi + if kernel_is 2 6 15; then + epatch ${FILESDIR}/${P}-linux-2.6.15.patch + fi } diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.20.8-linux-2.6.15.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.20.8-linux-2.6.15.patch new file mode 100644 index 000000000000..6503170a1ff7 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-8.20.8-linux-2.6.15.patch @@ -0,0 +1,12 @@ +--- fglrx.orig/build_mod/firegl_public.c 2005-12-05 15:47:41.000000000 +0000 ++++ fglrx/build_mod/firegl_public.c 2005-12-05 17:18:12.000000000 +0000 +@@ -2586,7 +2586,7 @@ static __inline__ vm_nopage_ret_t do_vm_ + + pMmPage = virt_to_page(kaddr); + +-#if 0 ++#if LINUX_VERSION_CODE >= 0x02060f + // WARNING WARNINIG WARNNING WARNNING WARNNING WARNNING WARNNING WARNNING + // Don't increment page usage count, cause ctx pages are allocated + // with drm_alloc_pages, which marks all pages as reserved. Reserved +- |