linux-2.6 series fix

4 files changed, 176 insertions, 10 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index c403356517a6..de8c5a099b83 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.12 2003/07/03 20:35:48 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.13 2003/07/22 13:43:02 lu_zero Exp $
+
+  22 Jul 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.13-r1.ebuild,
+  ChangeLog: Added experimental support for 2.6 kernels.
 
 *ati-drivers-2.9.13 (03 Jul 2003)
   
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index c9ba416b4d32..96a3c70a4122 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,15 +1,17 @@
+MD5 cb68e8c65027f5d84780b3ce498f0278 ChangeLog 2682
+MD5 f5d5c52bb63599ec70ff6d5bdbc4ab27 ati-drivers-2.5.1-r1.ebuild 3735
+MD5 9589e9577e2e9b5c8f846ead018931c7 ati-drivers-2.5.1.ebuild 3226
+MD5 0502f917e7b43e4fdb170ae95b85961c ati-drivers-2.9.6.ebuild 3726
+MD5 b478e8446636c1b2be60449a8e6f43bc ati-drivers-2.9.8.ebuild 3767
+MD5 6c813f947d953a426286ca6f11ad45de ati-drivers-2.9.13.ebuild 3655
+MD5 c68623abd4fbf8a5ddaa56b2bbfcd4c6 ati-drivers-2.9.12.ebuild 3654
+MD5 1fa64133858500b621104b46d8e94b80 ati-drivers-2.9.13-r1.ebuild 4292
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
 MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1-r1 78
 MD5 8c91ab37f1350b59a4a7c21a4e8c3acb files/digest-ati-drivers-2.9.6 65
 MD5 2f9a5d93c684832ae19d0e8f94ef45b9 files/digest-ati-drivers-2.9.8 65
-MD5 f21aff99b8b4d8a6134d44d5e00e649e files/ati-2.5.1.diff 660
-MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
 MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
-MD5 f5d5c52bb63599ec70ff6d5bdbc4ab27 ati-drivers-2.5.1-r1.ebuild 3735
-MD5 9589e9577e2e9b5c8f846ead018931c7 ati-drivers-2.5.1.ebuild 3226
-MD5 979b53f4c75957bff5647b365b6dcede ChangeLog 2546
-MD5 0502f917e7b43e4fdb170ae95b85961c ati-drivers-2.9.6.ebuild 3726
-MD5 b478e8446636c1b2be60449a8e6f43bc ati-drivers-2.9.8.ebuild 3767
-MD5 c68623abd4fbf8a5ddaa56b2bbfcd4c6 ati-drivers-2.9.12.ebuild 3654
-MD5 6c813f947d953a426286ca6f11ad45de ati-drivers-2.9.13.ebuild 3655
+MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
+MD5 f21aff99b8b4d8a6134d44d5e00e649e files/ati-2.5.1.diff 660
+MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
diff --git a/media-video/ati-drivers/ati-drivers-2.9.13-r1.ebuild b/media-video/ati-drivers/ati-drivers-2.9.13-r1.ebuild
new file mode 100644
index 000000000000..1e914e83e2f2
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-2.9.13-r1.ebuild
@@ -0,0 +1,159 @@
+# 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-2.9.13-r1.ebuild,v 1.1 2003/07/22 13:43:02 lu_zero Exp $
+
+IUSE="qt kde gnome"
+
+DESCRIPTION="Ati precompiled drivers for r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="mirror://gentoo/fglrx-glc22-4.3.0-${PV}.i586.tar.gz
+		mirror://gentoo/fglrx-$PV-2.6.tar.bz2"
+
+SLOT="${KV}"
+LICENSE="ATI GPL-2 QPL-1.0"
+KEYWORDS="-* ~x86"
+
+DEPEND=">=virtual/linux-sources-2.4
+	>=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}
+	tar zxf ${DISTDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
+	mkdir ${WORKDIR}/fglrxgears
+	cd ${WORKDIR}/fglrxgears
+	tar zxf ${WORKDIR}/usr/src/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/fglrx_panel_sources.tgz || die 
+	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
+	Makefile >Makefile.new
+	mv Makefile.new Makefile
+	
+	if [ "`echo ${KV}|grep 2.6`" ] ; then
+		einfo "unpacking and building the 2.6 patched module"
+		ewarn "It is a quite experimental fix, please beware!"
+		cd ${WORKDIR}
+		tar -xjf ${DISTDIR}/fglrx-$PV-2.6.tar.bz2 || die
+	fi
+}
+
+pkg_setup(){
+	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
+}
+
+
+src_compile() {
+	einfo "building the glx module"
+	if [ "`echo ${KV}|grep 2.6`" ] ; then
+		einfo "building module for 2.6 kernel"
+		cd ${WORKDIR}/fglrx-$PV-2.6
+		GENTOO_ARCH=${ARCH} unset ARCH
+		addwrite "/usr/src/${FK}"
+		make -C /usr/src/linux SUBDIRS="`pwd`" modules || \
+			ewarn "glx module not built"
+		ARCH=${GENTOO_ARCH}
+		else
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	#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 fglrx-$PV-2.6/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 chance your XF86Config you can use the bundled \"fglrxconfig\""
+#drm-module
+	update-modules
+
+}
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-2.9.13-r1 b/media-video/ati-drivers/files/digest-ati-drivers-2.9.13-r1
new file mode 100644
index 000000000000..422a6317e249
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-2.9.13-r1
@@ -0,0 +1,2 @@
+MD5 0ccf54cb7ffeb72f72e59b3b0812515b fglrx-glc22-4.3.0-2.9.13.i586.tar.gz 4099233
+MD5 d15649d5985cf603fdfc18dce31f48a9 fglrx-2.9.13-2.6.tar.bz2 147753