From 7612323dba9f16db95906e51c4942940500c6829 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 14 Oct 2013 17:28:15 +0100 Subject: [PATCH] cairo: add explicit dependency on zlib In normal use this is pulled in through libpng, but it's exposed in the headers of cairo-pdf and cairo-ps and a build from sstate can end up without zlib being present. (From OE-Core master rev: 8413bf1ce95802bff032b4592ca1aa4728d62cbf) (From OE-Core rev: 252896140bb107315e58bbd82b9a73528da9b860) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 06d2dee821..214999772a 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -11,7 +11,7 @@ BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" LICENSE = "MPL-1 & LGPLv2.1" X11DEPENDS = "virtual/libx11 libsm libxrender libxext" -DEPENDS = "libpng fontconfig pixman glib-2.0" +DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"