New version

5 files changed, 192 insertions, 2 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 782490a73c72..410fa2c94ee6 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.53 2004/10/07 23:00:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.54 2004/11/12 00:24:52 lu_zero Exp $
+
+*ati-drivers-3.14.6 (11 Nov 2004)
+
+  11 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6.10-pci_get_class.patch, +ati-drivers-3.14.6.ebuild:
+  New version, linux-2.6.10-rc1 partial support added
 
   08 Oct 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.1.ebuild:
   Marked stable
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 4b286f7971bb..af953eb7f178 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,7 +1,8 @@
 MD5 55084b4637f59dbc056f3c3ea6ac9ef7 ati-drivers-3.2.0.ebuild 4494
 MD5 c097444035f82c48673393e171163f90 ati-drivers-3.7.0.ebuild 5424
 MD5 3a4aabaec1f8705a6e83b19b88ae8e60 ati-drivers-3.12.0.ebuild 4860
-MD5 9c4338b633390ca223b1ca5b4f92f0be ChangeLog 9305
+MD5 3bf47600c6d5073872f72c524da706ba ati-drivers-3.14.6.ebuild 4349
+MD5 cd086bceccff3877e2e76d07b1fcda97 ChangeLog 9515
 MD5 616152ceacf4338e4dfc14b378413e47 ati-drivers-3.2.5.ebuild 4555
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 d404832f9f2ff434a19c278fdec0bb2e ati-drivers-3.2.8-r2.ebuild 4134
@@ -38,7 +39,9 @@ MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8 78
 MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
 MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 2f9201d062ecb4b2a980f5be12cf0b34 files/fglrx-3.9.0-regparm.patch 58125
+MD5 3aa542eecb0d477f099932d4340b7493 files/digest-ati-drivers-3.14.6 73
 MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561
+MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
 MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
 MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8-r1 78
 MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
