New version. Fixes libtool archives for new X implementations (#48297), adds --get-implementation (#21450) and mentions xorg-x11 as available option (#47247). Also cleans up the usage help a little and makes source more portable.

5 files changed, 236 insertions, 8 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 008a16d1ed53..9b88b965dc5b 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.17 2004/02/09 21:43:27 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.18 2004/05/28 08:31:12 spyderous Exp $
+
+*opengl-update-1.7 (28 May 2004)
+
+  28 May 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/opengl-update-1.7, +opengl-update-1.7.ebuild:
+  New version. Fixes libtool archives for new X implementations (#48297), adds
+  --get-implementation (#21450) and mentions xorg-x11 as available option
+  (#47247). Also cleans up the usage help a little and makes source more
+  portable.
 
   09 Feb 2004; Martin Schlemmer <azarah@gentoo.org> files/opengl-update-1.6:
   Rather remove the .la symlink *before* testing if the selected profile have
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index ab9b8301ca70..273059011601 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,14 +1,17 @@
+MD5 ac4c7f50961b562038bf976fa87128a3 ChangeLog 3244
+MD5 15888db563d723a724ef6cdd2818893d metadata.xml 284
+MD5 1e28d9bce31388be1cff3eb0e601c9ce opengl-update-1.3.ebuild 537
+MD5 c7374c94dfaf8b749ea5f515e3368263 opengl-update-1.4.ebuild 544
+MD5 b380084c3d3182a59b8fd3ab59d685ca opengl-update-1.5.ebuild 530
+MD5 4fd35cc9c5d843a10f5c3dc7efab5602 opengl-update-1.6.ebuild 551
+MD5 18c01a3cc880d099da4902b4dbc71e21 opengl-update-1.7.ebuild 554
 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 c5d5aad607acc5584cf80ccb7d765584 files/opengl-update-1.3 3188
 MD5 dd0c75f51ae9c4c900e722976bbb85ac files/opengl-update-1.4 3767
 MD5 a7b7eafaa3ea0cd277c66b0d13674307 files/opengl-update-1.5 3781
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.6 0
 MD5 7385e3e30933395eb5135f9a6dd84cfc files/opengl-update-1.6 4040
-MD5 4501b49c7cd54d7548d9f4e73c9b953c ChangeLog 2858
-MD5 15888db563d723a724ef6cdd2818893d metadata.xml 284
-MD5 1e28d9bce31388be1cff3eb0e601c9ce opengl-update-1.3.ebuild 537
-MD5 c7374c94dfaf8b749ea5f515e3368263 opengl-update-1.4.ebuild 544
-MD5 b380084c3d3182a59b8fd3ab59d685ca opengl-update-1.5.ebuild 530
-MD5 4fd35cc9c5d843a10f5c3dc7efab5602 opengl-update-1.6.ebuild 551
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.6 0
+MD5 757d341517fd1f8978d318f9380790d8 files/opengl-update-1.7 4578
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7 0
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.7 b/x11-base/opengl-update/files/digest-opengl-update-1.7
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/x11-base/opengl-update/files/digest-opengl-update-1.7
diff --git a/x11-base/opengl-update/files/opengl-update-1.7 b/x11-base/opengl-update/files/opengl-update-1.7
new file mode 100644
index 000000000000..febbb5097020
--- /dev/null
+++ b/x11-base/opengl-update/files/opengl-update-1.7
@@ -0,0 +1,198 @@
+#!/bin/bash
+# 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/files/opengl-update-1.7,v 1.1 2004/05/28 08:31:12 spyderous Exp $
+# Author:  Martin Schlemmer <azarah@gentoo.org>
+# Further modifications by Donnie Berkholz <spyderous@gentoo.org>
+
+. /etc/init.d/functions.sh
+
+if [ `id -u` -ne 0 ]
+then
+	eerror "${0}: must be root."
+	exit 1
+fi
+
+usage() {
+cat << FOO
+usage: ${0##*/} <GL implementation>
+
+note:  
+       This utility switches between OpenGL implementations.  Currently there
+       are five supported implementations, "xorg-x11" "xfree" "nvidia" "ati"
+       and "mtx", the implementations for X.org, XFree86, nVidia, ATi
+       and Matrox drivers respectively.
+
+examples:
+       ${0##*/} xorg-x11
+       This will setup things to use libGL.so from X.org.
+
+       ${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=""
+
+# Discover GL implementation if it exists
+get_implem() {
+	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
+}
+
+# Return current GL implementation
+if [ "$1" = "--get-implementation" ]
+then
+	get_implem
+	
+	if [ -n "${GL_IMPLEM}" ]
+	then
+		echo "${GL_IMPLEM}"
+	fi
+
+	if [ -z "${GL_IMPLEM}" ]
+	then
+		exit 2
+	fi
+
+	exit 1
+fi
+
+# Only use specified implementation if it is not already selected.
+if [ "$1" = "--use-old" ]
+then
+	shift
+
+	get_implem
+	
+	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/libGL.la ]
+	then
+		rm -f /usr/lib/libGL.la
+	fi
+	if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la ]
+	then
+		ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la \
+			/usr/lib/libGL.la
+	fi
+
+	#fix libtool archives (#48297)
+	CURDIR="$(pwd)"
+	cd /usr/lib
+	sed -i 's:/usr/lib/opengl/[^/]*/lib/libGL\.la:/usr/lib/libGL.la:' \
+		`grep -l /usr/lib/opengl *.la`
+	cd ${CURDIR}
+
+	#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.7.ebuild b/x11-base/opengl-update/opengl-update-1.7.ebuild
new file mode 100644
index 000000000000..00ecd734a379
--- /dev/null
+++ b/x11-base/opengl-update/opengl-update-1.7.ebuild
@@ -0,0 +1,18 @@
+# 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.7.ebuild,v 1.1 2004/05/28 08:31:12 spyderous Exp $
+
+DESCRIPTION="Utility to change the OpenGL interface being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~hppa ~amd64 ~ia64"
+IUSE=""
+
+DEPEND="virtual/glibc"
+
+src_install() {
+	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
+}