New version

5 files changed, 204 insertions, 4 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 50355718bdad..cf58e41db935 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.47 2004/08/30 13:28:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.48 2004/09/10 23:17:25 lu_zero Exp $
+
+*ati-drivers-3.12.0 (11 Sep 2004)
+
+  11 Sep 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.11.1.ebuild,
+  +ati-drivers-3.12.0.ebuild:
+  New version and added a check for xorg.
 
   30 Aug 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.11.1.ebuild:
   Minor cleanup
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index b0cf20b6e398..370b41d7b51b 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,6 +1,7 @@
 MD5 55084b4637f59dbc056f3c3ea6ac9ef7 ati-drivers-3.2.0.ebuild 4494
 MD5 c097444035f82c48673393e171163f90 ati-drivers-3.7.0.ebuild 5424
-MD5 52d95ee9748e808d96cf0d986ee2cdff ChangeLog 8518
+MD5 20d81ae9d530de30e66b7aaa50a3cbe3 ati-drivers-3.12.0.ebuild 4772
+MD5 788706dd169d55055a1f4c207f9b80a3 ChangeLog 8702
 MD5 616152ceacf4338e4dfc14b378413e47 ati-drivers-3.2.5.ebuild 4555
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 d404832f9f2ff434a19c278fdec0bb2e ati-drivers-3.2.8-r2.ebuild 4134
@@ -10,7 +11,7 @@ MD5 9dd2c8e40a7f834a2df7d7d4d9963e7f ati-drivers-3.7.6.ebuild 3662
 MD5 f99248507f1c16729893906827ccc545 ati-drivers-3.7.6-r1.ebuild 4128
 MD5 1ec180441a38b1d56f59394a1cb4842a ati-drivers-3.9.0.ebuild 4125
 MD5 a2e898dd45c93552faf9522eb9ee6f85 ati-drivers-3.2.8.ebuild 4561
-MD5 10b9bb1d8032793d84cd44f5a7342a93 ati-drivers-3.11.1.ebuild 4473
+MD5 20d81ae9d530de30e66b7aaa50a3cbe3 ati-drivers-3.11.1.ebuild 4772
 MD5 9d6164f9cb443fb2fceadee69ec62d0e ati-drivers-3.2.5-r1.ebuild 4580
 MD5 6b5ab1abb7122e2335aeef6de0db7aca ati-drivers-3.2.4.ebuild 4685
 MD5 22470cac4821c26539336042f88281f3 ati-drivers-3.9.0-r1.ebuild 4513
@@ -30,6 +31,7 @@ MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
 MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
 MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
 MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
+MD5 0332bde3220fd222a5b8742ba68abefc files/digest-ati-drivers-3.12.0 73
 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
diff --git a/media-video/ati-drivers/ati-drivers-3.11.1.ebuild b/media-video/ati-drivers/ati-drivers-3.11.1.ebuild
index 3153e62aad85..248cbc4a17ee 100644
--- a/media-video/ati-drivers/ati-drivers-3.11.1.ebuild
+++ b/media-video/ati-drivers/ati-drivers-3.11.1.ebuild
@@ -1,6 +1,6 @@
 # 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.11.1.ebuild,v 1.2 2004/08/30 13:28:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.11.1.ebuild,v 1.3 2004/09/10 23:17:25 lu_zero Exp $
 
 IUSE=""
 
@@ -34,6 +34,16 @@ pkg_setup(){
 			die "You must upgrade to xfree-4.3.0 or greater to use this."
 		fi
 	fi
+	if has_version "x11-base/xorg-x11"
+	then
+		if has_version ">=x11-base/xorg-x11-6.7.99"
+		then
+			eerror "you are using a xorg-x11 version too new !!!"
+			eerror "You must downgrade to xorg-x11-6.7.0 otherwise"
+			eerror "trying to use opengl will crash X"
+			die "Better safe than sorry."
+		fi
+	fi
 
 	# Set up X11 implementation
 	X11_IMPLEM_P="$(best_version virtual/x11)"
diff --git a/media-video/ati-drivers/ati-drivers-3.12.0.ebuild b/media-video/ati-drivers/ati-drivers-3.12.0.ebuild
new file mode 100644
index 000000000000..df96a42722e0
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-3.12.0.ebuild
@@ -0,0 +1,181 @@
+# 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.12.0.ebuild,v 1.1 2004/09/10 23:17:25 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
+	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
+	if has_version "x11-base/xorg-x11"
+	then
+		if has_version ">=x11-base/xorg-x11-6.7.99"
+		then
+			eerror "you are using a xorg-x11 version too new !!!"
+			eerror "You must downgrade to xorg-x11-6.7.0 otherwise"
+			eerror "trying to use opengl will crash X"
+			die "Better safe than sorry."
+		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
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+	if [ "`echo ${KV}|grep 2.6`" ]
+	then
+		epatch ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
+#		epatch ${FILESDIR}/fglrx-3.9.0-regparm.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.12.0 b/media-video/ati-drivers/files/digest-ati-drivers-3.12.0
new file mode 100644
index 000000000000..44bf6623c24d
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-3.12.0
@@ -0,0 +1 @@
+MD5 a9b74202635058a701c75bb19f99fb72 fglrx-4.3.0-3.12.0.i386.rpm 4119585