summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-02-23 01:06:11 +0000
committerMike Frysinger <vapier@gentoo.org>2004-02-23 01:06:11 +0000
commitc170685ed9826a47cd052fc9d10a2d2b0cc3e5fb (patch)
tree5c1a84dc2dc49a068196c0f2b152f9493d2934cb /media-libs/giblib
parentChanged the emake to (probably) solve bug #30798. (Manifest recommit) (diff)
downloadgentoo-2-c170685ed9826a47cd052fc9d10a2d2b0cc3e5fb.tar.gz
gentoo-2-c170685ed9826a47cd052fc9d10a2d2b0cc3e5fb.tar.bz2
gentoo-2-c170685ed9826a47cd052fc9d10a2d2b0cc3e5fb.zip
add checks to make sure imlib2 was built with X support #41445
Diffstat (limited to 'media-libs/giblib')
-rw-r--r--media-libs/giblib/ChangeLog5
-rw-r--r--media-libs/giblib/files/imlib-x-test.c3
-rw-r--r--media-libs/giblib/giblib-1.2.3.ebuild17
3 files changed, 15 insertions, 10 deletions
diff --git a/media-libs/giblib/ChangeLog b/media-libs/giblib/ChangeLog
index 14886e68f67b..657f2ade462a 100644
--- a/media-libs/giblib/ChangeLog
+++ b/media-libs/giblib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/giblib
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/ChangeLog,v 1.9 2003/10/19 14:11:51 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/ChangeLog,v 1.10 2004/02/23 01:06:11 vapier Exp $
+
+ 22 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+ Add logic to handle when imlib2 has been built w/out X support #41445.
19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> giblib-1.2.1.ebuild,
giblib-1.2.2.ebuild:
diff --git a/media-libs/giblib/files/imlib-x-test.c b/media-libs/giblib/files/imlib-x-test.c
new file mode 100644
index 000000000000..ce8efa5de945
--- /dev/null
+++ b/media-libs/giblib/files/imlib-x-test.c
@@ -0,0 +1,3 @@
+#include <X11/Xlib.h>
+#include <Imlib2.h>
+int main(){imlib_context_set_display(0);}
diff --git a/media-libs/giblib/giblib-1.2.3.ebuild b/media-libs/giblib/giblib-1.2.3.ebuild
index 5170ce82113c..0daa606de66c 100644
--- a/media-libs/giblib/giblib-1.2.3.ebuild
+++ b/media-libs/giblib/giblib-1.2.3.ebuild
@@ -1,26 +1,25 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/giblib-1.2.3.ebuild,v 1.1 2003/10/19 14:11:51 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/giblib-1.2.3.ebuild,v 1.2 2004/02/23 01:06:11 vapier Exp $
-S=${WORKDIR}/${P}
DESCRIPTION="Giblib, graphics library"
HOMEPAGE="http://www.linuxbrit.co.uk/"
SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
-SLOT="0"
LICENSE="as-is | BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~alpha"
DEPEND=">=media-libs/imlib2-1.0.3
>=media-libs/freetype-2.0"
-RDEPEND="$DEPEND"
-src_compile() {
- econf || die
- emake || die
+pkg_setup() {
+ cd ${T}
+ $(gcc-getCC) ${FILESDIR}/imlib-x-test.c `imlib2-config --libs` `imlib2-config --cflags` \
+ || die "You need to re-emerge Imlib2 with USE=X"
}
-src_install () {
+src_install() {
make prefix=${D}/usr install || die
rm -rf ${D}/usr/doc
dodoc README AUTHORS ChangeLog