diff --git a/media-video/ati-drivers/ati-drivers-3.14.6.ebuild b/media-video/ati-drivers/ati-drivers-3.14.6.ebuild
new file mode 100644
index 000000000000..107e4b2e9585
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-3.14.6.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.14.6.ebuild,v 1.1 2004/11/12 00:24:52 lu_zero Exp $
+
+IUSE=""
+
+inherit eutils rpm
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="http://www2.ati.com/drivers/linux/fglrx-4.3.0-${PV}.i386.rpm"
+SLOT="${KV}"
+LICENSE="ATI"
+KEYWORDS="-* x86"
+
+DEPEND=">=virtual/linux-sources-2.4
+	app-arch/rpm2targz
+	|| ( <x11-base/xorg-x11-6.7.99 >=x11-base/xfree-4.3.0 )"
+
+RDEPEND="|| ( <x11-base/xorg-x11-6.7.99 >=x11-base/xfree-4.3.0 )"
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip"
+
+pkg_setup(){
+	check_KV || \
+		die "Please ensure /usr/src/linux points to your kernel symlink!"
+
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	cd ${WORKDIR}
+	rpm_src_unpack
+
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+	if [ "`echo ${KV}|grep 2.6`" ]
+	then
+		epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch
+	fi
+}
+
+src_compile() {
+	local GENTOO_ARCH=
+
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if [ "${KV}" != "${KV/2\.6}" ]
+	then
+		GENTOO_ARCH=${ARCH}
+		unset ARCH
+	    addwrite "/usr/src/${FK}"
+	    cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		make -C /usr/src/linux SUBDIRS="`pwd`" modules || \
+			ewarn "DRM module not built"
+	    ARCH=${GENTOO_ARCH}
+	else
+		export _POSIX2_VERSION="199209"
+		# That is the dirty way to avoid the id -u check
+		sed -e 's:`id -u`:0:' \
+			-e 's:`uname -r`:${KV}:' \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+
+	# Removing unused stuff
+	rm -rf ${WORKDIR}/usr/X11R6/bin/{*.bz2,fgl_glxgears}
+}
+
+pkg_preinst() {
+	# Clean the dinamic libGL stuff's home to ensure
+	# we don't have stale libs floating around ...
+	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
+	then
+		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+	fi
+}
+
+src_install() {
+	local ATI_ROOT="/usr/lib/opengl/ati"
+
+	cd ${WORKDIR}
+
+	# DRM module
+	insinto /lib/modules/${KV}/video
+	if [ "${KV}" != "${KV/2\.6}" ]
+	then
+		doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.ko
+	else
+		doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.o
+	fi
+
+	# OpenGL libs
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/lib/libGL.so.1.2
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+	# This is the same as that of the X11 implementation ...
+	dosym ../../${X11_IMPLEM}/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
+
+	# X and DRI driver
+	exeinto /usr/X11R6/lib/modules/drivers
+	doexe ${WORKDIR}/usr/X11R6/lib/modules/drivers/fglrx_drv.o
+	exeinto /usr/X11R6/lib/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/lib/modules/dri/fglrx_dri.so
+	rm -f ${WORKDIR}/usr/X11R6/lib/modules/drivers/fglrx_drv.o \
+		${WORKDIR}/usr/X11R6/lib/modules/dri/fglrx_dri.so
+
+	# Same as in the X11 implementation
+	exeinto ${ATI_ROOT}/
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	rm -f ${WORKDIR}/usr/X11R6/lib/libGL.so.1.2
+
+	# Not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.
+
+	#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+	rm usr/X11R6/bin/*
+
+	# Removing unused stuff
+	rm -rf ${WORKDIR}/usr/{src,share}
+	cp -R ${WORKDIR}/usr ${D}/
+}
+
+pkg_postinst() {
+# Ebuild shouldn't do this automatically, just tell the user to do it,
+# otherwise it messes up livecd/gamecd stuff ...  (drobbins, 1 May 2003)
+#	if [ "${ROOT}" = "/" ]
+#	then
+#		/usr/sbin/opengl-update ati
+#	fi
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	echo
+	ewarn "***"
+	ewarn "If you are experiencing problems with memory allocation try to add"
+	ewarn "this line to in your X11 configuration file:"
+	ewarn "		Option \"KernelModuleParm\"  \"agplock=0\" "
+	ewarn "That should solve the hangups you could have with Neverwinter Nights"
+	ewarn "***"
+	# DRM module
+	update-modules
+}
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.14.6 b/media-video/ati-drivers/files/digest-ati-drivers-3.14.6
new file mode 100644
index 000000000000..0e70fb357b26
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-3.14.6
@@ -0,0 +1 @@
+MD5 cd364b6fd6d7b23b3becfe78aab0f98b fglrx-4.3.0-3.14.6.i386.rpm 4223256
diff --git a/media-video/ati-drivers/files/fglrx-2.6.10-pci_get_class.patch b/media-video/ati-drivers/files/fglrx-2.6.10-pci_get_class.patch
new file mode 100644
index 000000000000..e3c73f83cedc
--- /dev/null
+++ b/media-video/ati-drivers/files/fglrx-2.6.10-pci_get_class.patch
@@ -0,0 +1,18 @@
+diff -ruN build_mod.orig/agpgart_be.c build_mod/agpgart_be.c
+--- build_mod.orig/agpgart_be.c	2004-11-11 23:39:17.983856616 +0100
++++ build_mod/agpgart_be.c	2004-11-11 23:41:27.212210920 +0100
+@@ -116,7 +116,14 @@
+ #include <linux/pagemap.h>
+ #include <linux/miscdevice.h>
+ #include <linux/pm.h>
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
++#define pci_find_class pci_get_class
+ 
++
++
++
++
++#endif
+ #if (LINUX_VERSION_CODE >= 0x020400)
+ #define FGL_PM_PRESENT
+ #else