Backport from 3.9.0

4 files changed, 174 insertions, 2 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 18ac6596038c..a3aaa3d53fbc 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.37 2004/05/27 20:40:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.38 2004/05/28 15:43:06 lu_zero Exp $
+
+*ati-drivers-3.2.8-r2 (28 May 2004)
+
+  28 May 2004; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-3.2.8-r2.ebuild:
+  Backport from 3.9.0
 
 *ati-drivers-3.9.0 (27 May 2004)
 
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index aeebe29a8c39..a0a29c600a77 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,8 +1,9 @@
 MD5 1397fa0cb35fcb96a3befa9c282d384d ati-drivers-3.2.0.ebuild 4521
 MD5 ee68f54d4c74d5662eaadd541a53af59 ati-drivers-3.7.0.ebuild 5452
-MD5 58f697a0ba4c160c20afe10fdf818dfd ChangeLog 6460
+MD5 3cf51eeb2920d40eb5b07d7b71ee8937 ChangeLog 6599
 MD5 3dc1266cde9024db50801253bc1502fb ati-drivers-3.2.5.ebuild 4582
 MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
+MD5 e3324fa606640d00a155946614db8083 ati-drivers-3.2.8-r2.ebuild 4145
 MD5 0b7bfbabdfaa2b103e1db8a6f0379845 ati-drivers-2.9.12.ebuild 3636
 MD5 4a894069620e67130a64db93d2b55ae9 ati-drivers-3.2.8-r1.ebuild 3673
 MD5 1cf90e6829b02297dc9e8399ab7dcd3f ati-drivers-3.7.6.ebuild 3675
@@ -16,6 +17,7 @@ MD5 13a32d6b01ead543e27e71e6c0f7549f ati-drivers-2.9.13-r1.ebuild 4273
 MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
 MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
 MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
+MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8-r2 78
 MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
 MD5 a2a4f4788a7de4a9c7c0295a2804752f files/digest-ati-drivers-3.7.0 78
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
diff --git a/media-video/ati-drivers/ati-drivers-3.2.8-r2.ebuild b/media-video/ati-drivers/ati-drivers-3.2.8-r2.ebuild
new file mode 100644
index 000000000000..41e31e57ba7d
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-3.2.8-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2004 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-r2.ebuild,v 1.1 2004/05/28 15:43:06 lu_zero Exp $
+
+IUSE="qt kde gnome"
+
+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-glc22-4.3.0-${PV}.i586.rpm"
+SLOT="${KV}"
+LICENSE="ATI"
+KEYWORDS="-* ~x86"
+
+DEPEND=">=virtual/linux-sources-2.4
+	app-arch/rpm2targz
+	virtual/x11"
+
+RDEPEND="virtual/x11"
+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!"
+
+	if has_version "x11-base/xfree"
+	then
+		if ! has_version ">=x11-base/xfree-4.3.0"
+		then
+			die "You must upgrade to xfree-4.3.0 or greater to use this."
+		fi
+	fi
+
+	# 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
+
+	if [ "`echo ${KV}|grep 2.6`" ]
+	then
+		epatch ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
+		epatch ${FILESDIR}/fglrx-2.6-get-page.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
+
+	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
+
+	# DRM module
+	update-modules
+}
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.8-r2 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.8-r2
new file mode 100644
index 000000000000..242816afc94c
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-3.2.8-r2
@@ -0,0 +1 @@
+MD5 824aaaafd4b4867c2456860ea5eff5ec fglrx-glc22-4.3.0-3.2.8.i586.rpm 4365039