diff options
| author |   Joshua Lock <joshua.lock@collabora.co.uk> | 2015-05-15 14:37:12 +0100 |
|---|---|---|
| committer | Joshua Lock <joshua.lock@collabora.co.uk> | 2015-09-01 12:36:14 +0100 |
| commit | e4cb0bf63b74c3b5c29850452248c8f4ad09bda7 (patch) | |
| tree | b6b08d0e90c4fa9bf80f558ac6226b100a0d9a88 /meta/recipes-graphics | |
| parent | 64a4faf66f6d28acf575307079c1843a70efb71c (diff) | |
| download | openembedded-core-contrib-e4cb0bf63b74c3b5c29850452248c8f4ad09bda7.tar.gz | |
cairo: make xlib and libxcb dependencies explicit
(From OE-Core master rev: 963ee40b6653741af9a22af7a01ad31bd6ca97a9)
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.inc | 6 |
1 files changed, 4 insertions, 2 deletions
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" |