version bump

4 files changed, 107 insertions, 2 deletions

diff --git a/media-video/ati-drivers-extra/ChangeLog b/media-video/ati-drivers-extra/ChangeLog
index 9df3bd84a49e..a0e04d7a2ce2 100644
--- a/media-video/ati-drivers-extra/ChangeLog
+++ b/media-video/ati-drivers-extra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ati-drivers-extra
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.14 2004/08/30 13:24:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.15 2004/09/14 07:03:41 lu_zero Exp $
+
+*ati-drivers-extra-3.12.0 (14 Sep 2004)
+
+  14 Sep 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.12.0.ebuild:
+  New version, thanks to Steve Bamber <bugzilla@thebambers.me.uk> for pointing it
 
   30 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
   ati-drivers-extra-3.11.1.ebuild:
diff --git a/media-video/ati-drivers-extra/Manifest b/media-video/ati-drivers-extra/Manifest
index 9dbe6d41b698..61a836b21ed8 100644
--- a/media-video/ati-drivers-extra/Manifest
+++ b/media-video/ati-drivers-extra/Manifest
@@ -1,11 +1,13 @@
 MD5 036128e0098c209af7334ffa7899c7ca ati-drivers-extra-3.7.6.ebuild 2684
-MD5 f805bb109614651fbcefb8d58730e4b8 ChangeLog 2029
+MD5 f7675214843b4cca5f361628bca63234 ChangeLog 2238
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 c28c5867bdc7da77868abe2913ced125 ati-drivers-extra-3.2.8-r1.ebuild 2035
 MD5 59e6e70ab8c8098ef07bcb90270c4060 ati-drivers-extra-3.9.0.ebuild 2683
+MD5 ee52c59e510dcdaae1d959daf92f162c ati-drivers-extra-3.12.0.ebuild 2700
 MD5 ee52c59e510dcdaae1d959daf92f162c ati-drivers-extra-3.11.1.ebuild 2700
 MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
 MD5 54de36d07576ae34efa953192b450dd9 files/digest-ati-drivers-extra-3.11.1 73
 MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-extra-3.7.6 72
 MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-extra-3.9.0 72
+MD5 0332bde3220fd222a5b8742ba68abefc files/digest-ati-drivers-extra-3.12.0 73
 MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-extra-3.2.8-r1 78
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.12.0.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.12.0.ebuild
new file mode 100644
index 000000000000..702817e6fd67
--- /dev/null
+++ b/media-video/ati-drivers-extra/ati-drivers-extra-3.12.0.ebuild
@@ -0,0 +1,96 @@
+# 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-extra/ati-drivers-extra-3.12.0.ebuild,v 1.1 2004/09/14 07:03:41 lu_zero Exp $
+
+IUSE="qt"
+
+inherit eutils rpm
+
+DESCRIPTION="Ati precompiled drivers extra application"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="http://www2.ati.com/drivers/linux/fglrx-4.3.0-${PV}.i386.rpm"
+SLOT="${KV}"
+LICENSE="ATI GPL-2 QPL-1.0"
+KEYWORDS="-* ~x86"
+
+DEPEND=">=virtual/linux-sources-2.4
+	app-arch/rpm2targz
+	=media-video/ati-drivers-${PV}*
+	qt? ( >=x11-libs/qt-3.0 )"
+
+RDEPEND="=media-video/ati-drivers-${PV}*
+	qt? ( >=x11-libs/qt-3.0 )"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip"
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	cd ${WORKDIR}
+	rpm_src_unpack
+
+	mkdir -p ${WORKDIR}/extra
+	einfo "Unpacking fglrx_sample_source.tgz..."
+	tar --no-same-owner -C ${WORKDIR}/extra/ -zxf \
+		${WORKDIR}/usr/src/ATI/fglrx_sample_source.tgz \
+		|| die "Failed to unpack fglrx_sample_source.tgz!"
+	# 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:" \
+		-i ${WORKDIR}/extra/fgl_glxgears/Makefile.Linux || die
+
+	mkdir -p ${WORKDIR}/extra/fglrx_panel
+	einfo "Unpacking fglrx_panel_sources.tgz..."
+	tar --no-same-owner -C ${WORKDIR}/extra/fglrx_panel/ -zxf \
+		${WORKDIR}/usr/src/ATI/fglrx_panel_sources.tgz \
+		|| die "Failed to unpack fglrx_panel_sources.tgz!"
+	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
+		-i ${WORKDIR}/extra/fglrx_panel/Makefile
+
+	# Messed up fglrx_panel headers
+	cd ${WORKDIR}/extra/fglrx_panel
+	epatch ${FILESDIR}/fglrx-3.7.0-fix-fglrx_panel-includes.patch
+}
+
+src_compile() {
+	einfo "Building the fgl_glxgears sample..."
+	cd ${WORKDIR}/extra/fgl_glxgears
+	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build!"
+
+	if use qt
+	then
+		einfo "Building the QT fglx panel..."
+		cd ${WORKDIR}/extra/fglrx_panel
+		emake || die
+	fi
+
+	# Removing unused stuff
+	rm -rf ${WORKDIR}/usr/X11R6/bin/{*.bz2,fgl_glxgears}
+}
+
+src_install() {
+	local ATI_ROOT="/usr/lib/opengl/ati"
+
+	# Apps
+	exeinto /opt/ati/bin
+	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
+	rm -f ${WORKDIR}/usr/X11R6/bin/*
+
+	if use qt
+	then
+		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
+
+		# Fix the paths in these
+		sed -e 's|/usr/X11R6/|/opt/ati/|g' \
+			-i ${WORKDIR}/usr/share/applnk/fireglcontrol.kdelnk \
+			-i ${WORKDIR}/usr/share/gnome/apps/fireglcontrol.desktop
+	else
+		# Removing unused stuff
+		rm -rf ${WORKDIR}/usr/share/{applnk,gnome,icons,pixmaps}
+	fi
+
+	# not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
+
+	# Removing unused stuff
+	rm -rf ${WORKDIR}/usr/{src,share/doc}
+}
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.12.0 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.12.0
new file mode 100644
index 000000000000..44bf6623c24d
--- /dev/null
+++ b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.12.0
@@ -0,0 +1 @@
+MD5 a9b74202635058a701c75bb19f99fb72 fglrx-4.3.0-3.12.0.i386.rpm 4119585