test5 related fixes, builds and works fine on test5-mm1

3 files changed, 45 insertions, 17 deletions

diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 2ab9c913bc7f..70d2ad08cd7d 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,24 +1,25 @@
-MD5 cedaaa3432d01a0253e253c8d73170fc ChangeLog 3554
-MD5 76a5204e775bfa12f13f85bd26d163e6 ati-drivers-2.5.1-r1.ebuild 3714
-MD5 20b39fca85cbd3239466ccf8f24fdfc2 ati-drivers-2.5.1.ebuild 3036
-MD5 bd9fe6f01ec4d68241cf5c9ba51e907b ati-drivers-2.9.12.ebuild 3636
-MD5 473b66e0cdd6d232a2fe528f05ea3a1b ati-drivers-2.9.13-r1.ebuild 4273
+MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
 MD5 8fa6d34e0c6145c5f93be82488f4a4b1 ati-drivers-2.9.13.ebuild 3637
 MD5 90845dc5cbdc627f4a5067f623d457b0 ati-drivers-3.2.0.ebuild 4521
+MD5 bd9fe6f01ec4d68241cf5c9ba51e907b ati-drivers-2.9.12.ebuild 3636
+MD5 473b66e0cdd6d232a2fe528f05ea3a1b ati-drivers-2.9.13-r1.ebuild 4273
+MD5 76a5204e775bfa12f13f85bd26d163e6 ati-drivers-2.5.1-r1.ebuild 3714
+MD5 20b39fca85cbd3239466ccf8f24fdfc2 ati-drivers-2.5.1.ebuild 3036
+MD5 7a320832be9415682e8ca2cd3622a710 ati-drivers-3.2.5.ebuild 4770
+MD5 cedaaa3432d01a0253e253c8d73170fc ChangeLog 3554
 MD5 77684e92f813491b90e7bbe3ed6f5992 ati-drivers-3.2.4.ebuild 4712
-MD5 504a608ee7ed11b039464f96063b4983 ati-drivers-3.2.5.ebuild 4676
-MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
-MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
-MD5 f21aff99b8b4d8a6134d44d5e00e649e files/ati-2.5.1.diff 660
-MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
-MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1-r1 78
+MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
+MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
 MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
 MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
-MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
 MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
+MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
+MD5 f21aff99b8b4d8a6134d44d5e00e649e files/ati-2.5.1.diff 660
+MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1-r1 78
+MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
 MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
 MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
-MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
+MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
 MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
-MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
+MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
diff --git a/media-video/ati-drivers/ati-drivers-3.2.5.ebuild b/media-video/ati-drivers/ati-drivers-3.2.5.ebuild
index 7691010d3f54..77a9b43c622e 100644
--- a/media-video/ati-drivers/ati-drivers-3.2.5.ebuild
+++ b/media-video/ati-drivers/ati-drivers-3.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.5.ebuild,v 1.5 2003/09/08 11:47:36 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.5.ebuild,v 1.6 2003/09/14 18:34:07 lu_zero Exp $
 
 IUSE="qt kde gnome"
 
@@ -49,8 +49,10 @@ src_unpack() {
 	patch -p1 < ${FILESDIR}/fglrx-2.6-makefile.patch
 	einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
 	patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
-	einfo "applying fglrx-2.6-vmalloc-vmaddr"
+	einfo "applying fglrx-2.6-vmalloc-vmaddr.patch"
 	patch -p1 < ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
+	einfo "applying fglrx-2.6-iminor.patch"
+	patch -p1 < ${FILESDIR}/fglrx-2.6-iminor.patch
 	fi
 }
 
diff --git a/media-video/ati-drivers/files/fglrx-2.6-iminor.patch b/media-video/ati-drivers/files/fglrx-2.6-iminor.patch
new file mode 100644
index 000000000000..545981915d8d
--- /dev/null
+++ b/media-video/ati-drivers/files/fglrx-2.6-iminor.patch
@@ -0,0 +1,25 @@
+diff -ruN build_mod.orig/firegl_public.c build_mod/firegl_public.c
+--- build_mod.orig/firegl_public.c	2003-09-14 19:58:43.586456656 +0200
++++ build_mod/firegl_public.c	2003-09-14 20:04:47.975061168 +0200
+@@ -419,7 +419,9 @@
+ 
+ static int firegl_stub_open(struct inode *inode, struct file *filp)
+ {
+-#if LINUX_VERSION_CODE > 0x020500
++#ifdef LINUX_VERSION_CODE >= 0x020600
++       int minor = iminor(inode);
++#elif LINUX_VERSION_CODE > 0x020500
+ 	int                    minor = minor(inode->i_rdev);
+ #else
+ 	int                    minor = MINOR(inode->i_rdev);
+@@ -845,7 +847,9 @@
+ 
+ int __ke_inode_rdev_minor(struct inode* inode)
+ {
+-#if LINUX_VERSION_CODE > 0x020500
++#ifdef LINUX_VERSION_CODE >= 0x020600
++    return iminor(inode);
++#elif LINUX_VERSION_CODE > 0x020500
+     return minor(inode->i_rdev);
+ #else
+     return MINOR(inode->i_rdev);