mem_map fix, 2.6.17 support add

Package-Manager: portage-2.1_pre10-r2

5 files changed, 84 insertions, 29 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/Manifest b/x11-drivers/ati-drivers/Manifest
index bcaf56a6a6ef..1f0494b9a337 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 09ati 39 RMD160 2eb917685ae226a6913f00d0247514faf998d92f SHA1 847e5702afa6581181883b7fc8efbe8b54d0f97b SHA256 44336cd56c2712a3260a1289c1085f08e4cb61e6a73175eac4a7b3ebabe5011e size 39
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 RMD160 2eb917685ae226a6913f00d0247514faf998d92f files/09ati 39
@@ -25,6 +22,10 @@ AUX ati-drivers-8.22.5-intermodule.patch 831 RMD160 fdc33818770a97f1b90a8b413cf8
 MD5 ead3d9f8477752d9059916e567916e5d files/ati-drivers-8.22.5-intermodule.patch 831
 RMD160 fdc33818770a97f1b90a8b413cf88c1ad381bdc8 files/ati-drivers-8.22.5-intermodule.patch 831
 SHA256 b2cd8404b415ec472ba07604ba77aa6b52aa9a7bb98b08fbf9d18ac180bfe749 files/ati-drivers-8.22.5-intermodule.patch 831
+AUX ati-drivers-8.23.7-gcc41.patch 1953 RMD160 6b757dc0a3b7baa5f739094a55125b64022688ae SHA1 e2ddc31aa3dffe724a911c05b01edf8f84564309 SHA256 52fb3bba1fdc1a152f8dd7024715a0290cf56b42aee2e4b4edcceb0d0ab4a986 size 1953
+MD5 b7a3d6fb45f6885fa2fca2b3e8cc3fc2 files/ati-drivers-8.23.7-gcc41.patch 1953
+RMD160 6b757dc0a3b7baa5f739094a55125b64022688ae files/ati-drivers-8.23.7-gcc41.patch 1953
+SHA256 52fb3bba1fdc1a152f8dd7024715a0290cf56b42aee2e4b4edcceb0d0ab4a986 files/ati-drivers-8.23.7-gcc41.patch 1953
 AUX ati-drivers-8.23.7-noiommu.patch 407 RMD160 12b506cb26db5ebfe11db3d0d909008008dfac79 SHA1 5b043683a457417d0d55cee12aff8fc0f040114f SHA256 ad666b54963a14aab83a04beed38902df4a586e0de25778905fe00a1cec37b54 size 407
 MD5 e33c06b8983330741fe60ab12265a144 files/ati-drivers-8.23.7-noiommu.patch 407
 RMD160 12b506cb26db5ebfe11db3d0d909008008dfac79 files/ati-drivers-8.23.7-noiommu.patch 407
@@ -143,18 +144,18 @@ EBUILD ati-drivers-8.22.5.ebuild 8894 RMD160 2ac6e4fe56cbb072c386568ceab434ef0a3
 MD5 2c599a8c0985a244933812ab478545c4 ati-drivers-8.22.5.ebuild 8894
 RMD160 2ac6e4fe56cbb072c386568ceab434ef0a358fa2 ati-drivers-8.22.5.ebuild 8894
 SHA256 cfd53c585cddbf3dcfc02e54633d5851eaeb4eee886fc7547d276a2da37b8db2 ati-drivers-8.22.5.ebuild 8894
