Patchwork [3/4] cairo: Adds libxext in X11DEPENDS.

login
register
mail settings
Submitter Khem Raj
Date Jan. 5, 2013, midnight
Message ID <5c96537b0319af960a917a7b9decb317bbfd4daa.1357343832.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/42005/
State New
Headers show

Comments

Khem Raj - Jan. 5, 2013, midnight
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>
Signed-off-by: Khem Raj <raj.khem@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(-)
Saul Wold - Jan. 14, 2013, 6:08 p.m.
On 01/04/2013 04:00 PM, Khem Raj wrote:
> 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.
>

This commit message does not fully state what's going on in the change 
below, as pointed out by Richard, you do not comment on the uclib change 
at all and what's the CAIRO_NO_MUTEX setting doing?

The DEPENDS part is good, we just need to know about the rest of it.

Thanks
	Sau!


> Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
> Signed-off-by: Khem Raj <raj.khem@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"
>
>
Khem Raj - Jan. 14, 2013, 7:14 p.m.
On Mon, Jan 14, 2013 at 10:08 AM, Saul Wold <sgw@linux.intel.com> wrote:
>
> This commit message does not fully state what's going on in the change
> below, as pointed out by Richard, you do not comment on the uclib change at
> all and what's the CAIRO_NO_MUTEX setting doing?
>
> The DEPENDS part is good, we just need to know about the rest of it.

it botched two different patches into 1 which were not meant to be. I
will untangle it
Khem Raj - Jan. 14, 2013, 7:20 p.m.
On Mon, Jan 14, 2013 at 11:14 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Mon, Jan 14, 2013 at 10:08 AM, Saul Wold <sgw@linux.intel.com> wrote:
>>
>> This commit message does not fully state what's going on in the change
>> below, as pointed out by Richard, you do not comment on the uclib change at
>> all and what's the CAIRO_NO_MUTEX setting doing?
>>
>> The DEPENDS part is good, we just need to know about the rest of it.
>
> it botched two different patches into 1 which were not meant to be. I
> will untangle it

The changes in there were uclibc specific. Which I havent yet proposed and need
some more work. I have punted that patch from eglibc-2.17 branch since
the needed
patch has already been applied.

Patch

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"