From patchwork Tue Nov 8 11:15:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/7] cairo: Fix bug 1674 Date: Tue, 08 Nov 2011 11:15:50 -0000 From: Xiaofeng Yan X-Patchwork-Id: 14495 Message-Id: To: From: Xiaofeng Yan [YOCTO #1674] Image "gtk+ over directfb" doesn't need "x11". cairo should be compiled without x11 when compiling an image based on directfb. Signed-off-by: Xiaofeng Yan --- meta/recipes-graphics/cairo/cairo.inc | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 876acad..d1fc48c 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -11,13 +11,18 @@ BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" LICENSE = "MPL-1 & LGPLv2.1" X11DEPENDS = "virtual/libx11 libsm libxrender" -DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" +DIRECTFBDEPENDS = "directfb" +DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} ${@base_contains('DISTRO_FEATURES', 'directfb', '${DIRECTFBDEPENDS}', '', d)}" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require cairo-fpu.inc +CONF_directfb="--with-x=no --enable-xcb=no --enable-directfb=yes" +CONF_xorg="--with-x=yes --enable-xcb=no --enable-directfb=no" + EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" +EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'directfb', '${CONF_directfb}', '${CONF_xorg}', d)}" inherit autotools pkgconfig # We don't depend on binutils so we need to disable this -export ac_cv_lib_bfd_bfd_openr=no \ No newline at end of file +export ac_cv_lib_bfd_bfd_openr=no