[OE-core] [PATCH 3/4] cairo: Adds libxext in X11DEPENDS.

[Khem Raj]

From: Noor Ahsan <noor_ahsan at 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 at mentor.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta/recipes-graphics/cairo/cairo.inc       |    8 ++++++--
 meta/recipes-graphics/cairo/cairo_1.12.8.bb |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 3059fae..919ab2e 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)}"
@@ -21,11 +21,15 @@ BBCLASSEXTEND = "native"
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 
 require cairo-fpu.inc
 EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \
-                 --enable-tee \
+                 ${TEE} \
                 "
 
+TEE = "--enable-tee"
+TEE_libc-uclibc = "--disable-tee"
 
 inherit autotools pkgconfig
 
 # We don't depend on binutils so we need to disable this
 export ac_cv_lib_bfd_bfd_openr="no"
+
+CFLAGS += "-DCAIRO_NO_MUTEX=1"
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"
 
-- 
1.7.9.5