Fix #3584, when building cairo with DirectFB, depend on DirectFB

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 9f975c39ea51d7ddd5a98aa72bb4fd8e504ffdc7..8390630f00ff0c8e8d91a065ffa5181c4a08c007 100644 (file)
--- 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 60a34a1aefb19f2bc14ec7dd33fdf76ae3597a49..c712567cc289b6bca92f9509b5bf9c3a6908cfc4 100644 (file)
--- 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))