diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2004-05-29 07:41:57 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2004-05-29 07:41:57 +0000 |
| commit | 87d583f3d744dd2821451b84d4db5f373454a6d1 (patch) | |
| tree | e74f9cf00377db0acc26a7563b131187624af4a1 /x11-base | |
| parent | Need to force this to stable for amd64 so everybody else works properly. (diff) | |
| download | historical-87d583f3d744dd2821451b84d4db5f373454a6d1.tar.gz historical-87d583f3d744dd2821451b84d4db5f373454a6d1.tar.bz2 historical-87d583f3d744dd2821451b84d4db5f373454a6d1.zip | |
Force opengl-update to change to xorg-x11 if xfree is currently selected, else default to old behavior.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.0.ebuild | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index c51eb8c086cf..0ed3dbf27699 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.39 2004/05/28 08:37:52 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.40 2004/05/29 07:41:57 spyderous Exp $ + + 29 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild: + Force opengl-update to change to xorg-x11 if xfree is currently selected, else + default to old behavior. 28 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild: PATCH_VER 0.7. Add 9860_all_xorg-xkb_winkeys.patch to fix broken windows keys diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild index 3d3a03eb7677..920e7edc0b59 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.40 2004/05/28 08:37:52 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.41 2004/05/29 07:41:57 spyderous Exp $ # This is a snapshot of the XORG-RELEASE-1 branch. @@ -132,7 +132,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3 >=dev-libs/expat-1.95.3 >=media-libs/freetype-2.1.4 >=media-libs/fontconfig-2.1-r1 - >=x11-base/opengl-update-1.4 + >=x11-base/opengl-update-1.7 >=x11-misc/ttmkfdir-3.0.4 >=sys-apps/sed-4 sys-apps/util-linux @@ -1232,7 +1232,13 @@ pkg_postinst() { # Switch to the xorg implementation. # Use new opengl-update that will not reset user selected # OpenGL interface ... - echo; ${ROOT}/usr/sbin/opengl-update --use-old ${PN} + echo + if [ "`${ROOT}/usr/sbin/opengl-update --get-implementation`" = "xfree" ] + then + ${ROOT}/usr/sbin/opengl-update ${PN} + else + ${ROOT}/usr/sbin/opengl-update --use-old ${PN} + fi fi for x in $(find ${ROOT}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d) |