Not far from stable

Package-Manager: portage-2.0.51-r15

5 files changed, 54 insertions, 10 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index d5defc6edd8f..01d247cde7ea 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.70 2005/02/01 02:44:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.71 2005/02/01 19:44:17 lu_zero Exp $
+
+  01 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/8.8.25-via-amd64.patch, ati-drivers-8.8.25-r3.ebuild,
+  ati-drivers-8.8.25.ebuild:
+  Minor changes
 
 *ati-drivers-8.8.25 (01 Feb 2005)
 
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 07b3a6703463..d76b140c70ce 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,19 +1,20 @@
-MD5 f3ece78cdc06e8476efdf8e5ddaca521 ati-drivers-8.8.25.ebuild 4864
+MD5 aec99ce7e68fb538c97e39abb01ffda0 ati-drivers-8.8.25.ebuild 4925
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 2ace02f46d6c58b2d2031932f81af225 ati-drivers-3.12.0.ebuild 4860
 MD5 375a467b7a4e36edf6514421f8f64694 ati-drivers-3.11.1.ebuild 4772
 MD5 897d558fbabf5f0fb60c833a326eea6b ati-drivers-3.9.0.ebuild 4123
 MD5 d73ae47566be08fd04b3c11deba4261c ati-drivers-3.9.0-r1.ebuild 4511
-MD5 90d3a58f4880b303e3f6e51f52e1e192 ChangeLog 12313
+MD5 5284f89e623ee85ee3fea3aa4284ab85 ChangeLog 12471
 MD5 a6f870cc41fb1a75a94e93539a8b8ff4 ati-drivers-3.14.1.ebuild 4346
 MD5 7d92c5a2ea96597e36804d1de46c831d ati-drivers-3.14.6.ebuild 4523
-MD5 f46aabcac9cfb2536c6c7c1a3896d86b ati-drivers-8.8.25-r3.ebuild 5659
+MD5 8e96a2c48fa9403b2fc339379baa5fb1 ati-drivers-8.8.25-r3.ebuild 5701
 MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
 MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-3.14.1 73
 MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25-r3 154
 MD5 54de36d07576ae34efa953192b450dd9 files/digest-ati-drivers-3.11.1 73
 MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561
+MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
 MD5 3aa542eecb0d477f099932d4340b7493 files/digest-ati-drivers-3.14.6 73
 MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0-r1 72
 MD5 2f9201d062ecb4b2a980f5be12cf0b34 files/fglrx-3.9.0-regparm.patch 58125
diff --git a/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild b/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild
index f0e98a6be057..6278c71f2222 100644
--- a/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.8.25-r3.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.8.25-r3.ebuild,v 1.4 2005/02/01 02:44:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild,v 1.5 2005/02/01 19:44:17 lu_zero Exp $
 
 IUSE=""
 
@@ -50,7 +50,7 @@ src_unpack() {
 		#epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch
 		epatch ${FILESDIR}/8.08-kernel-2.6.10.patch
 	fi
-
+	epatch ${FILESDIR}/8.8.25-via-amd64.patch
 	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
 }
 
diff --git a/media-video/ati-drivers/ati-drivers-8.8.25.ebuild b/media-video/ati-drivers/ati-drivers-8.8.25.ebuild
index ce5bfe94d9f2..89d6783ae045 100644
--- a/media-video/ati-drivers/ati-drivers-8.8.25.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.8.25.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.8.25.ebuild,v 1.7 2005/02/01 02:44:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.8.25.ebuild,v 1.8 2005/02/01 19:44:17 lu_zero Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ LICENSE="ATI"
 KEYWORDS="-* ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-		 x11-base/opengl-update"
+		 >=x11-base/opengl-update-2.0_pre5"
 
 DEPEND=">=virtual/linux-sources-2.4
 	${RDEPEND}"
@@ -112,7 +112,7 @@ src_install() {
 	doins ${FILESDIR}/09ati
 	exeinto /opt/ati/bin
 	doexe usr/X11R6/bin/*
-
+	
 	#ati custom stuff
 	cp -a ${WORKDIR}/usr/include ${D}/usr/include
 }
@@ -136,7 +136,8 @@ src_install-libs() {
 
 	# same as the xorg implementation
 	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
-	#Workaround 
+	#Workaround for ancient opengl-config
+	#fixes celestia issues
 	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
 		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
 		> $D/${ATI_ROOT}/lib/libGL.la
diff --git a/media-video/ati-drivers/files/8.8.25-via-amd64.patch b/media-video/ati-drivers/files/8.8.25-via-amd64.patch
new file mode 100644
index 000000000000..78473847404d
--- /dev/null
+++ b/media-video/ati-drivers/files/8.8.25-via-amd64.patch
@@ -0,0 +1,37 @@
+--- agpgart_be.c 2005-01-18 15:02:14.639429632 +0100
++++ agpgart_be.c        2005-01-18 14:54:34.000000000 +0100
+@@ -6167,6 +6167,22 @@
+         "Via",
+         "Apollo P4M266",
+         via_generic_setup },
++
++ { PCI_DEVICE_ID_VIA_8380_0,
++                PCI_VENDOR_ID_VIA,
++                AMD_8151,
++                "AMD",
++                "On-CPU GART",
++                amd_8151_setup },
++
++        { PCI_DEVICE_ID_VIA_8385_0,
++                PCI_VENDOR_ID_VIA,
++                AMD_8151,
++                "AMD",
++                "On-CPU GART",
++                amd_8151_setup },
++
++
+     { 0,
+         PCI_VENDOR_ID_VIA,
+         VIA_GENERIC,
+--- agp.h       2005-01-18 15:02:14.644428872 +0100
++++ agp.h       2005-01-18 14:55:33.000000000 +0100
+@@ -202,6 +202,9 @@
+     #define SIS_GENERIC             _X(SIS_GENERIC)
+     #define AMD_GENERIC             _X(AMD_GENERIC)
+     #define AMD_IRONGATE            _X(AMD_IRONGATE)
++    #define PCI_DEVICE_ID_VIA_8380_0        0x0204
++    #define PCI_DEVICE_ID_VIA_8385_0        0x3188
++
+ //    #define AMD_IGD4                _X(AMD_IGD4)
+ //    #define AMD_IGD4_2P             _X(AMD_IGD4_2P)
+     #define AMD_761                 _X(AMD_761)