From 6bab53cb89f44e442adcefa4e04e14341cf0c730 Mon Sep 17 00:00:00 2001 From: "Thiago A. Corrêa" Date: Sat, 5 Jul 2008 15:14:11 +0000 Subject: Fix #3584, when building cairo with DirectFB, depend on DirectFB --- package/cairo/Config.in | 2 +- package/cairo/cairo.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'package/cairo') diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 9f975c39e..8390630f0 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_ZLIB select BR2_PACKAGE_FONTCONFIG - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX + depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB help Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 60a34a1ae..c712567cc 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -43,8 +43,9 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ifeq ($(BR2_PACKAGE_DIRECTFB),y) CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb + CAIRO_DEPENDENCIES_EXTRA = directfb endif -CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib png fontconfig $(XSERVER) +CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib png fontconfig $(CAIRO_DEPENDENCIES_EXTRA) $(XSERVER) $(eval $(call AUTOTARGETS,package,cairo)) -- cgit v1.2.3