summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoor Ahsan <noor_ahsan@mentor.com>2012-12-26 15:46:56 +0500
committerSaul Wold <sgw@linux.intel.com>2013-01-04 22:12:06 -0800
commit409a739dd89ea256a49c69452dc29439fc3ee64e (patch)
treeaeaf8645b285bd3c2f1603f61601432035313557
parent81bc0b96a085742f7dc9e8e90bb32529efbaf920 (diff)
downloadopenembedded-core-409a739dd89ea256a49c69452dc29439fc3ee64e.tar.gz
openembedded-core-409a739dd89ea256a49c69452dc29439fc3ee64e.tar.bz2
openembedded-core-409a739dd89ea256a49c69452dc29439fc3ee64e.zip
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. Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc2
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.12.8.bb2
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"
BUGTRACKER = "http://bugs.freedesktop.org"
SECTION = "libs"
LICENSE = "MPL-1 & LGPLv2.1"
-X11DEPENDS = "virtual/libx11 libsm libxrender"
+X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
DEPENDS = "libpng fontconfig pixman glib-2.0"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
${@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
LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"