Some minor fixes

Package-Manager: portage-2.0.51.19

4 files changed, 40 insertions, 20 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index fb7037b82c39..83eb8afad247 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # 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.83 2005/04/10 18:37:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.84 2005/04/11 11:39:25 lu_zero Exp $
+
+  11 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +files/8.8.25-smp.patch,
+  ati-drivers-8.12.10.ebuild:
+  Fix smp issues (bug #72311) and gcc version issues (bug #84834, bug #83897),
+  thanks to every people listed in the bugs for reporting and providing
+  solutions
 
   10 Apr 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.12.10.ebuild:
   Marked ~amd64
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index f25106090d2e..16bd039abc33 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,22 +1,23 @@
+MD5 0948a24451d2e0a7fd7d893c7ff5b4e0 ati-drivers-8.8.25.ebuild 4924
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 3be35345fbc4005a932468eb839a64ff ati-drivers-8.10.19.ebuild 5968
+MD5 6ba70f4634473ada8b39a4e0b3983597 ati-drivers-8.12.10.ebuild 6695
+MD5 5556ad2e8fdd513e5ca017edaeb620b6 ChangeLog 14679
 MD5 3a2987cd761df4062f8427ae695f10db ati-drivers-8.8.25-r3.ebuild 5752
-MD5 0948a24451d2e0a7fd7d893c7ff5b4e0 ati-drivers-8.8.25.ebuild 4924
-MD5 f673dd9c660efd0a81ca5d346e0e3c47 ChangeLog 14411
-MD5 1d3de2c16d94417c1cf22cb604754ae3 ati-drivers-8.12.10.ebuild 6578
-MD5 f2aad1d22d8cdb74d99b5efec9d02c2d files/digest-ati-drivers-8.10.19 156
-MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
+MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
+MD5 5349e88a1d5524007b97ead001558d0d files/digest-ati-drivers-8.12.10 156
+MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25-r3 154
-MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
+MD5 f2aad1d22d8cdb74d99b5efec9d02c2d files/digest-ati-drivers-8.10.19 156
 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
-MD5 3c7b079f100d7796b44af7288f044730 files/digest-ati-drivers-8.8.25 75
-MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
+MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 7a1a2040181cf4d2d3b0e820da5a8576 files/8.08-kernel-2.6.10.patch 4492
-MD5 5349e88a1d5524007b97ead001558d0d files/digest-ati-drivers-8.12.10 156
-MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
-MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
-MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
+MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
+MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
+MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
 MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
 MD5 28e1ac88033da1899a711d26c10d93b6 files/fglrx-2.6-pagetable.patch 5027
+MD5 3c7b079f100d7796b44af7288f044730 files/digest-ati-drivers-8.8.25 75
 MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
-MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
+MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
diff --git a/media-video/ati-drivers/ati-drivers-8.12.10.ebuild b/media-video/ati-drivers/ati-drivers-8.12.10.ebuild
index d76e8b182fc7..c77e20a3877c 100644
--- a/media-video/ati-drivers/ati-drivers-8.12.10.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.12.10.ebuild
@@ -1,10 +1,10 @@
 # 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.12.10.ebuild,v 1.4 2005/04/11 00:24:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.12.10.ebuild,v 1.5 2005/04/11 11:39:25 lu_zero Exp $
 
 IUSE="opengl"
 
-inherit eutils rpm multilib linux-info linux-mod
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
 HOMEPAGE="http://www.ati.com"
@@ -74,6 +74,7 @@ src_unpack() {
 		epatch ${FILESDIR}/fglrx-2.6-pagetable.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
 }
 
@@ -88,11 +89,11 @@ src_compile() {
 		export _POSIX2_VERSION="199209"
 		if use_m ;
 		then
-			make -C ${KV_DIR} M="`pwd`" modules || \
-				ewarn "DRM module not built"
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
 		else
-			make -C ${KV_DIR} SUBDIRS="`pwd`" modules || \
-				ewarn "DRM module not built"
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
 		fi
 		set_arch_to_portage
 	else
diff --git a/media-video/ati-drivers/files/8.8.25-smp.patch b/media-video/ati-drivers/files/8.8.25-smp.patch
new file mode 100644
index 000000000000..9914a8d9fde0
--- /dev/null
+++ b/media-video/ati-drivers/files/8.8.25-smp.patch
@@ -0,0 +1,12 @@
+--- firegl_public.c.bak	2004-12-10 11:35:14.091477807 +0100
++++ firegl_public.c	2004-12-10 11:07:12.000000000 +0100
+@@ -32,6 +32,9 @@
+ // ============================================================
+ #include <linux/version.h>
+ #include <linux/autoconf.h>
++#ifdef CONFIG_SMP
++#define __SMP__
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,71)
+ #define EXPORT_SYMTAB	1