From f1a487873c82bf56cd27e6e23f08c29ed3a00d50 Mon Sep 17 00:00:00 2001 From: Xiaofeng Yan Date: Mon, 12 Dec 2011 19:28:34 +0800 Subject: cairo: add directfb DISTRO_FEATURE cairo run over x11 at current OE-core. If cairo want to run over directfb, then \ the configuration related to x11 should be disabled and directfb should be enabled. [YOCTO #1674] (From OE-Core rev: dd5b44034014ba1962cfca1bf7430f8c8dc5243c) Signed-off-by: Xiaofeng Yan Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'meta/recipes-graphics/cairo/cairo.inc') diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 876acad3d6..5f8f7b6890 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)}" +DEPENDS = "libpng fontconfig pixman glib-2.0" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'directfb', '', d)}" +PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" +PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require cairo-fpu.inc -EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" +EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, 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 -- cgit v1.2.3-54-g00ecf