summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-05-15 14:37:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-01 21:19:33 +0100
commitf22f5b2e52a499e2beea7ef359b287d7cb184a61 (patch)
tree04035ec9341452661251c023aee7a903bc1a4012 /meta/recipes-graphics
parentcd2c9acdbd75c83790e8144d2a834f5b5de35df0 (diff)
downloadast2050-yocto-poky-f22f5b2e52a499e2beea7ef359b287d7cb184a61.zip
ast2050-yocto-poky-f22f5b2e52a499e2beea7ef359b287d7cb184a61.tar.gz
cairo: make xlib and libxcb dependencies explicit
(From OE-Core master rev: 963ee40b6653741af9a22af7a01ad31bd6ca97a9) (From OE-Core rev: e4cb0bf63b74c3b5c29850452248c8f4ad09bda7) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index cd37559..53cbb74 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -13,9 +13,11 @@ LICENSE = "MPL-1 & LGPLv2.1"
X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
-PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
+
+PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
+PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb"
PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind"
PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl"
OpenPOWER on IntegriCloud