diff options
| author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-12-12 19:28:34 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-13 12:21:04 +0000 |
| commit | dd5b44034014ba1962cfca1bf7430f8c8dc5243c (patch) | |
| tree | c99ae3160614e462986e829fcb1d3f6cf3127f5d /meta | |
| parent | 65fa6a9039043a59a236d28aacce3c424a734158 (diff) | |
| download | openembedded-core-dd5b44034014ba1962cfca1bf7430f8c8dc5243c.tar.gz openembedded-core-dd5b44034014ba1962cfca1bf7430f8c8dc5243c.tar.bz2 openembedded-core-dd5b44034014ba1962cfca1bf7430f8c8dc5243c.zip | |
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]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/cairo/cairo.inc | 11 |
1 files changed, 8 insertions, 3 deletions
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 |