pci_name fix

(Portage version: 2.0.51.22-r1)

4 files changed, 92 insertions, 8 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 1287aa27ec14..dd3d91a9d7a8 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.95 2005/06/13 21:14:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.96 2005/06/19 14:33:21 lu_zero Exp $
+
+  19 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6.12-pci_name.patch, ati-drivers-8.14.13.ebuild,
+  ati-drivers-8.14.13-r1.ebuild:
+  Fix for linux 2.6.12
 
   13 Jun 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.14.13.ebuild,
   ati-drivers-8.14.13-r1.ebuild:
diff --git a/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild
index 281b05b55f06..5d923c386921 100644
--- a/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild,v 1.3 2005/06/13 21:14:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild,v 1.4 2005/06/19 14:33:21 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -71,7 +71,7 @@ src_unpack() {
 
 	if kernel_is 2 6
 	then
-		epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch
+		epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
 	fi
 	epatch ${FILESDIR}/8.8.25-via-amd64.patch
 	epatch ${FILESDIR}/8.8.25-smp.patch
diff --git a/media-video/ati-drivers/ati-drivers-8.14.13.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13.ebuild
index 0d335b0014c2..19e65ac1ae5c 100644
--- a/media-video/ati-drivers/ati-drivers-8.14.13.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.14.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13.ebuild,v 1.5 2005/06/13 21:14:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13.ebuild,v 1.6 2005/06/19 14:33:21 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -83,10 +83,10 @@ src_unpack() {
 
 	cd ${WORKDIR}/lib/modules/fglrx/build_mod
 
-#	if kernel_is 2 6
-#	then
-#		epatch ${FILESDIR}/fglrx-2.6-pagetable.patch
-#	fi
+	if kernel_is 2 6
+	then
+		epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
+	fi
 	epatch ${FILESDIR}/8.8.25-via-amd64.patch
 	epatch ${FILESDIR}/8.8.25-smp.patch
 	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
diff --git a/media-video/ati-drivers/files/fglrx-2.6.12-pci_name.patch b/media-video/ati-drivers/files/fglrx-2.6.12-pci_name.patch
new file mode 100644
index 000000000000..d62eb3ff5fc3
--- /dev/null
+++ b/media-video/ati-drivers/files/fglrx-2.6.12-pci_name.patch
@@ -0,0 +1,79 @@
+--- build_mod.orig/agpgart_be.c	2005-06-19 15:59:55.000000000 +0200
++++ build_mod/agpgart_be.c	2005-06-19 15:58:59.000000000 +0200
+@@ -117,6 +117,10 @@
+ #include <linux/miscdevice.h>
+ #include <linux/pm.h>
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
++#define pci_name(x) (x)->slot_name
++#endif
++
+ #if (LINUX_VERSION_CODE >= 0x020400)
+ #define FGL_PM_PRESENT
+ #else
+@@ -7083,7 +7087,7 @@
+ 			if ( agp_bridge.capndx )
+             {
+ 				printk(KERN_INFO PFX "Detected HP ZX1 AGP "
+-				       "chipset at %s\n", dev->slot_name);
++				       "chipset at %s\n", pci_name(dev));
+ 				agp_bridge.type = HP_ZX1;
+ 				agp_bridge.dev = dev;
+               	/* fill in the mode register */
+@@ -7149,7 +7153,7 @@
+                 if( cap_ptr )
+                 {
+     				printk(KERN_INFO PFX "Detected a Via Apollo KT400 chipset in AGP v3 mode "
+-	    			       "at %s\n", dev->slot_name);
++	    			       "at %s\n", pci_name(dev));
+ 
+                     agp_bridge.type = VIA_APOLLO_KT400;
+     				agp_bridge.dev = dev;
+@@ -7169,12 +7173,12 @@
+                 if( cap_ptr )
+                 {
+     				printk(KERN_DEBUG PFX "Detected a Via Apollo KT400 chipset in AGP v2 compat mode "
+-	    			       "at %s\n", dev->slot_name);
++	    			       "at %s\n", pci_name(dev));
+                 }
+                 else
+                 {
+     				printk(KERN_ERR PFX "Detected a Via Apollo KT400 chipset but no AGPv2/v3 caps found "
+-	    			       "at %s\n", dev->slot_name);
++	    			       "at %s\n", pci_name(dev));
+                 }
+             }
+             break;
+@@ -7200,7 +7204,7 @@
+                 if( cap_ptr )
+                 {
+                     printk(KERN_INFO PFX "Detected a Via P4X400 chipset in AGP v3 mode "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+ 
+                     agp_bridge.type = VIA_APOLLO_P4X400;
+                     agp_bridge.dev = dev;
+@@ -7220,7 +7224,7 @@
+                 if( cap_ptr )
+                 {
+                     printk(KERN_INFO PFX "Detected a Via P4X400 chipset with AGP v3.x caps in AGP v2 compatibility mode "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+ 
+                     agp_bridge.type = VIA_APOLLO_P4X400;
+                     agp_bridge.dev = dev;
+@@ -7240,12 +7244,12 @@
+                 if( cap_ptr )
+                 {
+                     printk(KERN_DEBUG PFX "Detected a Via P4X400 chipset with AGP v2 caps in true AGP v2 mode "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+                 }
+                 else
+                 {
+                     printk(KERN_ERR PFX "Detected a Via P4X400 chipset but no AGPv2/v3 caps found "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+                 }
+             }
+             break;