3dfx fixes

3 files changed, 34 insertions, 138 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 2ba9c3ae2d7e..e89c8bc7346f 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.15 2002/04/16 19:58:20 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.16 2002/05/12 18:49:25 azarah Exp $
+
+*xfree-4.2.0-r10 (10 Apr 2002)
+
+  12 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r10.ebuild :
+
+  Move opengl-update to its own ebuild for flexibility.  Add some 3dfx fixes.
 
   16 Apr 2002; Matthew Kennedy <mkennedy@gentoo.org>
   xfree-4.2.0-r9.ebuild, ChangeLog :
diff --git a/x11-base/xfree/files/4.2.0-r10/opengl-update b/x11-base/xfree/files/4.2.0-r10/opengl-update
deleted file mode 100644
index ac4ad971901f..000000000000
--- a/x11-base/xfree/files/4.2.0-r10/opengl-update
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r10/opengl-update,v 1.1 2002/05/10 14:20:38 daybird Exp $
-
-
-source /etc/init.d/functions.sh
-
-if [ `id -u` -ne 0 ]
-then
-	eerror "${0}: must be root."
-	exit 1
-fi
-
-usage() {
-cat << FOO
-usage: opengl-update <GL implementation>
-
-note:  
-       This utility switch between OpenGL implementations.  Currently there
-       are two supported implementations, namely "xfree" and "nvidia", the
-       implementations for XFree86 and the NVidia drivers respectively.
-
-examples:
-       opengl-update xfree86
-       This will setup things to use libGL.so from XFree86
-
-       opengl-update nvidia
-       This will setup things to use libGL.so from the NVidia drivers.
-	   
-FOO
-	exit 1
-}
-
-if [ "$#" -ne 1 ]
-then
-	usage
-fi
-if [ ! -d /usr/lib/opengl/${1} ]
-then
-	usage
-else
-	ebegin "Switching to ${1} OpenGL interface"
-
-	#setup the $LDPATH
-	echo "LDPATH=/usr/lib/opengl/${1}/lib" >/etc/env.d/09opengl
-	/usr/sbin/env-update &>/dev/null
-
-	#setup the /usr/lib/libGL.so symlink
-	if [ -e /usr/lib/libGL.so ]
-	then
-		rm -f /usr/lib/libGL.so
-	fi
-	if [ -e /usr/lib/libGL.so.1 ]
-	then
-		rm -f /usr/lib/libGL.so.1
-	fi
-	realname="$(readlink /usr/lib/opengl/${1}/lib/libGL.so)"
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/usr/lib/libGL.so
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/usr/lib/libGL.so.1
-	
-	#setup the /usr/X11R6/lib/libMesaGL.so symlink
-	if [ -e /usr/X11R6/lib/libMesaGL.so ]
-	then
-		rm -f /usr/X11R6/lib/libMesaGL.so
-	fi
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/usr/X11R6/lib/libMesaGL.so
-
-	#setup the /usr/lib/libGLcore.so symlink
-	if [ -e /usr/lib/libGLcore.so ]
-	then
-		rm -f /usr/lib/libGLcore.so
-	fi
-	if [ -e /usr/lib/libGLcore.so.1 ]
-	then
-		rm -f /usr/lib/libGLcore.so.1
-	fi
-	if [ -e /usr/lib/opengl/${1}/lib/libGLcore.so ]
-	then
-		realname="$(readlink /usr/lib/opengl/${1}/lib/libGLcore.so)"
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLcore.so
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLcore.so.1
-	fi
-
-	#setup the /usr/X11R6/lib/modules/extensions/libglx.so symlink
-	if [ -e /usr/X11R6/lib/modules/extensions/libglx.so ]
-	then
-		rm -f /usr/X11R6/lib/modules/extensions/libglx.so
-	fi
-	if [ -e /usr/lib/opengl/${1}/extensions/libglx.so ]
-	then
-		ln -sf /usr/lib/opengl/${1}/extensions/libglx.so \
-			/usr/X11R6/lib/modules/extensions/libglx.so
-	fi
-	#setup the /usr/X11R6/lib/modules/extensions/libglx.a symlink
-	if [ -e /usr/X11R6/lib/modules/extensions/libglx.a ]
-	then
-		rm -f /usr/X11R6/lib/modules/extensions/libglx.a
-	fi
-	if [ -e /usr/lib/opengl/${1}/extensions/libglx.a ]
-	then
-		ln -sf /usr/lib/opengl/${1}/extensions/libglx.a \
-			/usr/X11R6/lib/modules/extensions/libglx.a
-	fi
-
-	#setup the includes
-	for x in gl.h glx.h glxtokens.h
-	do
-		if [ -e /usr/X11R6/include/GL/${x} ]
-		then
-			rm -f /usr/X11R6/include/GL/${x}
-		fi
-		ln -sf /usr/lib/opengl/${1}/include/${x} \
-			/usr/X11R6/include/GL/${x}
-	done
-
-	eend 0
-fi
-
-
-# vim:ts=4
diff --git a/x11-base/xfree/xfree-4.2.0-r10.ebuild b/x11-base/xfree/xfree-4.2.0-r10.ebuild
index 0dfec2ca6305..3f44021006ab 100644
--- a/x11-base/xfree/xfree-4.2.0-r10.ebuild
+++ b/x11-base/xfree/xfree-4.2.0-r10.ebuild
@@ -23,6 +23,7 @@ SRC_URI="$SRC_PATH0/X${MY_V}src-1.tgz
 
 HOMEPAGE="http://www.xfree.org"
 LICENSE="X11"
