summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2005-03-03 21:51:51 +0000
committerLuca Barbato <lu_zero@gentoo.org>2005-03-03 21:51:51 +0000
commit53e3692cf970a3056a0c5dc3a92396df6d383707 (patch)
tree2cde56b10731182029a5e98cf260fbad76abdcac /x11-base
parentFix dos line endings (diff)
downloadgentoo-2-53e3692cf970a3056a0c5dc3a92396df6d383707.tar.gz
gentoo-2-53e3692cf970a3056a0c5dc3a92396df6d383707.tar.bz2
gentoo-2-53e3692cf970a3056a0c5dc3a92396df6d383707.zip
opengl fix
(Portage version: 2.0.51.18)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog5
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.2.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 476e08a615ae..48f20e01183d 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.342 2005/02/26 23:55:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.343 2005/03/03 21:51:51 lu_zero Exp $
+
+ 02 Mar 2005; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.8.2.ebuild:
+ Different switch_opengl_implem logic, should fix bug #83645
26 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
-xorg-x11-6.8.1.901-r1.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild
index a02dbbfad605..52231959d0b2 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2.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/xorg-x11/xorg-x11-6.8.2.ebuild,v 1.11 2005/02/26 00:50:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild,v 1.12 2005/03/03 21:51:51 lu_zero Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -1901,10 +1901,11 @@ switch_opengl_implem() {
# Use new opengl-update that will not reset user selected
# OpenGL interface ...
echo
- if [ "$(${ROOT}/usr/sbin/opengl-update --get-implementation)" = "xfree" ]; then
+ local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
+ if [ "${opengl_implem}" = "xfree" -o -z "${opengl_implem}" ]; then
${ROOT}/usr/sbin/opengl-update ${PN}
else
- ${ROOT}/usr/sbin/opengl-update --use-old ${PN}
+ ${ROOT}/usr/sbin/opengl-update ${opengl_implem}
fi
}