diff options
author | Ross Burton <ross.burton@intel.com> | 2013-10-14 17:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 16:59:56 +0000 |
commit | 7612323dba9f16db95906e51c4942940500c6829 (patch) | |
tree | d760e0b47cd55eb7d4eecd59828e6f3f5b06fa54 /meta/recipes-graphics | |
parent | 52e0863e51b9a0306e0e5be7e604a0e7e9ab1b42 (diff) | |
download | poky-7612323dba9f16db95906e51c4942940500c6829.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 master rev: 8413bf1ce95802bff032b4592ca1aa4728d62cbf)
(From OE-Core rev: 252896140bb107315e58bbd82b9a73528da9b860)
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>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/cairo/cairo.inc | 2 |
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" | |||
11 | SECTION = "libs" | 11 | SECTION = "libs" |
12 | LICENSE = "MPL-1 & LGPLv2.1" | 12 | LICENSE = "MPL-1 & LGPLv2.1" |
13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" | 13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" |
14 | DEPENDS = "libpng fontconfig pixman glib-2.0" | 14 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" |
15 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 15 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
16 | ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 16 | ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
17 | PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" | 17 | PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" |