summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-02-09 07:53:31 +0000
committerTim Harder <radhermit@gentoo.org>2011-02-09 07:53:31 +0000
commitdb2956627873b62f5565f45b2b96381dba3f2118 (patch)
tree7b3d7e2bdb1d6bd6c119c5381bf73034139fd852 /media-libs
parentAdd less to RDEPEND and include a post-install message about optional depende... (diff)
downloadgentoo-2-db2956627873b62f5565f45b2b96381dba3f2118.tar.gz
gentoo-2-db2956627873b62f5565f45b2b96381dba3f2118.tar.bz2
gentoo-2-db2956627873b62f5565f45b2b96381dba3f2118.zip
Fix compile error when the imlib USE flag is selected and the X USE flag isn't.
(Portage version: 2.2.0_alpha22/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libcaca/ChangeLog6
-rw-r--r--media-libs/libcaca/libcaca-0.99_beta17.ebuild6
2 files changed, 10 insertions, 2 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index 48e21d25de84..e864781ab732 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libcaca
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.95 2011/01/29 19:59:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.96 2011/02/09 07:53:31 radhermit Exp $
+
+ 09 Feb 2011; Tim Harder <radhermit@gentoo.org> libcaca-0.99_beta17.ebuild:
+ Fix compile error when the imlib USE flag is selected and the X USE flag
+ isn't.
29 Jan 2011; Alexis Ballier <aballier@gentoo.org>
-libcaca-0.99_beta16.ebuild, -libcaca-0.99_beta16-r1.ebuild,
diff --git a/media-libs/libcaca/libcaca-0.99_beta17.ebuild b/media-libs/libcaca/libcaca-0.99_beta17.ebuild
index 2399cf6aef86..ca26b4398487 100644
--- a/media-libs/libcaca/libcaca-0.99_beta17.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.19 2011/01/20 18:23:14 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.20 2011/02/09 07:53:31 radhermit Exp $
EAPI=2
inherit autotools flag-o-matic mono multilib java-pkg-opt-2
@@ -52,6 +52,10 @@ src_prepare() {
sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
fi
+ if use imlib && ! use X; then
+ append-cflags -DX_DISPLAY_MISSING
+ fi
+
eautoreconf
java-pkg-opt-2_src_prepare