+SLOT="0"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
@@ -30,7 +31,8 @@ DEPEND=">=sys-libs/ncurses-5.1
 	sys-devel/perl
 	3dfx? ( >=media-libs/glide-v3-3.10 )"
 	
-RDEPEND=">=sys-libs/ncurses-5.1"
+RDEPEND=">=sys-libs/ncurses-5.1
+	x11-base/opengl-update"
 
 PROVIDE="virtual/x11
 	virtual/opengl
@@ -54,7 +56,8 @@ src_unpack () {
 # on ppc with mouse scrolling.  There should be a better fix than this,
 # but for now:
 
-	if [ ${ARCH} != ppc ] ; then	
+	if [ "${ARCH}" != "ppc" ]
+	then
 		cd ${S}
 		cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
 		echo "#define DefaultGcc2i386Opt ${CFLAGS}" >> config/cf/host.def
@@ -62,11 +65,12 @@ src_unpack () {
 		echo "#define DefaultCCOptions -ansi" >> config/cf/host.def
 
 		# optimize Mesa for architecture
-		if [ -n "`use sse`" ] ; then
-			echo "#define MesaUseKatmai YES" >> config/cf/host.def
-		fi
-		if [ -n "`use 3dnow`" ] ; then
+		if [ -n "`use 3dnow`" ]
+		then
 			echo "#define MesaUse3DNow YES" >> config/cf/host.def
+		elif [ -n "`use sse`" ]
+		then
+			echo "#define MesaUseKatmai YES" >> config/cf/host.def
 		fi
 
 		# build with glide3 support? (build the tdfx_dri.o module)
@@ -84,15 +88,27 @@ src_unpack () {
 		${S}/programs/Xserver/Imakefile.orig \
 		> ${S}/programs/Xserver/Imakefile
 
-	# Apply Xft quality patch from  http://www.cs.mcgill.ca/~dchest/xfthack/
+	# Apply Xft quality patch from http://www.cs.mcgill.ca/~dchest/xfthack/
 	cd ${S}/lib/Xft
 	cat ${FILESDIR}/${PVR}/xft-quality.diff | patch -p1 || die
 }
 
 src_compile() {
+
+	# fix build build problems for tdfx driver
+	if [ -n "`use 3dfx`" ] && [ "${ARCH}" != "ppc" ]
+	then
+		cd ${S}/lib/GL/mesa/src/drv/tdfx
+		ln -s /usr/include/glide3/glide.h glide.h
+		ln -s /usr/include/glide3/glideutl.h glideutl.h
+		ln -s /usr/include/glide3/glidesys.h glidesys.h
+		ln -s /usr/include/glide3/g3ext.h g3ext.h
+		cd ${S}
+	fi
 	
 	# make seems safer on ppc.  emake may still work - testing needed.
-	if [ ${ARCH} = ppc ] ; then
+	if [ "${ARCH}" = "ppc" ]
+	then
 		make World || die
 	else
 		emake World || die
@@ -119,7 +135,8 @@ src_install() {
 	fi
 
 	#we zap the host.def file which gets hard-coded with our CFLAGS, messing up other things that use xmkmf
-	if [ ${ARCH} != ppc ] ; then
+	if [ "${ARCH}" != "ppc" ]
+	then
 		echo > ${D}/usr/X11R6/lib/X11/config/host.def
 	fi
 	#theoretically, /usr/X11R6/lib/X11/config is a possible candidate for config file management.
@@ -167,7 +184,7 @@ src_install() {
 	newexe ${FILESDIR}/${PVR}/xfs.start xfs
 
 	#next section is to setup the dinamic libGL stuff
-	dosbin ${FILESDIR}/${PVR}/opengl-update
+#	dosbin ${FILESDIR}/${PVR}/opengl-update
 	dodir /usr/lib/opengl/xfree/{lib,extensions,include}
 	mv ${D}/usr/X11R6/lib/libGL.so* ${D}/usr/lib/opengl/xfree/lib
 	mv ${D}/usr/X11R6/lib/libGL.la ${D}/usr/lib/opengl/xfree/lib