New version

4 files changed, 203 insertions, 22 deletions

diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 6a8a43d69fbe..7c8de95a4038 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,31 +1,31 @@
-MD5 3d6bc2040399c48d308a9ad898ca8e45 ati-drivers-3.2.8.ebuild 4592
-MD5 76a5204e775bfa12f13f85bd26d163e6 ati-drivers-2.5.1-r1.ebuild 3714
-MD5 77684e92f813491b90e7bbe3ed6f5992 ati-drivers-3.2.4.ebuild 4712
+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 fa719dd117eefdf523b7c271ebaae4d2 ati-drivers-3.2.8.ebuild 4591
+MD5 76a5204e775bfa12f13f85bd26d163e6 ati-drivers-2.5.1-r1.ebuild 3714
 MD5 d2e36344a43730865709052aab657821 ati-drivers-3.2.5-r1.ebuild 4605
-MD5 1b2934d0eeee64733e1fd2b514cb6fe6 ChangeLog 4085
 MD5 20b39fca85cbd3239466ccf8f24fdfc2 ati-drivers-2.5.1.ebuild 3036
-MD5 bd9fe6f01ec4d68241cf5c9ba51e907b ati-drivers-2.9.12.ebuild 3636
 MD5 59a37b1c6f7cc09308773178c3d414b4 ati-drivers-3.2.5.ebuild 4583
-MD5 473b66e0cdd6d232a2fe528f05ea3a1b ati-drivers-2.9.13-r1.ebuild 4273
-MD5 90845dc5cbdc627f4a5067f623d457b0 ati-drivers-3.2.0.ebuild 4521
-MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
-MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
+MD5 ebbd9cab924b8c6a73aa6fe863fad7e6 ChangeLog 4209
+MD5 77684e92f813491b90e7bbe3ed6f5992 ati-drivers-3.2.4.ebuild 4712
+MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
+MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
+MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
+MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
+MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561
+MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
+MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
+MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8 78
 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 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
+MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
 MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
-MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
-MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
+MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
+MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
 MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
-MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-2.6-fix-amd-spec.patch 561
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
-MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8 78
-MD5 f21aff99b8b4d8a6134d44d5e00e649e files/ati-2.5.1.diff 660
-MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
+MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
 MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
-MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
-MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
-MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
-MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
diff --git a/media-video/ati-drivers/ati-drivers-3.2.8.ebuild b/media-video/ati-drivers/ati-drivers-3.2.8.ebuild
new file mode 100644
index 000000000000..372bed99eb6a
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-3.2.8.ebuild
@@ -0,0 +1,169 @@
+# 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.8.ebuild,v 1.1 2003/10/08 23:27:53 lu_zero Exp $
+
+IUSE="qt kde gnome"
+
+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-glc22-4.3.0-${PV}.i586.rpm"
+SLOT="${KV}"
+LICENSE="ATI GPL-2 QPL-1.0"
+KEYWORDS="-* ~x86"
+
+DEPEND=">=virtual/linux-sources-2.4
+	app-arch/rpm2targz
+	>=x11-base/xfree-4.3.0
+	qt? ( >=x11-libs/qt-3.0 )"
+
+RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip"
+
+src_unpack() {
+	cd ${WORKDIR}
+	rpm2targz ${DISTDIR}/${A} ||die
+	tar zxf ${WORKDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
+	mkdir ${WORKDIR}/fglrxgears
+	cd ${WORKDIR}/fglrxgears
+	tar zxf ${WORKDIR}/usr/src/ATI/fglrx_sample_source.tgz || die
+	mv xc/programs/fgl_glxgears/* .
+	cp Makefile.Linux Makefile.Linux.orig || die
+	#defining USE_GLU allows this to compile with NVIDIA headers just fine
+	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
+	cd ${WORKDIR}
+	local OLDBIN="/usr/X11R6/bin"
+	local ATIBIN="${D}/opt/ati/bin"
+	mkdir fglrx_panel
+	cd fglrx_panel
+	tar zxf ${WORKDIR}/usr/src/ATI/fglrx_panel_sources.tgz || die
+	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
+	Makefile >Makefile.new
+	mv Makefile.new Makefile
+
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+
+	einfo "applying fglrx-3.2.8-fix-amd-adv-spec.patch"
+	patch < ${FILESDIR}/fglrx-3.2.8-fix-amd-adv-spec.patch
+
+	if [ "`echo ${KV}|grep 2.6`" ] ; then
+
+	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
+#	einfo "applying fglrx-2.6-tsk_euid.patch"
+#	patch < ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch
+	fi
+}
+
+pkg_setup(){
+	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
+}
+
+
+src_compile() {
+	einfo "building the glx module"
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if [ "`echo ${KV}|grep 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 "glx module not built"
+	    ARCH=${GENTOO_ARCH}
+	else
+	#that is the dirty way to avoid the id -u check
+	sed -e 's:`id -u`:0:' make.sh >make.sh.new
+	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
+	chmod +x make.sh
+	./make.sh || ewarn "glx module not built"
+	fi
+
+	einfo "building the fgl_glxgears sample"
+	cd ${WORKDIR}/fglrxgears
+	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
+
+	if [ "`use qt`" ]
+	then
+	einfo "building the qt fglx panel"
+		cd ${WORKDIR}/fglrx_panel
+		emake || die
+	fi
+	#removing stuff
+	einfo "cleaning"
+	cd ${WORKDIR}
+	rm -fR usr/share
+	cd usr/X11R6/
+	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
+}
+
+pkg_preinst() {
+# clean the dinamic libGL stuff's home to ensure
+# we dont 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 [ "`echo ${KV}|grep 2.6`" ] ; then
+		doins lib/modules/fglrx/build_mod/fglrx.ko
+	else
+		doins lib/modules/fglrx/build_mod/fglrx.o
+	fi
+
+#dri driver
+	exeinto ${ATI_ROOT}/lib
+	doexe 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
+	#that is the same as in the xfree
+	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
+
+#same as in xfree
+	exeinto ${ATI_ROOT}/
+	dosym ../xfree/include ${ATI_ROOT}/include
+	dosym ../xfree/extensions ${ATI_ROOT}/extensions
+	rm usr/X11R6/lib/libGL.so.1.2
+
+#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe fglrxgears/fgl_glxgears
+	doexe usr/X11R6/bin/*
+	rm usr/X11R6/bin/*
+
+	if [ "`use qt`" ]
+	then
+		doexe fglrx_panel/fireglcontrol
+	fi
+	rm -f usr/src/*
+	cp -R usr ${D}
+}
+
+pkg_postinst() {
+	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
+	#otherwise it messes up livecd/gamecd stuff
+	#if [ "${ROOT}" = "/" ]
+	#then
+	#	/usr/sbin/opengl-update ati
+	#fi
+
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+#drm-module
+	update-modules
+
+}
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.8 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.8
new file mode 100644
index 000000000000..242816afc94c
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-3.2.8
@@ -0,0 +1 @@
+MD5 824aaaafd4b4867c2456860ea5eff5ec fglrx-glc22-4.3.0-3.2.8.i586.rpm 4365039
diff --git a/media-video/ati-drivers/files/fglrx-3.2.8-fix-amd-adv-spec.patch b/media-video/ati-drivers/files/fglrx-3.2.8-fix-amd-adv-spec.patch
new file mode 100644
index 000000000000..85a46ad10e05
--- /dev/null
+++ b/media-video/ati-drivers/files/fglrx-3.2.8-fix-amd-adv-spec.patch
@@ -0,0 +1,11 @@
+--- firegl_public.c.orig	2003-09-22 04:43:30.000000000 +0200
++++ firegl_public.c	2003-10-09 00:14:41.337778176 +0200
+@@ -3106,7 +3108,7 @@
+ 
+ int __ke_amd_adv_spec_cache_feature(void)
+ {
+-#if ( (PAGE_ATTR_FIX == 1) || (LINUX_VERSION_CODE == KERNEL_VERSION(2,4,19)) )
++#if ( (PAGE_ATTR_FIX == 1) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,19)) )
+ /* the kernel already does provide a fix for the AMD Athlon
+    big page attribute / cache flush data consistency system bug on its own.
+    (AMD claimed that CPU cache behaviour for such pages is not specified.)