From f22f5b2e52a499e2beea7ef359b287d7cb184a61 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 15 May 2015 14:37:12 +0100 Subject: cairo: make xlib and libxcb dependencies explicit (From OE-Core master rev: 963ee40b6653741af9a22af7a01ad31bd6ca97a9) (From OE-Core rev: e4cb0bf63b74c3b5c29850452248c8f4ad09bda7) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index cd375597f0..53cbb745a2 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" -- cgit v1.2.3-54-g00ecf