diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-04-09 17:58:38 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-04-09 17:58:38 +0000 |
| commit | 6afaae640482a573d393f6f51363f034957be5df (patch) | |
| tree | ea4159b9ba096af7a31086ecfa5a08e53ada3dd0 | |
| parent | Check whether the select OpenGL implem provides any libGL.so. (diff) | |
| download | eselect-6afaae640482a573d393f6f51363f034957be5df.tar.gz eselect-6afaae640482a573d393f6f51363f034957be5df.tar.bz2 eselect-6afaae640482a573d393f6f51363f034957be5df.zip | |
mesa.eselect: remove code from global scope, bug #362747
svn path=/trunk/extern/; revision=813
| -rw-r--r-- | modules/mesa.eselect | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/mesa.eselect b/modules/mesa.eselect index 582e44a..1748cd3 100644 --- a/modules/mesa.eselect +++ b/modules/mesa.eselect @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id: $ @@ -6,7 +6,7 @@ DESCRIPTION="Manage the OpenGL driver architecture used by media-libs/mesa" MAINTAINER="x11@gentoo.org" SVN_DATE='$Date: $' VERSION=$(svn_date_to_version "${SVN_DATE}" ) -EBUILD_VERSION="0.0.9" +EBUILD_VERSION="0.0.10" MESA_CONF_DIR="${EROOT}/usr/share/mesa" MESA_DIR_64="${EROOT}/usr/lib/mesa" @@ -14,8 +14,6 @@ DRI_DIR_64="${EROOT}/usr/lib/dri" MESA_DIR_32="${EROOT}/usr/lib32/mesa" DRI_DIR_32="${EROOT}/usr/lib32/dri" -source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" - # receives a filename of the driver as argument, outputs the architecture (classic or gallium) drivername_to_architecture() { local drivername=$1 @@ -99,6 +97,7 @@ doshow_helper() { } do_show() { + source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " doshow_helper MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " doshow_helper @@ -130,6 +129,7 @@ dolist_helper() { } do_list() { + source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " dolist_helper MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " dolist_helper @@ -199,6 +199,7 @@ doset_helper() { } do_set() { + source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" if [[ $1 == "64bit" ]]; then if [[ -d "${MESA_DIR_64}" && -d "${DRI_DIR_64}" ]]; then MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="$1 " doset_helper $2 $3 |