summaryrefslogtreecommitdiffstats
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-05-15 22:08:03 +0100
commit0cf9ef0bf1e50f80234ab4d8972b4c240e28eb8a (patch)
tree22bd809df8059346af84edea17aa5a76773483d8
parent26fcfbbfc1eb247e77733180ea253f158128c9e7 (diff)
downloadpoky-0cf9ef0bf1e50f80234ab4d8972b4c240e28eb8a.tar.gz
cairo: make xlib and libxcb dependencies explicit
(From OE-Core rev: 963ee40b6653741af9a22af7a01ad31bd6ca97a9) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 98add5a858..1e45318dde 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -17,9 +17,11 @@ LICENSE_${PN}-perf-utils = "GPLv3+"
17X11DEPENDS = "virtual/libx11 libsm libxrender libxext" 17X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
18DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" 18DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
19 19
20PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 20PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
21 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 21 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
22PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" 22
23PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
24PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
23PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" 25PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb"
24PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" 26PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind"
25PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" 27PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl"