summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-09-05 19:43:04 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-09-05 19:43:04 +0000
commit47eb49d1edde62a0f53ffb852eae48f846ba30c5 (patch)
tree9018949da972a6275e8da773117698e9ef9224eb /x11-base
parentAdding new version of GST. (diff)
downloadhistorical-47eb49d1edde62a0f53ffb852eae48f846ba30c5.tar.gz
historical-47eb49d1edde62a0f53ffb852eae48f846ba30c5.tar.bz2
historical-47eb49d1edde62a0f53ffb852eae48f846ba30c5.zip
Backported 2 bug fixes from eselect module. Fixed symlinks to tls libs and --impl-headers.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/opengl-update/ChangeLog12
-rw-r--r--x11-base/opengl-update/Manifest28
-rw-r--r--x11-base/opengl-update/files/digest-opengl-update-2.2.32
-rw-r--r--x11-base/opengl-update/files/digest-opengl-update-2.2.4 (renamed from x11-base/opengl-update/files/digest-opengl-update-2.2.3-r1)0
-rw-r--r--x11-base/opengl-update/files/opengl-update-2.1.1346
-rwxr-xr-xx11-base/opengl-update/files/opengl-update-2.2.2375
-rw-r--r--[-rwxr-xr-x]x11-base/opengl-update/files/opengl-update-2.2.4 (renamed from x11-base/opengl-update/files/opengl-update-2.2.3)5
-rw-r--r--x11-base/opengl-update/opengl-update-2.2.3.ebuild92
-rw-r--r--x11-base/opengl-update/opengl-update-2.2.4.ebuild (renamed from x11-base/opengl-update/opengl-update-2.2.3-r1.ebuild)2
9 files changed, 32 insertions, 830 deletions
diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index eeb572bf305e..59249f7e0016 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,16 @@
# 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.105 2005/08/27 04:36:11 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.106 2005/09/05 19:43:04 eradicator Exp $
+
+*opengl-update-2.2.4 (05 Sep 2005)
+
+ 05 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ -files/opengl-update-2.1.1, -files/opengl-update-2.2.2,
+ -files/opengl-update-2.2.3, +files/opengl-update-2.2.4,
+ -opengl-update-2.2.3.ebuild, -opengl-update-2.2.3-r1.ebuild,
+ +opengl-update-2.2.4.ebuild:
+ Backported 2 bug fixes from eselect module. Fixed symlinks to tls libs and
+ --impl-headers.
27 Aug 2005; MATSUU Takuto <matsuu@gentoo.org>
opengl-update-2.2.3-r1.ebuild:
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 730a8004d79b..212ef5814ccf 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,16 +1,22 @@
-MD5 9ee8e7fcccc74e1ee7e79a75cbeeb4ee opengl-update-2.2.3.ebuild 2671
-MD5 db92cb0513edb6b03efaaa4a5bba8e85 opengl-update-2.2.3-r1.ebuild 2583
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3932dfa473a6badae3b734e7cc7185ee ChangeLog 20014
+MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366
+MD5 f87231ba964818a1ad7eeea6dbd519b0 opengl-update-2.2.4.ebuild 2584
MD5 47e72283d661e1735ac1b23e65bebf74 opengl-update-2.2.1.ebuild 2661
MD5 4fe0e5469fe479fc9ad75aaacd6a4e8d opengl-update-3.0.0.ebuild 729
-MD5 93e6811eab306752f26079131d59ae0c ChangeLog 19611
-MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366
-MD5 600714175bf22abf40ed067b3dcb600d files/glxext.h-inttypes.patch 671
-MD5 91d9c17541be018d065a7838d7149c86 files/opengl-update-2.1.1 9110
+MD5 d6b4a7de2926d22a6b52f4d129ce3e7f files/digest-opengl-update-2.2.4 116
MD5 78f2778d5b41874016deb3135122b189 files/opengl-update-2.2.1 9849
-MD5 ae5b820a1034139870f7b0867f37be17 files/opengl-update-2.2.2 9702
-MD5 541a391b04dd49521480458bac48529d files/opengl-update-2.2.3 9859
-MD5 763717ca92a7b90da3ad6726770d2b77 files/opengl-update-3.0.0 4204
MD5 219a292f64caeaa46b333eecde2197f2 files/digest-opengl-update-2.2.1 116
-MD5 219a292f64caeaa46b333eecde2197f2 files/digest-opengl-update-2.2.3 116
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-3.0.0 0
-MD5 d6b4a7de2926d22a6b52f4d129ce3e7f files/digest-opengl-update-2.2.3-r1 116
+MD5 763717ca92a7b90da3ad6726770d2b77 files/opengl-update-3.0.0 4204
+MD5 23b30f7c0b9e658f78d0068999e68a80 files/opengl-update-2.2.4 9865
+MD5 600714175bf22abf40ed067b3dcb600d files/glxext.h-inttypes.patch 671
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHJ/kArHZZzCEUG0RArGlAJ44d56vSITTAxm13Gfx9+pvezY4ogCfcy2o
+63U7BOZiU8bQwkk3XGq2FQk=
+=ttd/
+-----END PGP SIGNATURE-----
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.2.3 b/x11-base/opengl-update/files/digest-opengl-update-2.2.3
deleted file mode 100644
index f25de9a2425e..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-2.2.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aba5f492425adddd083c941735b8e3c1 glext.h-27.bz2 33156
-MD5 3260a509b23a3519b8df335a4e8f5e1d glxext.h-10.bz2 5895
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.2.3-r1 b/x11-base/opengl-update/files/digest-opengl-update-2.2.4
index f4e7bd416303..f4e7bd416303 100644
--- a/x11-base/opengl-update/files/digest-opengl-update-2.2.3-r1
+++ b/x11-base/opengl-update/files/digest-opengl-update-2.2.4
diff --git a/x11-base/opengl-update/files/opengl-update-2.1.1 b/x11-base/opengl-update/files/opengl-update-2.1.1
deleted file mode 100644
index e18458af884a..000000000000
--- a/x11-base/opengl-update/files/opengl-update-2.1.1
+++ /dev/null
@@ -1,346 +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.1.1,v 1.3 2005/02/10 06:45:38 eradicator 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>
-# Further modifications by Jeremy Huddleston <eradicator@gentoo.org>
-
-. /etc/init.d/functions.sh
-
-hasq() {
- local x
-
- local me=${1}
- shift
-
- for x in "${@}"; do
- if [[ "${x}" == "${me}" ]]; then
- return 0
- fi
- done
- return 1
-}
-
-check_user() {
- if [[ $(id -u) -ne 0 ]]; then
- eerror "${0}: Must be run as root."
- exit 1
- fi
-}
-
-check_version() {
- if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then
- eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4"
- exit 1
- fi
-}
-
-get_current_implem() {
- local implem
- if [[ -f ${ENV_D} ]]; then
- source ${ENV_D}
- if [[ -n "${OPENGL_PROFILE}" ]]; then
- implem="${OPENGL_PROFILE}"
- elif [[ -n "${LDPATH}" ]]; then
- implem="${LDPATH%%:*}"
- implem="${implem##*opengl/}"
- implem="${implem%/lib*}"
- fi
- unset LDPATH
- unset OPENGL_PROFILE
- fi
-
- echo ${implem}
-}
-
-get_implementations() {
- local implems
- for dir in ${PREFIX}/lib{,32,64}/opengl/*; do
- if [[ -d "${dir}" && ${dir##*/} != "global" ]] && ! hasq ${dir##*/} ${implems}; then
- implems=${implems:+${implems} }${dir##*/}
- fi
- done
- echo ${implems}
-}
-
-usage() {
- # Get grammar right in message
- local IS_ARE IMPLEM_PLURAL
- if [[ $(echo ${AVAIL_IMPLEMS} | wc -w) -eq 1 ]]; then
- IS_ARE="is"
- IMPLEM_PLURAL=""
- else
- IS_ARE="are"
- IMPLEM_PLURAL="s"
- fi
-
- cat << FOO
-Usage: ${0##*/} [<options>] <GL implementation>
- Set the opengl implementation.
- Valid options:
- --use-old: only change the implementation if isn't already set.
- --prefix: set the source prefix (default: /usr)
- --dst-prefix: set the destination prefix (default: /usr)
-
-Usage: ${0##*/} --get-implementation
- Print the current implementaion
-
-Note:
- This utility switches between OpenGL implementations. There ${IS_ARE}
- $(echo ${AVAIL_IMPLEMS} | wc -w) available implementation${IMPLEM_PLURAL}: ${AVAIL_IMPLEMS}
-
-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
-}
-
-parse_options() {
- local opt
- while [[ ${#} -gt 0 ]]; do
- opt=${1}
- shift
- case ${opt} in
- --use-old)
- if [[ -n "${ACTION}" ]]; then
- ACTION="error"
- eerror "Invalid usage."
- else
- if [[ -n "${CURRENT_GL_IMPLEM}" ]] && hasq ${CURRENT_GL_IMPLEM} ${AVAIL_IMPLEMS}; then
- ACTION="nothing"
- fi
- fi
- ;;
- --get-implementation)
- if [[ -n "${ACTION}" ]]; then
- ACTION="error"
- eerror "Invalid usage."
- else
- ACTION="get-implementation"
- fi
- ;;
- --prefix=*)
- PREFIX=${opt#*=}
- AVAIL_IMPLEMS=$(get_implementations)
- ;;
- --dst-prefix=*)
- DST_PREFIX=${opt#*=}
- ;;
- --help|-h|-?)
- ACION="usage"
- ;;
- *)
- if hasq ${opt} ${AVAIL_IMPLEMS}; then
- NEW_GL_IMPLEM="${opt}"
- if [[ "${ACTION}" != "nothing" ]]; then
- if [[ -n "${ACTION}" ]]; then
- ACTION="error"
- eerror "Invalid usage."
- else
- ACTION="set-implementation"
- fi
- fi
- else
- eerror "Unrecognized option: ${opt}"
- ACTION="error"
- fi
- ;;
- esac
- done
-}
-
-set-new-implementation() {
- local GL_IMPLEM=${1}
- local GL_LOCAL
-
- check_version
- check_user
-
- if ! hasq ${GL_IMPLEM} ${AVAIL_IMPLEMS}; then
- eerror "Invalid profile selected."
- exit 1
- fi
-
- ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
- rm -f ${ENV_D} &> /dev/null
-
- LIBDIRS="lib32 lib lib64"
- for LIBDIR in ${LIBDIRS}; do
- # Special case handling of lib32 because it can be a symlink to
- # emul libs
- if [[ "${LIBDIR}" = "lib32" ]]; then
- [[ -d "${PREFIX}/${LIBDIR}/opengl" ]] || continue
- else
- [[ -d "${PREFIX}/${LIBDIR}/opengl" && ! -h "${PREFIX}/${LIBDIR}" ]] || continue
- fi
-
- # System wide tls stuff
- [[ -h "${DST_PREFIX}/${LIBDIR}/tls" ]] && rm -f ${DST_PREFIX}/${LIBDIR}/tls
- [[ -d "${DST_PREFIX}/${LIBDIR}/tls" ]] || mkdir -p ${DST_PREFIX}/${LIBDIR}/tls
-
- # Fallback on xorg-x11 if we don't have this implementation for this LIBDIR.
- if [[ ! -d ${PREFIX}/${LIBDIR}/opengl/"${GL_IMPLEM}" ]]; then
- GL_LOCAL="xorg-x11"
- else
- GL_LOCAL="${GL_IMPLEM}"
- fi
-
- # Provide the right libnvidia-tls depending on ntpl or not
- if [[ "${GL_LOCAL}" = "nvidia" ]]; then
- if [[ -e "${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]]; then
- rm -f ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls &> /dev/null
- fi
-
- if getconf GNU_LIBPTHREAD_VERSION | grep -qi nptl; then
- ln -sf ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/tls ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/lib/tls &> /dev/null
- fi
- fi
-
- mkdir -p ${DST_PREFIX}/${LIBDIR}
- pushd ${DST_PREFIX}/${LIBDIR} &> /dev/null
- # First remove old symlinks
- for file in libGL.so* libGLcore.so* libnvidia-tls.so* tls/libnvidia-tls.so*; do
- [[ -h ${file} ]] && rm -f ${file}
- done
-
- # Note that we don't do .so*, just .so on purpose. The
- # loader knows to look in the profile dir, and the
- # linked just needs the .so
- for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/*.{so,a,la}; do
- [[ -f "${file}" ]] || continue
- [[ -f "${file##*/}" ]] && rm -f ${file##*/}
-
- # Fix libtool archives (#48297)
- if [[ "${file%.la}" != "${file}" ]]; then
- sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/}
- else
- ln -s ${file}
- fi
- done
- popd &> /dev/null
-
- if [[ -e "${PREFIX}/${LIBDIR}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]]; then
- mkdir -p ${DST_PREFIX}/${LIBDIR}/tls
- pushd ${DST_PREFIX}/${LIBDIR}/tls &> /dev/null
- for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/*.{so,a,la}; do
- [[ -f "${file}" ]] || continue
- [[ -f "${file##*/}" ]] && rm -f ${file##*/}
-
- # Fix libtool archives (#48297)
- if [ "${file%.la}" != "${file}" ]; then
- sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/}
- else
- ln -s ${file}
- fi
- done
- popd &> /dev/null
- fi
-
- if [[ -e "${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/extensions" ]]; then
- mkdir -p ${DST_PREFIX}/${LIBDIR}/modules/extensions
- pushd ${DST_PREFIX}/${LIBDIR}/modules/extensions &> /dev/null
- # First remove old symlinks
- for file in libglx.so libglx.a; do
- [[ -h ${file} ]] && rm -f ${file}
- done
-
- for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/extensions/*.{so,a,la}; do
- [[ -f "${file}" ]] || continue
- [[ -f "${file##*/}" ]] && rm -f ${file##*/}
-
- # Fix libtool archives (#48297)
- if [[ "${file%.la}" != "${file}" ]]; then
- sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/}
- else
- ln -s ${file}
- fi
- done
- popd &> /dev/null
- fi
-
- # Setup the includes
- mkdir -p ${DST_PREFIX}/include/GL
- pushd ${DST_PREFIX}/include/GL &> /dev/null
- for file in gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h; do
- # 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 ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then
- [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
- ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file}
- elif [[ -e ${PREFIX}/${LIBDIR}/opengl/global/include/${file} ]]; then
- [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
- ln -s ${PREFIX}/${LIBDIR}/opengl/global/include/${file}
- elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} ]]; then
- [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
- ln -s ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file}
- fi
- done
- popd &> /dev/null
-
- # Setup the $LDPATH
- ldpath="${ldpath:+${ldpath}:}${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib"
-
- done
-
- echo "LDPATH=\"${ldpath}\"" > ${ENV_D}
- echo "OPENGL_PROFILE=\"${GL_IMPLEM}\"" >> ${ENV_D}
-
- env-update
-
- eend 0
-}
-
-ENV_D="/etc/env.d/03opengl"
-NEW_GL_IMPLEM=""
-ACTION=""
-PREFIX="/usr"
-DST_PREFIX="/usr"
-AVAIL_IMPLEMS=$(get_implementations)
-CURRENT_GL_IMPLEM=$(get_current_implem)
-
-parse_options ${@}
-
-case ${ACTION} in
- get-implementation)
- if [[ -n "${CURRENT_GL_IMPLEM}" ]]; then
- echo ${CURRENT_GL_IMPLEM}
- exit 0
- else
- exit 2
- fi
- ;;
- set-implementation)
- if [[ -n "${NEW_GL_IMPLEM}" ]]; then
- set-new-implementation ${NEW_GL_IMPLEM}
- exit $?
- else
- usage
- exit 1
- fi
- ;;
- nothing)
- exit 0
- ;;
- usage)
- usage
- exit 0
- ;;
- error)
- usage
- exit 1
- ;;
- *)
- usage
- exit 1
- ;;
-esac
diff --git a/x11-base/opengl-update/files/opengl-update-2.2.2 b/x11-base/opengl-update/files/opengl-update-2.2.2
deleted file mode 100755
index ddc3512381a3..000000000000
--- a/x11-base/opengl-update/files/opengl-update-2.2.2
+++ /dev/null
@@ -1,375 +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.2.2,v 1.1 2005/08/10 06:39:34 spyderous 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>
-# Further modifications by Jeremy Huddleston <eradicator@gentoo.org>
-
-. /etc/init.d/functions.sh
-
-hasq() {
- local x
-
- local me=${1}
- shift
-
- for x in "${@}"; do
- if [[ "${x}" == "${me}" ]]; then
- return 0
- fi
- done
- return 1
-}
-
-check_user() {
- if [[ $(id -u) -ne 0 ]]; then
- eerror "${0}: Must be run as root."
- exit 1
- fi
-}
-
-check_version() {
- if portageq has_version / 'x11-base/xorg-x11'; then
- if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then
- eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4"
- exit 1
- fi
- fi
-}
-
-get_current_implem() {
- local implem
- if [[ -f ${ENV_D} ]]; then
- source ${ENV_D}
- if [[ -n "${OPENGL_PROFILE}" ]]; then
- implem="${OPENGL_PROFILE}"
- elif [[ -n "${LDPATH}" ]]; then
- implem="${LDPATH%%:*}"
- implem="${implem##*opengl/}"
- implem="${implem%/lib*}"
- fi
- unset LDPATH
- unset OPENGL_PROFILE
- fi
-
- echo ${implem}
-}
-
-get_implementations() {
- local implems
- for dir in ${PREFIX}/lib{,32,64}/opengl/*; do
- if [[ -d "${dir}" && ${dir##*/} != "global" ]] && ! hasq ${dir##*/} ${implems}; then
- implems=${implems:+${implems} }${dir##*/}
- fi
- done
- echo ${implems}
-}
-
-print_version() {
- echo "opengl-update ${VERSION}"
-}
-
-print_usage() {
- # Get grammar right in message
- local IS_ARE IMPLEM_PLURAL
- if [[ $(echo ${AVAIL_IMPLEMS} | wc -w) -eq 1 ]]; then
- IS_ARE="is"
- IMPLEM_PLURAL=""
- else
- IS_ARE="are"
- IMPLEM_PLURAL="s"
- fi
-
- print_version
-
- cat << FOO
-Usage: ${0##*/} [<options>] <GL implementation>
- Set the opengl implementation.
- Valid options:
- --use-old: If an implementation is already set, use that one.
- --prefix=<val>: Set the source prefix (default: /usr)
- --dst-prefix=<val>: Set the destination prefix (default: /usr)
- --impl-headers: Use headers provided by this implementation to
- override golbal ones provided by opengl-update.
-
-Usage: ${0##*/} --get-implementation
- Print the current implementaion
-
-Notes:
- --impl-headers was default in <opengl-update-2.2.
-
- This utility switches between OpenGL implementations. There ${IS_ARE}
- $(echo ${AVAIL_IMPLEMS} | wc -w) available implementation${IMPLEM_PLURAL}: ${AVAIL_IMPLEMS}
-
-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
-}
-
-parse_options() {
- local opt
- while [[ ${#} -gt 0 ]]; do
- opt=${1}
- shift
- case ${opt} in
- --use-old)
- if [[ -n "${ACTION}" ]]; then
- ACTION="error"
- eerror "Invalid usage."
- else
- if [[ -n "${CURRENT_GL_IMPLEM}" ]] && hasq ${CURRENT_GL_IMPLEM} ${AVAIL_IMPLEMS}; then
- ACTION="old-implementation"
- fi
- fi
- ;;
- --get-implementation)
- if [[ -n "${ACTION}" ]]; then
- ACTION="error"
- eerror "Invalid usage."
- else
- ACTION="get-implementation"
- fi
- ;;
- --prefix=*)
- PREFIX=${opt#*=}
- AVAIL_IMPLEMS=$(get_implementations)
- ;;
- --dst-prefix=*)
- DST_PREFIX=${opt#*=}
- ;;
- --impl-headers)
- USE_PROFILE_HEADERS="yes"
- ;;
- --help|-h|-?)
- ACION="usage"
- ;;
- --version)
- ACTION="version"
- ;;
- *)
- if hasq ${opt} ${AVAIL_IMPLEMS}; then
- if [[ "${ACTION}" != "old-implementation" ]]; then
- if [[ -n "${ACTION}" ]]; then
- ACTION="error"
- eerror "Invalid usage."
- else
- ACTION="set-implementation"
- NEW_GL_IMPLEM="${opt}"
- fi
- fi
- else
- eerror "Unrecognized option: ${opt}"
- ACTION="error"
- fi
- ;;
- esac
- done
-}
-
-set-new-implementation() {
- local GL_IMPLEM=${1}
- local GL_LOCAL
-
- check_version
- check_user
-
- # Set a sane umask... bug #83115
- umask 022
-
- if ! hasq ${GL_IMPLEM} ${AVAIL_IMPLEMS}; then
- eerror "Invalid profile selected."
- exit 1
- fi
-
- ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
- rm -f ${ENV_D} &> /dev/null
-
- LIBDIRS="lib32 lib lib64"
- for LIBDIR in ${LIBDIRS}; do
- # Special case handling of lib32 because it can be a symlink to
- # emul libs
- if [[ "${LIBDIR}" = "lib32" ]]; then
- [[ -d "${PREFIX}/${LIBDIR}/opengl" ]] || continue
- else
- [[ -d "${PREFIX}/${LIBDIR}/opengl" && ! -h "${PREFIX}/${LIBDIR}" ]] || continue
- fi
-
- # Fallback on xorg-x11 if we don't have this implementation for this LIBDIR.
- if [[ ! -d ${PREFIX}/${LIBDIR}/opengl/"${GL_IMPLEM}" ]]; then
- GL_LOCAL="xorg-x11"
- else
- GL_LOCAL="${GL_IMPLEM}"
- fi
-
- mkdir -p ${DST_PREFIX}/${LIBDIR}
- pushd ${DST_PREFIX}/${LIBDIR} &> /dev/null
- # First remove old symlinks
- for file in libGL{,core}.{a,so,la} ; do
- [[ -h ${file} ]] && rm -f ${file}
- done
-
- # Note that we don't do .so*, just .so on purpose. The
- # loader knows to look in the profile dir, and the
- # linked just needs the .so
- for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/libGL{,core}.{so,a,la}; do
- [[ -f "${file}" ]] || continue
- [[ -f "${file##*/}" ]] && rm -f ${file##*/}
-
- # Fix libtool archives (#48297)
- if [[ "${file%.la}" != "${file}" ]]; then
- sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/}
- else
- ln -s ${file}
- fi
- done
- popd &> /dev/null
-
- if [[ -e "${PREFIX}/${LIBDIR}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]]; then
- mkdir -p ${DST_PREFIX}/${LIBDIR}/tls
- pushd ${DST_PREFIX}/${LIBDIR}/tls &> /dev/null
- # First remove old symlinks
- for file in libGL{,core}.{a,so,la} ; do
- [[ -h ${file} ]] && rm -f ${file}
- done
-
- for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/libGL{,core}.{so,a,la}; do
- [[ -f "${file}" ]] || continue
- [[ -f "${file##*/}" ]] && rm -f ${file##*/}
-
- # Fix libtool archives (#48297)
- if [ "${file%.la}" != "${file}" ]; then
- sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/}
- else
- ln -s ${file}
- fi
- done
- popd &> /dev/null
- fi
-
- if [[ -e "${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/extensions" ]]; then
- mkdir -p ${DST_PREFIX}/${LIBDIR}/modules/extensions
- pushd ${DST_PREFIX}/${LIBDIR}/modules/extensions &> /dev/null
- # First remove old symlinks
- for file in libglx.so libglx.a; do
- [[ -h ${file} ]] && rm -f ${file}
- done
-
- for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/extensions/*.{so,a,la}; do
- [[ -f "${file}" ]] || continue
- [[ -f "${file##*/}" ]] && rm -f ${file##*/}
-
- # Fix libtool archives (#48297)
- if [[ "${file%.la}" != "${file}" ]]; then
- sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/}
- else
- ln -s ${file}
- fi
- done
- popd &> /dev/null
- fi
-
- # Setup the includes
- mkdir -p ${DST_PREFIX}/include/GL
- pushd ${DST_PREFIX}/include/GL &> /dev/null
- for file in gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h; do
- # 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 and the user
- # can add the --impl-headers option to select it.
-
- if [[ ${USE_PROFILE_HEADERS} == "yes" ]] ; then
- # Check the profile first.
- if [[ -e ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then
- [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
- ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file}
- fi
- fi
-
- if [[ -e ${PREFIX}/${LIBDIR}/opengl/global/include/${file} ]]; then
- [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
- ln -s ${PREFIX}/${LIBDIR}/opengl/global/include/${file}
- elif [[ -e ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then
- [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
- ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file}
- elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} ]]; then
- [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
- ln -s ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file}
- fi
- done
- popd &> /dev/null
-
- # Setup the $LDPATH
- ldpath="${ldpath:+${ldpath}:}${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib"
-
- done
-
- echo "LDPATH=\"${ldpath}\"" > ${ENV_D}
- echo "OPENGL_PROFILE=\"${GL_IMPLEM}\"" >> ${ENV_D}
-
- env-update
-
- eend 0
-}
-
-## START PROGRAM ##
-
-ENV_D="/etc/env.d/03opengl"
-NEW_GL_IMPLEM=""
-ACTION=""
-PREFIX="/usr"
-DST_PREFIX="/usr"
-AVAIL_IMPLEMS=$(get_implementations)
-CURRENT_GL_IMPLEM=$(get_current_implem)
-USE_PROFILE_HEADERS="no"
-VERSION="2.2.1"
-
-parse_options ${@}
-
-case ${ACTION} in
- get-implementation)
- if [[ -n "${CURRENT_GL_IMPLEM}" ]]; then
- echo ${CURRENT_GL_IMPLEM}
- exit 0
- else
- exit 2
- fi
- ;;
- old-implementation)
- set-new-implementation ${CURRENT_GL_IMPLEM}
- exit $?
- ;;
- set-implementation)
- if [[ -n "${NEW_GL_IMPLEM}" ]]; then
- set-new-implementation ${NEW_GL_IMPLEM}
- exit $?
- else
- print_usage
- exit 1
- fi
- ;;
- version)
- print_version
- exit 0
- ;;
- usage)
- print_usage
- exit 0
- ;;
- error)
- print_usage
- exit 1
- ;;
- *)
- print_usage
- exit 1
- ;;
-esac
diff --git a/x11-base/opengl-update/files/opengl-update-2.2.3 b/x11-base/opengl-update/files/opengl-update-2.2.4
index 41b96cd45643..cf4d149d922b 100755..100644
--- a/x11-base/opengl-update/files/opengl-update-2.2.3
+++ b/x11-base/opengl-update/files/opengl-update-2.2.4
@@ -1,7 +1,7 @@
#!/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.2.3,v 1.1 2005/08/12 22:33:47 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.4,v 1.1 2005/09/05 19:43:04 eradicator 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>
@@ -232,7 +232,7 @@ set-new-implementation() {
done
popd &> /dev/null
- if [[ -e "${PREFIX}/${LIBDIR}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]]; then
+ if [[ -e "${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]]; then
mkdir -p ${DST_PREFIX}/${LIBDIR}/tls
pushd ${DST_PREFIX}/${LIBDIR}/tls &> /dev/null
# First remove old symlinks
@@ -299,6 +299,7 @@ set-new-implementation() {
[[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file}
fi
+ continue
fi
if [[ -e ${PREFIX}/${LIBDIR}/opengl/global/include/${file} ]]; then
diff --git a/x11-base/opengl-update/opengl-update-2.2.3.ebuild b/x11-base/opengl-update/opengl-update-2.2.3.ebuild
deleted file mode 100644
index 272493c99218..000000000000
--- a/x11-base/opengl-update/opengl-update-2.2.3.ebuild
+++ /dev/null
@@ -1,92 +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.2.3.ebuild,v 1.2 2005/08/13 07:42:36 eradicator Exp $
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-
-# Source:
-# http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# http://oss.sgi.com/projects/ogl-sample/ABI/glxext.h
-
-GLEXT="27"
-GLXEXT="10"
-
-SRC_URI="http://dev.gentoo.org/~eradicator/opengl/glext.h-${GLEXT}.bz2
- http://dev.gentoo.org/~eradicator/opengl/glxext.h-${GLXEXT}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-RESTRICT="multilib-pkg-force"
-
-DEPEND="virtual/libc
- app-arch/bzip2"
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack ${A}
-
- mv glext.h-${GLEXT} glext.h
- mv glxext.h-${GLXEXT} glxext.h
-
- # Bugs #81199, #81472
- epatch ${FILESDIR}/glxext.h-inttypes.patch
-}
-
-pkg_preinst() {
- # It needs to be before 04multilib
- [ -f "${ROOT}/etc/env.d/09opengl" ] && mv ${ROOT}/etc/env.d/09opengl ${ROOT}/etc/env.d/03opengl
-
- OABI="${ABI}"
- for ABI in $(get_install_abis); do
- if [ -e "${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so" ]; then
- einfo "Removing libMesaGL.so from xorg-x11 profile. See bug #47598."
- rm -f ${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so
- fi
- if [ -e "${ROOT}/usr/$(get_libdir)/libMesaGL.so" ]; then
- einfo "Removing libMesaGL.so from /usr/$(get_libdir). See bug #47598."
- rm -f ${ROOT}/usr/$(get_libdir)/libMesaGL.so
- fi
-
- for f in ${ROOT}/usr/$(get_libdir)/libGL.so.* ${ROOT}/usr/$(get_libdir)/libGLcore.so.* ${ROOT}/usr/$(get_libdir)/libnvidia-tls* ${ROOT}/usr/$(get_libdir)/tls/libnvidia-tls* ; do
- [[ -e ${f} ]] && rm -f ${f}
- done
- done
- ABI="${OABI}"
- unset OABI
-}
-
-pkg_postinst() {
- local impl="$(opengl-update --get-implementation)"
- if [[ -n "${impl}" ]] ; then
- opengl-update "${impl}"
- fi
-}
-
-src_install() {
- newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
- # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
- local MLTEST=$(type dyn_unpack)
- if has_multilib_profile && [ "${MLTEST/set_abi}" = "${MLTEST}" ]; then
- OABI="${ABI}"
- for ABI in $(get_install_abis); do
- # Install default glext.h
- insinto /usr/$(get_libdir)/opengl/global/include
- doins ${WORKDIR}/glext.h || die
- doins ${WORKDIR}/glxext.h || die
- done
- ABI="${OABI}"
- unset OABI
- else
- # Install default glext.h
- insinto /usr/$(get_libdir)/opengl/global/include
- doins ${WORKDIR}/glext.h || die
- doins ${WORKDIR}/glxext.h || die
- fi
-}
diff --git a/x11-base/opengl-update/opengl-update-2.2.3-r1.ebuild b/x11-base/opengl-update/opengl-update-2.2.4.ebuild
index 599031c3a485..9fb6c327eb5d 100644
--- a/x11-base/opengl-update/opengl-update-2.2.3-r1.ebuild
+++ b/x11-base/opengl-update/opengl-update-2.2.4.ebuild
@@ -1,6 +1,6 @@
# 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.2.3-r1.ebuild,v 1.2 2005/08/27 04:36:11 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.2.4.ebuild,v 1.1 2005/09/05 19:43:04 eradicator Exp $
inherit multilib