Patchwork cairo: add explicit dependency on zlib

login
register
mail settings
Submitter Ross Burton
Date Oct. 14, 2013, 4:28 p.m.
Message ID <1381768095-8530-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/59851/
State Accepted
Commit 88a8e96f8f3a39535fe75861e0756571ac307cc2
Headers show

Comments

Ross Burton - Oct. 14, 2013, 4:28 p.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/cairo/cairo.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 06d2dee..2149997 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}"