diff options
author | Noor Ahsan <noor_ahsan@mentor.com> | 2012-12-26 15:46:56 +0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-07 11:09:43 +0000 |
commit | e38ce339602597a0ddda11ed1ca917eea51e610b (patch) | |
tree | 398aa92fc5c9baf3553bc61f3d8d13c0c64b9a21 /meta/recipes-graphics | |
parent | d12bffc262df872bf6edd00c430e0f7fbbcb37ee (diff) | |
download | poky-e38ce339602597a0ddda11ed1ca917eea51e610b.tar.gz |
cairo: Adds libxext in X11DEPENDS.
* cairo was giving redefinition error of struct _XLinearGradient,
struct _XCircle and struct _XRadialGradient.
* cario now depends on libxext. Adding that dependency resolved
above errors.
* Verified it on P2020RDB.
* Bump PR.
(From OE-Core rev: 409a739dd89ea256a49c69452dc29439fc3ee64e)
Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.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 | ||||
-rw-r--r-- | meta/recipes-graphics/cairo/cairo_1.12.8.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 3059faeedf..217e297861 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc | |||
@@ -10,7 +10,7 @@ HOMEPAGE = "http://cairographics.org" | |||
10 | BUGTRACKER = "http://bugs.freedesktop.org" | 10 | 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" | 13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" |
14 | DEPENDS = "libpng fontconfig pixman glib-2.0" | 14 | DEPENDS = "libpng fontconfig pixman glib-2.0" |
15 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 15 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
16 | ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}" | 16 | ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}" |
diff --git a/meta/recipes-graphics/cairo/cairo_1.12.8.bb b/meta/recipes-graphics/cairo/cairo_1.12.8.bb index 058854c535..567a17fdda 100644 --- a/meta/recipes-graphics/cairo/cairo_1.12.8.bb +++ b/meta/recipes-graphics/cairo/cairo_1.12.8.bb | |||
@@ -2,7 +2,7 @@ require cairo.inc | |||
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" |
4 | 4 | ||
5 | PR = "r0" | 5 | PR = "r1" |
6 | 6 | ||
7 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" | 7 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" |
8 | 8 | ||