New version. Symlinks libGL.la whenever available, changes hardcoded opengl-update to use basename in preparation for a possible symlink to config-opengl, adds matrox and ati to supported list in help.

5 files changed, 206 insertions, 10 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index fb0affae1b17..60fe07da2800 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-base/opengl-update
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.15 2003/12/29 04:12:05 kumba Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.16 2004/02/04 05:04:23 spyderous Exp $
+
+*opengl-update-1.6 (04 Feb 2004)
+
+  04 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  opengl-update-1.6.ebuild, files/opengl-update-1.6:
+  New version. Symlinks libGL.la whenever available, changes hardcoded
+  opengl-update to use basename in preparation for a possible symlink to
+  config-opengl, adds matrox and ati to supported list in help.
 
   28 Dec 2003; Joshua Kinard <kumba@gentoo.org> opengl-update-1.5.ebuild:
   Move to mips stable (~mips -> mips)
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 2c48eb1daf6e..900554a7df58 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,11 +1,14 @@
-MD5 bd8bae0601bd1ee736fd29ca26e2fdf0 files/opengl-update-1.3 3199
-MD5 51af427d47eed1b61ada5839b9722f26 files/opengl-update-1.4 3778
-MD5 0db87e7b174f832ec7f82d65d8d7abdf files/opengl-update-1.5 3792
+MD5 d18a3c9ad474a022ddf6aa2a49c1300d ChangeLog 2593
+MD5 15888db563d723a724ef6cdd2818893d metadata.xml 284
+MD5 a40de07637eb02d24722a1986d59fabf opengl-update-1.3.ebuild 534
+MD5 f7a0b6bbca17bdd3eac1c7cead0b3728 opengl-update-1.4.ebuild 539
+MD5 b3a26879c49931ed491757b8dfb327ff opengl-update-1.5.ebuild 548
+MD5 1cf112860daa0296cc5714c0fbe972a2 opengl-update-1.6.ebuild 552
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.5 0
-MD5 f7a0b6bbca17bdd3eac1c7cead0b3728 opengl-update-1.4.ebuild 539
-MD5 a40de07637eb02d24722a1986d59fabf opengl-update-1.3.ebuild 534
-MD5 fe09e8de5908ede9deb57bd057c22f04 ChangeLog 2242
-MD5 15888db563d723a724ef6cdd2818893d metadata.xml 284
-MD5 b3a26879c49931ed491757b8dfb327ff opengl-update-1.5.ebuild 548
+MD5 bd8bae0601bd1ee736fd29ca26e2fdf0 files/opengl-update-1.3 3199
+MD5 51af427d47eed1b61ada5839b9722f26 files/opengl-update-1.4 3778
+MD5 0db87e7b174f832ec7f82d65d8d7abdf files/opengl-update-1.5 3792
+MD5 1d45ef6e89992cf2e73427cf6a80f849 files/opengl-update-1.6 4055
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.6 0
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.6 b/x11-base/opengl-update/files/digest-opengl-update-1.6
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/x11-base/opengl-update/files/digest-opengl-update-1.6
diff --git a/x11-base/opengl-update/files/opengl-update-1.6 b/x11-base/opengl-update/files/opengl-update-1.6
new file mode 100644
index 000000000000..f68fa5083251
--- /dev/null
+++ b/x11-base/opengl-update/files/opengl-update-1.6
@@ -0,0 +1,165 @@
+#!/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/opengl-update/files/opengl-update-1.6,v 1.1 2004/02/04 05:04:23 spyderous 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: `basename $0` <GL implementation>
+
+note:  
+       This utility switches between OpenGL implementations.  Currently there
+       are four supported implementations, "xfree" "nvidia" "ati" and "mtx", the
+       implementations for XFree86, NVidia, ATI and Matrox drivers respectively.
+
+examples:
+       `basename $0` xfree
+       This will setup things to use libGL.so from XFree86.
+
+       `basename $0` nvidia
+       This will setup things to use libGL.so from the NVidia drivers.
+	   
+FOO
+	exit 1
+}
+
+if [ "$#" -ne 1 -a "$#" -ne 2 ] || [ "$#" -eq 2 -a "$1" != "--use-old" ]
+then
+	usage
+fi
+
+GL_IMPLEM=""
+
+# Only use specified implementation if it is not already selected.
+if [ "$1" = "--use-old" ]
+then
+	shift
+
+	if [ -f /etc/env.d/09opengl ]
+	then
+		source /etc/env.d/09opengl
+		if [ -n "${LDPATH}" ]
+		then
+			GL_IMPLEM="${LDPATH/\/usr\/lib\/opengl\/}"
+			GL_IMPLEM="${GL_IMPLEM/\/lib}"
+			unset LDPATH
+		fi
+	fi
+	
+	if [ -z "${GL_IMPLEM}" ]
+	then
+		GL_IMPLEM="$1"
+	fi
+else
+	GL_IMPLEM="$1"
+fi
+if [ ! -d /usr/lib/opengl/${GL_IMPLEM} ]
+then
+	usage
+else
+	ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
+
+	#setup the $LDPATH
+	echo "LDPATH=/usr/lib/opengl/${GL_IMPLEM}/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/${GL_IMPLEM}/lib/libGL.so)"
+	ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
+		/usr/lib/libGL.so
+	ln -sf /usr/lib/opengl/${GL_IMPLEM}/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
+	realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)"
+	ln -sf /usr/lib/opengl/${GL_IMPLEM}/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/${GL_IMPLEM}/lib/libGLcore.so ]
+	then
+		realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGLcore.so)"
+		ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
+			/usr/lib/libGLcore.so
+		ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
+			/usr/lib/libGLcore.so.1
+	fi
+
+	#setup the /usr/lib/libGL.la symlink
+	if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la ]
+	then
+		if [ -e /usr/lib/libGL.la ]
+		then
+			rm -f /usr/lib/libGL.la
+		fi
+		ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la \
+			/usr/lib/libGL.la
+	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/${GL_IMPLEM}/extensions/libglx.so ]
+	then
+		ln -sf /usr/lib/opengl/${GL_IMPLEM}/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/${GL_IMPLEM}/extensions/libglx.a ]
+	then
+		ln -sf /usr/lib/opengl/${GL_IMPLEM}/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/${GL_IMPLEM}/include/${x} \
+			/usr/X11R6/include/GL/${x}
+	done
+
+	eend 0
+fi
+
+
+# vim:ts=4
diff --git a/x11-base/opengl-update/opengl-update-1.6.ebuild b/x11-base/opengl-update/opengl-update-1.6.ebuild
new file mode 100644
index 000000000000..3fcfc505dff4
--- /dev/null
+++ b/x11-base/opengl-update/opengl-update-1.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.6.ebuild,v 1.1 2004/02/04 05:04:23 spyderous Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Utility to change the OpenGL interface being used."
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc"
+
+
+src_install() {
+	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update
+}
+