Fix dependencies.

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 5247204e27fac31617e582de1a2359828562fa26..2c924cf706dbe580f3961bf816698f6b22662d8a 100644 (file)
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_CAIRO
        select BR2_PACKAGE_PKGCONFIG
        select BR2_PACKAGE_LIBPNG
        select BR2_PACKAGE_ZLIB
+       select BR2_PACKAGE_PIXMAN
        select BR2_PACKAGE_FONTCONFIG
        depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
        help

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index f574e42afd0d307dee22baa589c67c20993136dc..396b8ebcdcc5e11b853cac666c77c3685c2d45c6 100644 (file)
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -41,15 +41,13 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
                ac_use_included_regex=no gl_cv_c_restrict=no \
                ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal
 
-CAIRO_CONF_OPT = --disable-gtk-doc --with-html-dir=/dev/null
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
-       CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb \
-               --disable-gtk-doc --with-html-dir=/dev/null
+       CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
        CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
+CAIRO_CONF_OPT += --disable-gtk-doc --with-html-dir=/dev/null
 
-
-CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 
+CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 
 
 $(eval $(call AUTOTARGETS,package,cairo))