diff options
author | Joshua Lock <joshua.lock@collabora.co.uk> | 2015-05-15 14:37:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-01 21:19:33 +0100 |
commit | f22f5b2e52a499e2beea7ef359b287d7cb184a61 (patch) | |
tree | 04035ec9341452661251c023aee7a903bc1a4012 /meta/recipes-graphics | |
parent | cd2c9acdbd75c83790e8144d2a834f5b5de35df0 (diff) | |
download | 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.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" | |||
13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" | 13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" |
14 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" | 14 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" |
15 | 15 | ||
16 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 16 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ |
17 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 17 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
18 | PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" | 18 | |
19 | PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" | ||
20 | PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" | ||
19 | PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" | 21 | PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" |
20 | PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" | 22 | PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" |
21 | PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" | 23 | PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" |