2.6.0-test6-mm support

4 files changed, 177 insertions, 2 deletions

diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 403c77ae2255..4e84cfe3ccd9 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -3,9 +3,9 @@ MD5 44e3741b17b89b914f1082b7d842841b ati-drivers-3.2.5.ebuild 4770
 MD5 90845dc5cbdc627f4a5067f623d457b0 ati-drivers-3.2.0.ebuild 4521
 MD5 bd9fe6f01ec4d68241cf5c9ba51e907b ati-drivers-2.9.12.ebuild 3636
 MD5 20b39fca85cbd3239466ccf8f24fdfc2 ati-drivers-2.5.1.ebuild 3036
-MD5 7b50e908c673121c1c8bdc2109b7dbbb ati-drivers-3.2.5-r1.ebuild 4491
+MD5 62e68c7983d696f69bada561bedbe595 ati-drivers-3.2.5-r1.ebuild 4496
 MD5 77684e92f813491b90e7bbe3ed6f5992 ati-drivers-3.2.4.ebuild 4712
-MD5 56f87119f14c7476aaa987d4412a77dd ChangeLog 3759
+MD5 389f2f973070ea7af4ffde37306bb855 ChangeLog 3761
 MD5 473b66e0cdd6d232a2fe528f05ea3a1b ati-drivers-2.9.13-r1.ebuild 4273
 MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
 MD5 8fa6d34e0c6145c5f93be82488f4a4b1 ati-drivers-2.9.13.ebuild 3637
diff --git a/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild b/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..f5603140c513
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild
@@ -0,0 +1,163 @@
+# 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.5-r1.ebuild,v 1.1 2003/09/30 17:52:35 lostlogic 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/firegl/fglrx-glc22-4.3.0-3.2.5.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/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
+
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	einfo "creating Makefile for kernel 2.6"
+	patch -p1 < ${FILESDIR}/fglrx-2.6-makefile.patch
+	einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
+	patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
+	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
+	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
+	GENTOO_ARCH="${ARCH}"
+	unset ARCH
+	#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
+	if [ "`echo ${KV}|grep '2\.6.*-mm'`" ] ; then
+		patch < ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch || die
+	fi
+	chmod +x make.sh
+	addwrite /usr/src/linux-${KV}/
+	./make.sh || ewarn "glx module not built"
+	ARCH="${GENTOO_ARCH}"
+
+	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/3.2.5-linux-2.6.0-test6-mm.patch b/media-video/ati-drivers/files/3.2.5-linux-2.6.0-test6-mm.patch
new file mode 100644
index 000000000000..dec34fe448ef
--- /dev/null
+++ b/media-video/ati-drivers/files/3.2.5-linux-2.6.0-test6-mm.patch
@@ -0,0 +1,11 @@
+--- firegl_public.c	2003-09-30 10:42:12.813934291 -0500
++++ firegl_public.c.new	2003-09-30 10:44:14.635715781 -0500
+@@ -896,7 +896,7 @@
+ 
+ int __ke_geteuid(void)
+ {
+-    return current->euid;
++    return tsk_euid(current);
+ }
+ 
+ /*****************************************************************************/
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.5-r1 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.5-r1
new file mode 100644
index 000000000000..7956963ef183
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-3.2.5-r1
@@ -0,0 +1 @@
+MD5 ca6afde39dd145c5bdcece5d32c4c172 fglrx-glc22-4.3.0-3.2.5.i586.rpm 4355787