summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-10-14 17:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-18 15:49:56 +0100
commit88a8e96f8f3a39535fe75861e0756571ac307cc2 (patch)
tree061c4f1a03f99a6111ad2e9e11b191080c4f3bce
parentcd414c0d1cdf7a49bfe862b6c7678c19f38f5a18 (diff)
downloadpoky-88a8e96f8f3a39535fe75861e0756571ac307cc2.tar.gz
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 rev: 8413bf1ce95802bff032b4592ca1aa4728d62cbf) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc2
1 files changed, 1 insertions, 1 deletions
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"
11SECTION = "libs" 11SECTION = "libs"
12LICENSE = "MPL-1 & LGPLv2.1" 12LICENSE = "MPL-1 & LGPLv2.1"
13X11DEPENDS = "virtual/libx11 libsm libxrender libxext" 13X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
14DEPENDS = "libpng fontconfig pixman glib-2.0" 14DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
16 ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 16 ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
17PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" 17PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"