-EBUILD ati-drivers-8.23.7.ebuild 9163 RMD160 ba5db56800d9ea12701352f15ef41e97f4515577 SHA1 6d9bb64e61447ad99cf6482544d80ceeda01726f SHA256 3761495fa933538bc7d31c28bca749aaa6516367f0bb2493ca000b82dfff97e8 size 9163
-MD5 2661bc5e86766b28c182e82b950abcf2 ati-drivers-8.23.7.ebuild 9163
-RMD160 ba5db56800d9ea12701352f15ef41e97f4515577 ati-drivers-8.23.7.ebuild 9163
-SHA256 3761495fa933538bc7d31c28bca749aaa6516367f0bb2493ca000b82dfff97e8 ati-drivers-8.23.7.ebuild 9163
-EBUILD ati-drivers-8.24.8.ebuild 9157 RMD160 c41b92660f28c39f54eb702d18849e370a608308 SHA1 d5c3d21f9a2129198d5fbfd5daa065c3e4448eb4 SHA256 55fb65a82f620efd26f32b0710e218641496bf9b63031b8932e38145a12aa7fe size 9157
-MD5 9be47354aad465d029fb0d127f9d736d ati-drivers-8.24.8.ebuild 9157
-RMD160 c41b92660f28c39f54eb702d18849e370a608308 ati-drivers-8.24.8.ebuild 9157
-SHA256 55fb65a82f620efd26f32b0710e218641496bf9b63031b8932e38145a12aa7fe ati-drivers-8.24.8.ebuild 9157
-MISC ChangeLog 27745 RMD160 f134a110d93fc6b5d5ade62ccf5328b07e25946c SHA1 c0d693d6a4cfe26f1129323a0c549415bb4194e4 SHA256 9c029fca83b3a61716889528bc87c4d188c717dc9d6afa45c5990f7e8c65b4b8 size 27745
-MD5 09659225215e1e5dcd432ab23523ba7a ChangeLog 27745
-RMD160 f134a110d93fc6b5d5ade62ccf5328b07e25946c ChangeLog 27745
-SHA256 9c029fca83b3a61716889528bc87c4d188c717dc9d6afa45c5990f7e8c65b4b8 ChangeLog 27745
+EBUILD ati-drivers-8.23.7.ebuild 9205 RMD160 5c53c0c3fe4c2c061dc6973b628d24863c749904 SHA1 9d2a9f01115a6aa29fe3dab87f18dd148213d04e SHA256 9302431c2c429f85d76d90d31c0a2f8d9cce91821571474896b9499fe9d8f6bc size 9205
+MD5 4c5ab23d305f5f426c50656cc553ebf1 ati-drivers-8.23.7.ebuild 9205
+RMD160 5c53c0c3fe4c2c061dc6973b628d24863c749904 ati-drivers-8.23.7.ebuild 9205
+SHA256 9302431c2c429f85d76d90d31c0a2f8d9cce91821571474896b9499fe9d8f6bc ati-drivers-8.23.7.ebuild 9205
+EBUILD ati-drivers-8.24.8.ebuild 9215 RMD160 23ddfa3de7c02fceb5a7cf134122b43de91033d4 SHA1 80faeded45acfbc1494620f0ccd72cc545cd26c1 SHA256 2143521361a650e1c9b695f2d883aa7da8efba157606ea5508596b11c0b36ea2 size 9215
+MD5 d98fb05483d8aad4a63e46aeb8bc5b30 ati-drivers-8.24.8.ebuild 9215
+RMD160 23ddfa3de7c02fceb5a7cf134122b43de91033d4 ati-drivers-8.24.8.ebuild 9215
+SHA256 2143521361a650e1c9b695f2d883aa7da8efba157606ea5508596b11c0b36ea2 ati-drivers-8.24.8.ebuild 9215
+MISC ChangeLog 27927 RMD160 ff01acc2b0004561b86db0c3a3b4d5baeda165ba SHA1 adf0aa25fc628f45d6a641f47a441b4deb365212 SHA256 13d250ea02f462bf29afe10138c947d44c828221779eefe645dee1119a59a92f size 27927
+MD5 8bfbd9e57b46c59cd87e53f367f493f9 ChangeLog 27927
+RMD160 ff01acc2b0004561b86db0c3a3b4d5baeda165ba ChangeLog 27927
+SHA256 13d250ea02f462bf29afe10138c947d44c828221779eefe645dee1119a59a92f ChangeLog 27927
 MISC metadata.xml 227 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff SHA1 47e1824ff5e7e3789fcbb4ca5de9c3ccd9162b76 SHA256 4fbed7030b32bcdc95b70000adbbcb6f1d73092c4a2f20e6cfb737a1b44d6e07 size 227
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff metadata.xml 227
@@ -213,10 +214,3 @@ SHA256 e6e4bbc3a090c81cb390b64eca1ec85d12b62e8aa9d1e3a36dd48f458b8f6b14 files/di
 MD5 bd50ca17992e76197fb6d7c31c4e2dc7 files/digest-ati-drivers-8.24.8 593
 RMD160 ce5e73ecd8ae3cf649848d9b78935d51620a3379 files/digest-ati-drivers-8.24.8 593
 SHA256 10c9172a288f6ee2c6362c7ea4dab08bfbf24b6c470283b5bbba2ff85e158791 files/digest-ati-drivers-8.24.8 593
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEUrJlW78445TWHXcRAsXyAJ9YyfZyGqsTajHue+s1Y48/mw+oxwCdF9R3
-KRZ7TZr06ANsC4md0WN6RRw=
-=ICiZ
------END PGP SIGNATURE-----
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))