summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2006-05-14 22:52:32 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2006-05-14 22:52:32 +0000
commite718d476bb9e2e9a233c0bc224b8c1065ad536df (patch)
tree747a955282a7e54ed55363a5a5c7f16ca447bed0
parentNew release: 0.4.0. Pruning old ebuilds. (diff)
downloadgentoo-2-e718d476bb9e2e9a233c0bc224b8c1065ad536df.tar.gz
gentoo-2-e718d476bb9e2e9a233c0bc224b8c1065ad536df.tar.bz2
gentoo-2-e718d476bb9e2e9a233c0bc224b8c1065ad536df.zip
Force on xorg-x11 opengl implem for compile, to ensure we have recent enough glxtokens.h. Reported by johey on freenode.
(Portage version: 2.1_pre10-r5)
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild10
2 files changed, 14 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 34a32c3c93c3..98107edde9af 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.119 2006/05/14 22:16:51 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.120 2006/05/14 22:52:32 spyderous Exp $
+
+ 14 May 2006; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-server-1.0.2-r4.ebuild:
+ Force on xorg-x11 opengl implem for compile, to ensure we have recent enough
+ glxtokens.h. Reported by johey on freenode.
14 May 2006; Donnie Berkholz <spyderous@gentoo.org>;
xorg-server-1.0.99.903.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild
index 4295386f3dcd..c350c0e712e4 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild,v 1.3 2006/05/14 19:11:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r4.ebuild,v 1.4 2006/05/14 22:52:32 spyderous Exp $
# Must be before x-modular eclass is inherited
# Hack to make sure autoreconf gets run
@@ -129,6 +129,11 @@ pkg_setup() {
# (#121394) Causes window corruption
filter-flags -fweb
+
+ # Nothing else provides new enough glxtokens.h
+ ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+ OLD_IMPLEM="$(eselect opengl show)"
+ eselect opengl set --impl-headers ${OPENGL_DIR}
}
src_install() {
@@ -170,7 +175,8 @@ switch_opengl_implem() {
# Use new opengl-update that will not reset user selected
# OpenGL interface ...
echo
- eselect opengl set --use-old ${OPENGL_DIR}
+# eselect opengl set --use-old ${OPENGL_DIR}
+ eselect opengl set ${OLD_IMPLEM}
}
xprint_src_install() {