summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-04-15 22:47:22 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-04-15 22:47:22 +0000
commit74893c37b06269a3f29e146810910e76d7c3b196 (patch)
treeeced1a0f13faff523762b657aca4198def8b2984 /x11-base
parentfix building with non-bash shells #89174 (diff)
downloadgentoo-2-74893c37b06269a3f29e146810910e76d7c3b196.tar.gz
gentoo-2-74893c37b06269a3f29e146810910e76d7c3b196.tar.bz2
gentoo-2-74893c37b06269a3f29e146810910e76d7c3b196.zip
Removing versions of opengl-update which don't work with any remaining xorg-x11 version in portage.
(Portage version: 2.0.51.19)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/opengl-update/ChangeLog9
-rw-r--r--x11-base/opengl-update/files/digest-opengl-update-1.7.20
-rw-r--r--x11-base/opengl-update/files/digest-opengl-update-1.8.21
-rw-r--r--x11-base/opengl-update/files/digest-opengl-update-2.0_pre51
-rw-r--r--x11-base/opengl-update/files/opengl-update-1.7.2209
-rwxr-xr-xx11-base/opengl-update/files/opengl-update-1.8.2317
-rwxr-xr-xx11-base/opengl-update/files/opengl-update-2.0_pre5379
-rw-r--r--x11-base/opengl-update/opengl-update-1.7.2.ebuild18
-rw-r--r--x11-base/opengl-update/opengl-update-1.8.2.ebuild54
-rw-r--r--x11-base/opengl-update/opengl-update-2.0_pre5.ebuild61
10 files changed, 8 insertions, 1041 deletions
diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 4fc074eaa147..8f13839703d8 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-base/opengl-update
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.84 2005/04/03 19:32:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.85 2005/04/15 22:47:22 eradicator Exp $
+
+ 15 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ -files/opengl-update-1.7.2, -files/opengl-update-1.8.2,
+ -files/opengl-update-2.0_pre5, -opengl-update-1.7.2.ebuild,
+ -opengl-update-1.8.2.ebuild, -opengl-update-2.0_pre5.ebuild:
+ Removing versions of opengl-update which don't work with any remaining
+ xorg-x11 version in portage.
03 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
-files/opengl-update-2.0_pre4, -opengl-update-2.0_pre4-r1.ebuild,
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.7.2 b/x11-base/opengl-update/files/digest-opengl-update-1.7.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.7.2
+++ /dev/null
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.8.2 b/x11-base/opengl-update/files/digest-opengl-update-1.8.2
deleted file mode 100644
index 23c2e8979086..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16a3144742d1a5409fe18477a88f8b6 glext.h-20040830.bz2 30982
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.0_pre5 b/x11-base/opengl-update/files/digest-opengl-update-2.0_pre5
deleted file mode 100644
index 23c2e8979086..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-2.0_pre5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16a3144742d1a5409fe18477a88f8b6 glext.h-20040830.bz2 30982
diff --git a/x11-base/opengl-update/files/opengl-update-1.7.2 b/x11-base/opengl-update/files/opengl-update-1.7.2
deleted file mode 100644
index 99442090bfd7..000000000000
--- a/x11-base/opengl-update/files/opengl-update-1.7.2
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# 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.2,v 1.2 2004/07/15 00:27:54 agriffis 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() {
-# In addition to the below function, there are two extra uses for this.
-#
-# They aren't in the printed help message because they're intended
-# for developer use.
-# 1) --use-old $NEW_IMPLEM will switch to the new implementation only if
-# no old setup existed (i.e., X has never been installed)
-# 2) --get-implementation will return the implementation
-
-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
- if [ "`grep -l /usr/lib/opengl *.la`" ]
- then
- sed -i 's:/usr/lib/opengl/[^/]*/lib/libGL.la:/usr/lib/libGL.la:' \
- `grep -l /usr/lib/opengl *.la`
- fi
- 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/files/opengl-update-1.8.2 b/x11-base/opengl-update/files/opengl-update-1.8.2
deleted file mode 100755
index e8cb2439d406..000000000000
--- a/x11-base/opengl-update/files/opengl-update-1.8.2
+++ /dev/null
@@ -1,317 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-1.8.2,v 1.1 2004/11/30 02:10:00 cyfred Exp $
-# Author: Martin Schlemmer <azarah@gentoo.org>
-# Further modifications by Donnie Berkholz <spyderous@gentoo.org>
-# Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
-
-. /etc/init.d/functions.sh
-
-usage() {
-# In addition to the below function, there are two extra uses for this.
-#
-# They aren't in the printed help message because they're intended
-# for developer use.
-# 1) --use-old $NEW_IMPLEM will switch to the new implementation only if
-# no old setup existed (i.e., X has never been installed)
-# 2) --get-implementation will return the implementation
-
-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/:\*/}"
- GL_IMPLEM="${GL_IMPLEM/\/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 0
-fi
-
-if [ $(id -u) -ne 0 ]
-then
- eerror "${0}: must be root."
- 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
-fi
-
-ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
-
- # Provide the right libnvidia-tls depending on ntpl or not
- if [ "${GL_IMPLEM}" = "nvidia" ]
- then
- if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/tls ]
- then
- rm -f /usr/lib/opengl/${GL_IMPLEM}/lib/tls
- fi
-
-# This was the nvidia approach but it seems to not work, new method
-# as suggested on various bug reports, #64927, #70545
-# /usr/lib/misc/tls_test /usr/lib/misc/tls_test_dso.so 2>/dev/null
- getconf GNU_LIBPTHREAD_VERSION | grep -i nptl > /dev/null
- if [ ${?} = 0 ]
- then
- ln -sf /usr/lib/opengl/${GL_IMPLEM}/tls /usr/lib/opengl/${GL_IMPLEM}/lib/tls
- if [ -d /usr/lib32/opengl/${GL_IMPLEM} ]
- then
- ln -sf /usr/lib32/opengl/${GL_IMPLEM}/tls /usr/lib32/opengl/${GL_IMPLEM}/lib/tls
- fi
- fi
- fi
-
- # Setup the $LDPATH
- echo "LDPATH=/usr/lib/opengl/${GL_IMPLEM}/lib" > /etc/env.d/09opengl
- # Check if we need 32 bit compatibility
- if [ -d /usr/lib32/opengl/${GL_IMPLEM} ]
- then
- source /etc/env.d/09opengl
- echo "LDPATH=${LDPATH}:/usr/lib32/opengl/${GL_IMPLEM}/lib" > /etc/env.d/09opengl
- unset LDPATH
-
- # We also need to make TLS directories now aswell, make 32bit one here
- lib32="$(readlink /usr/lib32)"
- if [ -h ${lib32}/tls ]
- then
- rm -f ${lib32}/tls
- fi
- if [ ! -d ${lib32}/tls ]
- then
- mkdir -p ${lib32}/tls
- fi
-
- fi
-
- # System wide tls stuff
- if [ -h /usr/lib/tls ]
- then
- rm -f /usr/lib/tls
- fi
- if [ ! -d /usr/lib/tls ]
- then
- mkdir -p /usr/lib/tls
- fi
-
- /usr/sbin/env-update &>/dev/null
-
- LIBDIRS="lib lib32"
- for LIBDIR in ${LIBDIRS}
- do
- # If there is a 32 bit compatibility implementation we shall use it
- # Otherwise we want to have some compatibility GL, use xorg-x11.
- if [ "${LIBDIR}" = "lib32" ] && [ ! -d /usr/lib32/opengl/"${GL_IMPLEM}" ]
- then
- GL_LOCAL="xorg-x11"
- else
- GL_LOCAL="${GL_IMPLEM}"
- fi
-
- #setup the /usr/lib/libGL.so symlink
- if [ -e /usr/${LIBDIR}/libGL.so ]
- then
- rm -f /usr/${LIBDIR}/libGL.so
- fi
- if [ -e /usr/${LIBDIR}/libGL.so.1 ]
- then
- rm -f /usr/${LIBDIR}/libGL.so.1
- fi
- if [ -e /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/libGL.so ]
- then
- realname="$(readlink /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/libGL.so)"
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libGL.so
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libGL.so.1
- fi
-
- # Setup the /usr/lib/libGLcore.so symlink
- if [ -e /usr/${LIBDIR}/libGLcore.so ]
- then
- rm -f /usr/${LIBDIR}/libGLcore.so
- fi
- if [ -e /usr/${LIBDIR}/libGLcore.so.1 ]
- then
- rm -f /usr/${LIBDIR}/libGLcore.so.1
- fi
- if [ -e /usr/${LIBDIR}/opengl/${GL_IMPLEM}/lib/libGLcore.so ]
- then
- realname="$(readlink /usr/${LIBDIR}/opengl/${GL_IMPLEM}/lib/libGLcore.so)"
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libGLcore.so
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libGLcore.so.1
- fi
-
- # Now setup the TLS library links
- if [ -e /usr/${LIBDIR}/libnvidia-tls.so ]
- then
- rm -f /usr/${LIBDIR}/libnvidia-tls.so
- fi
- if [ -e /usr/${LIBDIR}/libnvidia-tls.so.1 ]
- then
- rm -f /usr/${LIBDIR}/libnvidia-tls.so.1
- fi
- if [ -e /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/libnvidia-tls.so.1 ]
- then
- realtls="$(readlink /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/libnvidia-tls.so.1)"
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/${realtls} \
- /usr/${LIBDIR}/tls/libnvidia-tls.so
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/${realtls} \
- /usr/${LIBDIR}/tls/libnvidia-tls.so.1
- fi
- if [ -e /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/libnvidia-tls.so.1 ]
- then
- realname="$(readlink /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/libnvidia-tls.so.1)"
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libnvidia-tls.so
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libnvidia-tls.so.1
- fi
- done
-
- # 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/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
- if [ "`grep -l /usr/lib/opengl *.la`" ]
- then
- sed -i 's:/usr/lib/opengl/[^/]*/lib/libGL.la:/usr/lib/libGL.la:' \
- `grep -l /usr/lib/opengl *.la`
- fi
- 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 glext.h
- do
- if [ -e /usr/X11R6/include/GL/${x} ]
- then
- rm -f /usr/X11R6/include/GL/${x}
- fi
-
- # IMPORTANT
- # It is preferable currently to use the standard glext.h file
- # however if an OpenGL provider must use a self produced glext.h
- # then it should be installed to ${GL_IMPLEM}/include
-
- if [ -e /usr/lib/opengl/${GL_IMPLEM}/include/${x} ]
- then
- ln -sf /usr/lib/opengl/${GL_IMPLEM}/include/${x} \
- /usr/X11R6/include/GL/${x}
- else
- ln -sf /usr/lib/opengl/global/include/${x} \
- /usr/X11R6/include/GL/${x}
- fi
- done
-
-eend 0
-
-# vim:ts=4
diff --git a/x11-base/opengl-update/files/opengl-update-2.0_pre5 b/x11-base/opengl-update/files/opengl-update-2.0_pre5
deleted file mode 100755
index d2deb6b3f1d8..000000000000
--- a/x11-base/opengl-update/files/opengl-update-2.0_pre5
+++ /dev/null
@@ -1,379 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.0_pre5,v 1.1 2005/02/01 19:39:36 lu_zero Exp $
-# Author: Martin Schlemmer <azarah@gentoo.org>
-# Further modifications by Donnie Berkholz <spyderous@gentoo.org>
-# Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
-
-. /etc/init.d/functions.sh
-
-need_version() {
- local X11 X11_VER X11_MAJOR_VER X11_MINOR_VER X11_MICRO_VER ERROR_MSG
- ERROR_MSG="This version requires >=x11-base/xorg-x11-6.8.0-r4"
- X11="$(portageq match / virtual/x11)"
- # Got the egrep from ferringb, who got it from portage code
- X11_VER="$(echo ${X11} | egrep -o '(cvs\.)?([[:digit:]]+)((\.[[:digit:]]+)*)([a-z]?)((_(pre|p|beta|alpha|rc)[[:digit:]]*)*)(-r([[:digit:]]+))?$')"
- X11_MAJOR_VER="${X11_VER%%.*}"
- # Hack around a little to get the minor version
- X11_MINOR_VER="${X11_VER#*.}"
- X11_MINOR_VER="${X11_MINOR_VER%%.*}"
- X11_REVISION_VER="${X11_VER##*-r}"
-
- # If version <6.*, die
- if [ ${X11_MAJOR_VER} -lt 6 ]
- then
- einfo "Detected X ${X11_MAJOR_VER}.${X11_MINOR_VER} series, revision ${X11_REVISION_VER}"
- eerror "${ERROR_MSG}"
- exit 1
- # If version =6.* and <6.8.*, die
- elif [ ${X11_MAJOR_VER} -eq 6 -a ${X11_MINOR_VER} -lt 8 ]
- then
- einfo "Detected X ${X11_MAJOR_VER}.${X11_MINOR_VER} series, revision ${X11_REVISION_VER}"
- eerror "${ERROR_MSG}"
- exit 1
- # If version =6.8.0 and <r4, die
- elif [ "${X11_VER}" = "6.8.0" ]
- then
- if [ ! ${X11_REVISION_VER} -lt 4 ]
- then
- einfo "Detected X ${X11_MAJOR_VER}.${X11_MINOR_VER} series, revision ${X11_REVISION_VER}"
- eerror "${ERROR_MSG}"
- exit 1
- fi
- fi
-}
-
-count_implementations() {
- local DIR
- COUNT="0"
- for DIR in $(ls /usr/lib/opengl)
- do
- if [ "${DIR}" != "global" ]
- then
- DIRS="${DIRS} ${DIR}"
- COUNT="$((COUNT + 1))"
- fi
- done
-}
-
-usage() {
-# In addition to the below function, there are two extra uses for this.
-#
-# They aren't in the printed help message because they're intended
-# for developer use.
-# 1) --use-old $NEW_IMPLEM will switch to the new implementation only if
-# no old setup existed (i.e., X has never been installed)
-# 2) --get-implementation will return the implementation
-
-count_implementations
-
-# Get grammar right in message
-local IS_ARE IMPLEM_PLURAL
-if [ ${COUNT} -eq 1 ]
-then
- IS_ARE="is"
- IMPLEM_PLURAL=""
-else
- IS_ARE="are"
- IMPLEM_PLURAL="s"
-fi
-
-cat << FOO
-usage: ${0##*/} <GL implementation>
-
-note:
- This utility switches between OpenGL implementations. There ${IS_ARE}
- ${COUNT} available implementation${IMPLEM_PLURAL}: ${DIRS}.
-
-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
-}
-
-need_version
-
-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/:\*/}"
- GL_IMPLEM="${GL_IMPLEM/\/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 0
-fi
-
-if [ $(id -u) -ne 0 ]
-then
- eerror "${0}: must be root."
- 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
-fi
-
-ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
-
- # Provide the right libnvidia-tls depending on ntpl or not
- if [ "${GL_IMPLEM}" = "nvidia" ]
- then
- if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/tls ]
- then
- rm -f /usr/lib/opengl/${GL_IMPLEM}/lib/tls
- fi
-
-# This was the nvidia approach but it seems to not work, new method
-# as suggested on various bug reports, #64927, #70545
-# /usr/lib/misc/tls_test /usr/lib/misc/tls_test_dso.so 2>/dev/null
- getconf GNU_LIBPTHREAD_VERSION | grep -i nptl > /dev/null
- if [ ${?} = 0 ]
- then
- ln -sf /usr/lib/opengl/${GL_IMPLEM}/tls /usr/lib/opengl/${GL_IMPLEM}/lib/tls
- if [ -d /usr/lib32/opengl/${GL_IMPLEM} ]
- then
- ln -sf /usr/lib32/opengl/${GL_IMPLEM}/tls /usr/lib32/opengl/${GL_IMPLEM}/lib/tls
- fi
- fi
- fi
-
- # Setup the $LDPATH
- echo "LDPATH=/usr/lib/opengl/${GL_IMPLEM}/lib" > /etc/env.d/09opengl
- # Check if we need 32 bit compatibility
- if [ -d /usr/lib32/opengl/${GL_IMPLEM} ]
- then
- source /etc/env.d/09opengl
- echo "LDPATH=${LDPATH}:/usr/lib32/opengl/${GL_IMPLEM}/lib" > /etc/env.d/09opengl
- unset LDPATH
-
- # We also need to make TLS directories now aswell, make 32bit one here
- lib32="$(readlink /usr/lib32)"
- if [ -h ${lib32}/tls ]
- then
- rm -f ${lib32}/tls
- fi
- if [ ! -d ${lib32}/tls ]
- then
- mkdir -p ${lib32}/tls
- fi
-
- fi
-
- # System wide tls stuff
- if [ -h /usr/lib/tls ]
- then
- rm -f /usr/lib/tls
- fi
- if [ ! -d /usr/lib/tls ]
- then
- mkdir -p /usr/lib/tls
- fi
-
- /usr/sbin/env-update &>/dev/null
-
- LIBDIRS="lib lib32"
- for LIBDIR in ${LIBDIRS}
- do
- # If there is a 32 bit compatibility implementation we shall use it
- # Otherwise we want to have some compatibility GL, use xorg-x11.
- if [ "${LIBDIR}" = "lib32" ] && [ ! -d /usr/lib32/opengl/"${GL_IMPLEM}" ]
- then
- GL_LOCAL="xorg-x11"
- else
- GL_LOCAL="${GL_IMPLEM}"
- fi
-
- #setup the /usr/lib/libGL.so symlink
- if [ -e /usr/${LIBDIR}/libGL.so ]
- then
- rm -f /usr/${LIBDIR}/libGL.so
- fi
- if [ -e /usr/${LIBDIR}/libGL.so.1 ]
- then
- rm -f /usr/${LIBDIR}/libGL.so.1
- fi
- if [ -e /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/libGL.so ]
- then
- realname="$(readlink /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/libGL.so)"
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libGL.so
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libGL.so.1
- fi
-
- # Setup the /usr/lib/libGLcore.so symlink
- if [ -e /usr/${LIBDIR}/libGLcore.so ]
- then
- rm -f /usr/${LIBDIR}/libGLcore.so
- fi
- if [ -e /usr/${LIBDIR}/libGLcore.so.1 ]
- then
- rm -f /usr/${LIBDIR}/libGLcore.so.1
- fi
- if [ -e /usr/${LIBDIR}/opengl/${GL_IMPLEM}/lib/libGLcore.so ]
- then
- realname="$(readlink /usr/${LIBDIR}/opengl/${GL_IMPLEM}/lib/libGLcore.so)"
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libGLcore.so
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libGLcore.so.1
- fi
-
- # Now setup the TLS library links
- if [ -e /usr/${LIBDIR}/libnvidia-tls.so ]
- then
- rm -f /usr/${LIBDIR}/libnvidia-tls.so
- fi
- if [ -e /usr/${LIBDIR}/libnvidia-tls.so.1 ]
- then
- rm -f /usr/${LIBDIR}/libnvidia-tls.so.1
- fi
- if [ -e /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/libnvidia-tls.so.1 ]
- then
- realtls="$(readlink /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/libnvidia-tls.so.1)"
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/${realtls} \
- /usr/${LIBDIR}/tls/libnvidia-tls.so
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/${realtls} \
- /usr/${LIBDIR}/tls/libnvidia-tls.so.1
- fi
- if [ -e /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/libnvidia-tls.so.1 ]
- then
- realname="$(readlink /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/libnvidia-tls.so.1)"
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libnvidia-tls.so
- ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/${realname} \
- /usr/${LIBDIR}/libnvidia-tls.so.1
- fi
- done
-
- # Setup the /usr/lib/libMesaGL.so symlink
- if [ -e /usr/lib/libMesaGL.so ]
- then
- rm -f /usr/lib/libMesaGL.so
- fi
- realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)"
- ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
- /usr/lib/libMesaGL.so
-
- # 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
- if [ "`grep -l /usr/lib/opengl *.la`" ]
- then
- sed -i 's:/usr/lib/opengl/[^/]*/lib:/usr/lib:' \
- `grep -l /usr/lib/opengl *.la`
- fi
- cd ${CURDIR}
-
- # Setup the /usr/lib/modules/extensions/libglx.so symlink
- if [ -e /usr/lib/modules/extensions/libglx.so ]
- then
- rm -f /usr/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/lib/modules/extensions/libglx.so
- fi
-
- #setup the /usr/lib/modules/extensions/libglx.a symlink
- if [ -e /usr/lib/modules/extensions/libglx.a ]
- then
- rm -f /usr/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/lib/modules/extensions/libglx.a
- fi
-
- #setup the includes
- for x in gl.h glx.h glxtokens.h glext.h
- do
- if [ -e /usr/X11R6/include/GL/${x} ]
- then
- rm -f /usr/X11R6/include/GL/${x}
- fi
-
- # IMPORTANT
- # It is preferable currently to use the standard glext.h file
- # however if an OpenGL provider must use a self produced glext.h
- # then it should be installed to ${GL_IMPLEM}/include
-
- if [ -e /usr/lib/opengl/${GL_IMPLEM}/include/${x} ]
- then
- ln -sf /usr/lib/opengl/${GL_IMPLEM}/include/${x} \
- /usr/X11R6/include/GL/${x}
- else
- ln -sf /usr/lib/opengl/global/include/${x} \
- /usr/X11R6/include/GL/${x}
- fi
- done
-
-eend 0
-
-# vim:ts=4
diff --git a/x11-base/opengl-update/opengl-update-1.7.2.ebuild b/x11-base/opengl-update/opengl-update-1.7.2.ebuild
deleted file mode 100644
index 7f54500f8ed0..000000000000
--- a/x11-base/opengl-update/opengl-update-1.7.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.7.2.ebuild,v 1.3 2005/01/20 17:36:34 fmccor 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 ppc64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_install() {
- newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-}
diff --git a/x11-base/opengl-update/opengl-update-1.8.2.ebuild b/x11-base/opengl-update/opengl-update-1.8.2.ebuild
deleted file mode 100644
index 108fa7979ff5..000000000000
--- a/x11-base/opengl-update/opengl-update-1.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.8.2.ebuild,v 1.2 2005/01/20 17:36:34 fmccor Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-GLEXT="20040830"
-SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/glext.h-${GLEXT}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 arm hppa ia64 s390 alpha ~mips ~ppc ~ppc64 sparc"
-IUSE=""
-
-DEPEND="virtual/libc
- app-arch/bzip2"
-
-pkg_setup() {
- # xfree has glext.h somewhere out of place so lets make the user move it
- if ( [ ! -h /usr/X11R6/include/GL/glext.h ] && [ -a /usr/X11R6/include/GL/glext.h ] )
- then
- # Just make it simpler on the user by giving verbose instructions
- if [ -d /usr/lib/opengl/xfree ]
- then
- GL_IM="xfree"
- else
- GL_IM="xorg-x11"
- fi
-
- echo
- ewarn "Due to inconsistencies in xorg-x11 vs xfree handling of glext.h a userspace"
- ewarn "fix is necessary for you to use opengl-update-1.8.1; Please do the following"
- echo
- ewarn "mv /usr/X11R6/include/GL/glext.h /usr/lib/opengl/${GL_IM}/include"
- echo
- ewarn "You may then remerge opengl-update-1.8.1 successfully"
- echo
-
- die "Userspace problem needs fixing"
- fi
-}
-
-src_unpack() {
- bzcat ${DISTDIR}/glext.h-${GLEXT}.bz2 > ${WORKDIR}/glext.h || die
-}
-
-src_install() {
- newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
- # Install default glext.h
- dodir /usr/lib/opengl/global/include
- insinto /usr/lib/opengl/global/include
- doins ${WORKDIR}/glext.h || die
-}
diff --git a/x11-base/opengl-update/opengl-update-2.0_pre5.ebuild b/x11-base/opengl-update/opengl-update-2.0_pre5.ebuild
deleted file mode 100644
index 630fdbac6591..000000000000
--- a/x11-base/opengl-update/opengl-update-2.0_pre5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.0_pre5.ebuild,v 1.3 2005/02/13 14:37:34 kloeri Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-GLEXT="20040830"
-SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/glext.h-${GLEXT}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
- app-arch/bzip2"
-
-pkg_setup() {
- # xfree has glext.h somewhere out of place so lets make the user move it
- if ( [ ! -h /usr/X11R6/include/GL/glext.h ] && [ -a /usr/X11R6/include/GL/glext.h ] )
- then
- # Just make it simpler on the user by giving verbose instructions
- if [ -d /usr/lib/opengl/xfree ]
- then
- GL_IM="xfree"
- else
- GL_IM="xorg-x11"
- fi
-
- echo
- ewarn "Due to inconsistencies in xorg-x11 vs xfree handling of glext.h a userspace"
- ewarn "is necessary for you to use opengl-update-1.8; Please do the following"
- echo
- ewarn "mv /usr/X11R6/include/GL/glext.h /usr/lib/opengl/${GL_IM}/include"
- echo
- ewarn "You may then remerge opengl-update-1.8.1 successfully"
- echo
-
- die "Userspace problem needs fixing"
- fi
-}
-
-src_unpack() {
- bzcat ${DISTDIR}/glext.h-${GLEXT}.bz2 > ${WORKDIR}/glext.h || die
-}
-
-src_install() {
- newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
- # Install default glext.h
- dodir /usr/lib/opengl/global/include
- insinto /usr/lib/opengl/global/include
- doins ${WORKDIR}/glext.h || die
-}
-
-pkg_postinst() {
- echo
- ewarn "This version will only work with >=x11-base/xorg-x11-6.8.0-r4."
- ewarn "Upgrade before running ${PN}."
- echo
-}