Fixes

4 files changed, 116 insertions, 101 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index a8d9f02a58a6..08c58be21b12 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,7 +1,11 @@
 # 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.8 2003/05/02 00:00:48 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.9 2003/05/11 01:45:41 lu_zero Exp $
 
+  11 May 2003; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-2.5.1-r1.ebuild, ati-2.5.1.diff: Added a patch to solve 
+  bug #20104, backported drobbins' tweaks.
+   
   01 May 2003; Daniel Robbins <drobbins@gentoo.org>
   ati-drivers-2.9.8.ebuild: Tweaked compile process to work even with NVIDIA
   headers (defined USE_GLU,) moved unpack stuff to src_unpack, and removed
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index b291e9771fa9..9821173fbf85 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,12 +1,11 @@
-MD5 5ef616cb5eb5748b81b0a426ec1976a5 ChangeLog 2010
-MD5 3ad88f17e7799066b5366eafedd86d43 ati-drivers-2.5.1-r1.ebuild 3552
+MD5 10f3cfcff61263060270fa95a5f360f2 ChangeLog 2176
+MD5 f5d5c52bb63599ec70ff6d5bdbc4ab27 ati-drivers-2.5.1-r1.ebuild 3735
 MD5 1526fb1161daa618507dc4a2e2cb6699 ati-drivers-2.5.1.ebuild 3230
 MD5 2a7891c630babfa3aa53bd1346a0e555 ati-drivers-2.9.6.ebuild 3730
 MD5 b478e8446636c1b2be60449a8e6f43bc ati-drivers-2.9.8.ebuild 3767
-MD5 1a77fa094da00f9ec47291cf121220e3 ati-drivers-2.5.1-r2.ebuild 3732
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 f21aff99b8b4d8a6134d44d5e00e649e files/ati-2.5.1.diff 660
 MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1 78
 MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1-r1 78
 MD5 2f9a5d93c684832ae19d0e8f94ef45b9 files/digest-ati-drivers-2.9.8 65
 MD5 8c91ab37f1350b59a4a7c21a4e8c3acb files/digest-ati-drivers-2.9.6 65
-MD5 bbaa57c2af6fb97bc2d8c9e149932f74 files/digest-ati-drivers-2.5.1-r2 78
diff --git a/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild b/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild
index 9f4ac08d9b65..fbef27d22544 100644
--- a/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild
+++ b/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild
@@ -1,151 +1,140 @@
 # 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.5.1-r1.ebuild,v 1.10 2003/04/23 01:35:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.5.1-r1.ebuild,v 1.11 2003/05/11 01:45:41 lu_zero Exp $
 
 IUSE="qt kde gnome"
 
 DESCRIPTION="Ati precompiled drivers for r300, r250 and r200 chipsets"
 HOMEPAGE="http://www.ati.com"
 SRC_URI="http://pdownload.mii.instacontent.net/ati/drivers/fglrx-glc22-4.2.0-${PV}.i586.rpm"
-
 SLOT="${KV}"
 LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 
 DEPEND=">=virtual/linux-sources-2.4
-	>=sys-libs/glibc-2.2.2
 	app-arch/rpm2targz
 	<x11-base/xfree-4.2.99
 	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}
-	tar zxf fglrx-glc22-4.2.0-${PV}.i586.tar.gz
+    rpm2targz ${DISTDIR}/${A} || die
+	tar zxf fglrx-glc22-4.2.0-${PV}.i586.tar.gz || die
+	epatch ${FILESDIR}/ati-2.5.1.diff
+	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
 }
 
 pkg_setup(){
-	opengl-update xfree
+	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
 }
 
 
 src_compile() {
-
 	einfo "building the glx module"
-	check_KV
-    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" 
+	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" 
 	
-
-    einfo "building the fgl_glxgears sample"
+	einfo "building the fgl_glxgears sample"
+	cd ${WORKDIR}/fglrxgears
+	make -f Makefile.Linux || die
 	
-	mkdir ${WORKDIR}/fglrxgears
-    cd ${WORKDIR}/fglrxgears
-    tar -xzvf ${WORKDIR}/usr/src/fglrx_sample_source.tgz
-    mv xc/programs/fgl_glxgears/* .
-    make -f Makefile.Linux || die
-    
-    if [ "`use qt`" ]
+	if [ "`use qt`" ]
 	then 
-	    einfo "building the qt fglx panel"
-	    cd ${WORKDIR}
-	    local OLDBIN="/usr/X11R6/bin"
-	    local ATIBIN="${D}/opt/ati/bin"
-	    mkdir fglrx_panel
-	    cd  fglrx_panel
-	    tar -xzvf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz
-	    sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-		Makefile >Makefile.new
-		mv Makefile.new Makefile
-	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
+	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 ]
+	if [ -d ${ROOT}/usr/lib/opengl/ati ]
 	then
-	    rm -rf ${ROOT}/usr/lib/opengl/ati/*
-    fi
-}			    
+		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+	fi
+}		    
 
 src_install() {
-    local ATI_ROOT="/usr/lib/opengl/ati"
-    
-    cd ${WORKDIR}
+	local ATI_ROOT="/usr/lib/opengl/ati"
+	cd ${WORKDIR}
 
 #drm module 
-    insinto /lib/modules/${KV}/video
-    doins lib/modules/fglrx/build_mod/fglrx.o
+	insinto /lib/modules/${KV}/video
+	doins lib/modules/fglrx/build_mod/fglrx.o
 
 #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
+	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
-
+	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`" ] 
+	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
-
-    #if ["`use kde`"] then
-
-
-    #if ["`use gnome`"]
+		doexe fglrx_panel/fireglcontrol
+	fi
+	rm -f usr/src/*
 	cp -R usr ${D}
 }
 
 pkg_postinst() {
-#switch to the ati implementation
-    if [ "${ROOT}" = "/" ]
-	then
-	    /usr/sbin/opengl-update ati
-    fi
-    
-    einfo
-    einfo "To use the xfree GLX, run \"opengl-update xfree\""
-    einfo
-    einfo
-    einfo "To chance your XF86Config you can use the bundled \"fglrxconfig\""
-    einfo
-    
+	#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
-}
+	update-modules
 
-pkg_postrm() {
-	opengl-update xfree
 }
diff --git a/media-video/ati-drivers/files/ati-2.5.1.diff b/media-video/ati-drivers/files/ati-2.5.1.diff
new file mode 100644
index 000000000000..dd2eface57ab
--- /dev/null
+++ b/media-video/ati-drivers/files/ati-2.5.1.diff
@@ -0,0 +1,23 @@
+--- lib/modules/fglrx/build_mod/firegl_public.c~	2003-04-30 10:55:44.000000000 +0100
++++ lib/modules/fglrx/build_mod/firegl_public.c	2003-04-30 10:57:08.000000000 +0100
+@@ -86,6 +86,19 @@
+ #include "firegl_public.h"
+ 
+ // ============================================================
++#ifdef CONFIG_HIGHPTE
++    #ifdef pte_offset_map
++//        #error Error: this code was never tested with CONFIG_HIGHPTE setting enabled
++    #endif
++#endif
++
++#ifndef pte_offset
++    #ifdef pte_offset_map
++        #define pte_offset  pte_offset_map
++    #endif
++#endif
++
++// ============================================================
+ #ifndef TRUE
+ #define TRUE 1
+ #endif
+