summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-08-20 19:57:52 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-08-20 19:57:52 +0000
commit1f25eee4f7d00707e5acf96ed5a1f9b47cd9fa51 (patch)
treee36c47900f05b32b79c51d91d926e4d45e46b01d /media-libs
parentFixed ipv6 problems, bug #95530. Ebuild rewrite. Thanks aye in bug #101259 (diff)
downloadgentoo-2-1f25eee4f7d00707e5acf96ed5a1f9b47cd9fa51.tar.gz
gentoo-2-1f25eee4f7d00707e5acf96ed5a1f9b47cd9fa51.tar.bz2
gentoo-2-1f25eee4f7d00707e5acf96ed5a1f9b47cd9fa51.zip
Stop installing glut headers to avoid conflicts with virtual/glut providers. Reported by Andrej Kacian <ticho@gentoo.org>.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/mesa/ChangeLog7
-rw-r--r--media-libs/mesa/mesa-6.3.1.1-r3.ebuild5
2 files changed, 10 insertions, 2 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index ae7d234f6fcb..516f58a27cb1 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/mesa
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.30 2005/08/17 16:37:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.31 2005/08/20 19:57:52 spyderous Exp $
+
+ 20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ mesa-6.3.1.1-r3.ebuild:
+ Stop installing glut headers to avoid conflicts with virtual/glut providers.
+ Reported by Andrej Kacian <ticho@gentoo.org>.
17 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
mesa-6.3.1.1-r3.ebuild:
diff --git a/media-libs/mesa/mesa-6.3.1.1-r3.ebuild b/media-libs/mesa/mesa-6.3.1.1-r3.ebuild
index 125f8070d496..62b8088d8db7 100644
--- a/media-libs/mesa/mesa-6.3.1.1-r3.ebuild
+++ b/media-libs/mesa/mesa-6.3.1.1-r3.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/media-libs/mesa/mesa-6.3.1.1-r3.ebuild,v 1.3 2005/08/17 16:37:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.3.1.1-r3.ebuild,v 1.4 2005/08/20 19:57:52 spyderous Exp $
inherit eutils toolchain-funcs multilib
@@ -88,6 +88,9 @@ src_unpack() {
# Remove EGL, since Brian Paul says it's not ready for a release
echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+ # Get rid of glut includes
+ rm -f ${S}/include/GL/glut*h
+
# r200 breaks without this, since it's the only EGL-enabled driver so far
echo "USING_EGL = 0" >> ${HOSTCONF}