summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2006-05-02 00:03:23 +0000
committerJory Pratt <anarchy@gentoo.org>2006-05-02 00:03:23 +0000
commit020dea51605b51409329997100e86abb62572b08 (patch)
treeca5aa6fa87c43cae5f7705bcfccb66a3587773b6 /x11-drivers
parentversion bump (diff)
downloadgentoo-2-020dea51605b51409329997100e86abb62572b08.tar.gz
gentoo-2-020dea51605b51409329997100e86abb62572b08.tar.bz2
gentoo-2-020dea51605b51409329997100e86abb62572b08.zip
mem_map fix, 2.6.17 support add
(Portage version: 2.1_pre10-r2)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/ati-drivers/ChangeLog7
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild7
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild7
-rw-r--r--x11-drivers/ati-drivers/files/ati-drivers-8.23.7-gcc41.patch54
4 files changed, 68 insertions, 7 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index e0c3b51d12b0..861271d4b6e7 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-drivers/ati-drivers
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.33 2006/04/29 00:24:11 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.34 2006/05/02 00:03:23 anarchy Exp $
+
+ 02 May 2006; Jory A. Pratt <anarchy@gentoo.org>
+ +files/ati-drivers-8.23.7-gcc41.patch, ati-drivers-8.23.7.ebuild,
+ ati-drivers-8.24.8.ebuild:
+ mem_map fix, 2.6.17 support add
29 Apr 2006; Marien Zwart <marienz@gentoo.org>
files/digest-ati-drivers-8.18.8, files/digest-ati-drivers-8.18.8-r1,
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild
index 255d8e467e25..41b8d43078dd 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild
@@ -1,6 +1,6 @@
# 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.23.7.ebuild,v 1.5 2006/04/10 12:38:49 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild,v 1.6 2006/05/02 00:03:23 anarchy Exp $
IUSE="opengl"
@@ -127,9 +127,10 @@ src_unpack() {
cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
# remove intermodule calls for 2.6.16
- if kernel_is 2 6 16; then
+ if kernel_is ge 2 6 16; then
epatch ${FILESDIR}/${PN}-8.22.5-intermodule.patch
- epatch "${FILESDIR}/${P}-noiommu.patch"
+ epatch ${FILESDIR}/${P}-noiommu.patch
+ epatch ${FILESDIR}/${P}-gcc41.patch
fi
}
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild
index 66f24d55a88b..685a2d68dd08 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild
@@ -1,6 +1,6 @@
# 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.24.8.ebuild,v 1.1 2006/04/17 23:01:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild,v 1.2 2006/05/02 00:03:23 anarchy Exp $
IUSE="opengl"
@@ -126,9 +126,10 @@ src_unpack() {
cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
- # remove intermodule calls for 2.6.16
- if kernel_is 2 6 16; then
+ if kernel_is ge 2 6 16; then
epatch ${FILESDIR}/${PN}-8.22.5-intermodule.patch
+ epatch ${FILESDIR}/${PN}-8.23.7-noiommu.patch
+ epatch ${FILESDIR}/${PN}-8.23.7-gcc41.patch
fi
}
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.23.7-gcc41.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.23.7-gcc41.patch
new file mode 100644
index 000000000000..97bfeee05f9c
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-8.23.7-gcc41.patch
@@ -0,0 +1,54 @@
+diff -urN firegl_agpgart/firegl_wrap.c.orig firegl_agpgart/firegl_wrap.c
+--- firegl_agpgart/firegl_wrap.c.orig 2006-04-30 17:05:16.822673160 -0500
++++ firegl_agpgart/firegl_wrap.c 2006-04-30 17:09:21.780433920 -0500
+@@ -168,7 +168,7 @@
+
+ #if !defined(__ia64__)
+ // the macros do use errno variable
+-static int errno;
++//static int errno;
+ #endif // __ia64__
+
+ // int mlock(const void *addr, size_t len);
+@@ -217,7 +217,7 @@
+ /* global module vars and constants - defined trough macros */
+ MODULE_AUTHOR("Fire GL - ATI Research GmbH, Germany");
+ MODULE_DESCRIPTION("ATI Fire GL");
+-MODULE_PARM(firegl, "s");
++module_param(firegl, short, 0);
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("Proprietary. (C) 2005 - ATI Technologies, Starnberg, GERMANY");
+ #endif
+@@ -1120,7 +1120,7 @@
+
+ int ATI_API_CALL __ke_verify_area(int type, const void * addr, unsigned long size)
+ {
+- return verify_area(type, addr, size);
++ return access_ok(type, addr, size);
+ }
+
+ int ATI_API_CALL __ke_get_pci_device_info(__ke_pci_dev_t* dev, __ke_pci_device_info_t *pinfo)
+diff -urN firegl_public.c.orig firegl_public.c.
+--- firegl_public.c.orig 2006-04-30 17:05:16.687693680 -0500
++++ firegl_public.c 2006-04-30 17:07:31.553191008 -0500
+@@ -225,7 +225,7 @@
+ /* global module vars and constants - defined trough macros */
+ MODULE_AUTHOR("Fire GL - ATI Research GmbH, Germany");
+ MODULE_DESCRIPTION("ATI Fire GL");
+-MODULE_PARM(firegl, "s");
++module_param(firegl, short, 0);
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("Proprietary. (C) 2002 - ATI Technologies, Starnberg, GERMANY");
+ #endif
+diff -urN firegl_public.h.orig firegl_public.h
+--- firegl_public.h.orig 2006-04-30 17:05:16.765681824 -0500
++++ firegl_public.h 2006-04-30 17:44:20.040449912 -0500
+@@ -152,7 +152,7 @@
+ } \
+ } while(0)
+
+-#ifdef pfn_to_page
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
+ #define PMD_PAGE(pmd) pmd_page(pmd)
+ #else /* for old 2.4 kernels */
+ #define pfn_to_page(pfn) (mem_map + (pfn))