summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/cairo/cairo.inc
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-12-12 11:28:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-13 12:28:09 (GMT)
commitf1a487873c82bf56cd27e6e23f08c29ed3a00d50 (patch)
tree5cc55fa6e979252a6412f95893f21a7864e6630e /meta/recipes-graphics/cairo/cairo.inc
parent6471e4ce67f9b36029d7e623fc67e83b944fb3a9 (diff)
downloadpoky-f1a487873c82bf56cd27e6e23f08c29ed3a00d50.tar.gz
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 <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cairo/cairo.inc')
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc11
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 876acad..5f8f7b6 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -11,13 +11,18 @@ BUGTRACKER = "http://bugs.freedesktop.org"
11SECTION = "libs" 11SECTION = "libs"
12LICENSE = "MPL-1 & LGPLv2.1" 12LICENSE = "MPL-1 & LGPLv2.1"
13X11DEPENDS = "virtual/libx11 libsm libxrender" 13X11DEPENDS = "virtual/libx11 libsm libxrender"
14DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" 14DEPENDS = "libpng fontconfig pixman glib-2.0"
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
16 ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'directfb', '', d)}"
17PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
18PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
15 19
16#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 20#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
17require cairo-fpu.inc 21require cairo-fpu.inc
18EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" 22EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} "
23
19 24
20inherit autotools pkgconfig 25inherit autotools pkgconfig
21 26
22# We don't depend on binutils so we need to disable this 27# We don't depend on binutils so we need to disable this
23export ac_cv_lib_bfd_bfd_openr=no \ No newline at end of file 28export ac_cv_lib_bfd_bfd_openr=no