Hi Andreas,
On 15/05/15 16:50, Andreas Oberritter wrote:
Hi Joshua,
On 15.05.2015 15:37, Joshua Lock wrote:
Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
---
meta/recipes-graphics/cairo/cairo.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/cairo/cairo.inc
b/meta/recipes-graphics/cairo/cairo.inc
index 98add5a..1e45318 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -17,9 +17,11 @@ LICENSE_${PN}-perf-utils = "GPLv3+"
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"
your patch adds a dependency on xcb by default, which you didn't
mention.
That's true, however I believe xcb is picked up in a default build of
the current recipe (by virtue of it being a dependency of libx11) and
thus I included it in the default PACKAGECONFIG so as to make current
behaviour explicit.
Cairo has more floating dependencies. I have a similar but more
complete patch which I haven't tested on master yet. See below.
That is indeed a more complete fix, I'd be happy to see it land instead
of my proposed change.
Regards,
Joshua
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
