Patchwork cairo: Adds libxext in X11DEPENDS.

login
register
mail settings
Submitter Noor Ahsan
Date Dec. 26, 2012, 10:46 a.m.
Message ID <1356518816-5211-1-git-send-email-noor_ahsan@mentor.com>
Download mbox | patch
Permalink /patch/41689/
State Accepted
Commit 409a739dd89ea256a49c69452dc29439fc3ee64e
Headers show

Comments

Noor Ahsan - Dec. 26, 2012, 10:46 a.m.
From: Noor Ahsan <noor_ahsan@mentor.com>

* 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>
---
 meta/recipes-graphics/cairo/cairo.inc       |    2 +-
 meta/recipes-graphics/cairo/cairo_1.12.8.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 3059fae..217e297 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 058854c..567a17f 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"