summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2007-06-15 19:00:22 +0000
committerDoug Goldstein <cardoe@gentoo.org>2007-06-15 19:00:22 +0000
commit66ccabe4692a0a757862312d8eccec2d11b4accc (patch)
tree106b5bda6c73e78f5471db10d0f39f98df9329b7 /x11-libs/cairo
parentStable on amd64 wrt security bug 180436 (diff)
downloadgentoo-2-66ccabe4692a0a757862312d8eccec2d11b4accc.tar.gz
gentoo-2-66ccabe4692a0a757862312d8eccec2d11b4accc.tar.bz2
gentoo-2-66ccabe4692a0a757862312d8eccec2d11b4accc.zip
Add support for using libglitz-glx instead of plain libglitz via USE='glitz opengl'
(Portage version: 2.1.2.9)
Diffstat (limited to 'x11-libs/cairo')
-rw-r--r--x11-libs/cairo/ChangeLog6
-rw-r--r--x11-libs/cairo/cairo-1.4.8.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index e78c36173ea5..ff96a07afc6a 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/cairo
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.130 2007/06/14 14:21:20 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.131 2007/06/15 19:00:22 cardoe Exp $
+
+ 15 Jun 2007; Doug Goldstein <cardoe@gentoo.org> cairo-1.4.8.ebuild:
+ Add support for using libglitz-glx instead of plain libglitz via USE='glitz
+ opengl'
14 Jun 2007; Daniel Gryniewicz <dang@gentoo.org> cairo-1.4.6.ebuild:
Marked stable on amd64 for bug #176367
diff --git a/x11-libs/cairo/cairo-1.4.8.ebuild b/x11-libs/cairo/cairo-1.4.8.ebuild
index 7bd97a47ea50..423b06862412 100644
--- a/x11-libs/cairo/cairo-1.4.8.ebuild
+++ b/x11-libs/cairo/cairo-1.4.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.8.ebuild,v 1.2 2007/06/15 16:36:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.8.ebuild,v 1.3 2007/06/15 19:00:22 cardoe Exp $
inherit eutils flag-o-matic libtool
@@ -11,7 +11,7 @@ SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz svg X xcb"
+IUSE="debug directfb doc glitz opengl svg X xcb"
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
RESTRICT="test"
@@ -54,6 +54,10 @@ src_compile() {
#gets rid of fbmmx.c inlining warnings
append-flags -finline-limit=1200
+ if use glitz && use opengl; then
+ export glitz_LIBS=-lglitz-glx
+ fi
+
econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
$(use_enable svg) $(use_enable glitz) \
$(use_enable debug test-surfaces) --enable-pdf --enable-png \