Patchwork cairo 1.10.2: enable tee backend

login
register
mail settings
Submitter Koen Kooi
Date Jan. 13, 2012, 9:01 a.m.
Message ID <1326445287-20422-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/19293/
State Accepted
Commit 935ae84757ca623f93b1465088e27107bc226dee
Headers show

Comments

Koen Kooi - Jan. 13, 2012, 9:01 a.m.
This is needed for firefox:

| checking CAIRO_LIBS... -lcairo -lpixman-1 -lfreetype -lfontconfig
| checking for cairo-tee >= 1.10... Package cairo-tee was not found in the pkg-config search path. Perhaps you should add the directory containing `cairo-tee.pc' to the PKG_CONFIG_PATH environment variable No package 'cairo-tee' found
| configure: error: Library requirements (cairo-tee >= 1.10) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-graphics/cairo/cairo.inc       |    4 +++-
 meta/recipes-graphics/cairo/cairo_1.10.2.bb |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
Saul Wold - Jan. 17, 2012, 8:09 p.m.
On 01/13/2012 01:01 AM, Koen Kooi wrote:
> This is needed for firefox:
>
> | checking CAIRO_LIBS... -lcairo -lpixman-1 -lfreetype -lfontconfig
> | checking for cairo-tee>= 1.10... Package cairo-tee was not found in the pkg-config search path. Perhaps you should add the directory containing `cairo-tee.pc' to the PKG_CONFIG_PATH environment variable No package 'cairo-tee' found
> | configure: error: Library requirements (cairo-tee>= 1.10) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
>
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
>   meta/recipes-graphics/cairo/cairo.inc       |    4 +++-
>   meta/recipes-graphics/cairo/cairo_1.10.2.bb |    2 +-
>   2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
> index 5f8f7b6..31e2ec9 100644
> --- a/meta/recipes-graphics/cairo/cairo.inc
> +++ b/meta/recipes-graphics/cairo/cairo.inc
> @@ -19,7 +19,9 @@ PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
>
>   #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)} "
> +EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \
> +                 --enable-tee \
> +                "
>
>
>   inherit autotools pkgconfig
> diff --git a/meta/recipes-graphics/cairo/cairo_1.10.2.bb b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
> index 8202860..826681f 100644
> --- a/meta/recipes-graphics/cairo/cairo_1.10.2.bb
> +++ b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
> @@ -2,7 +2,7 @@ require cairo.inc
>
>   LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
>
> -PR = "r2"
> +PR = "r3"
>
>   SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 5f8f7b6..31e2ec9 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -19,7 +19,9 @@  PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
 
 #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)} "
+EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \
+                 --enable-tee \
+                "
 
 
 inherit autotools pkgconfig
diff --git a/meta/recipes-graphics/cairo/cairo_1.10.2.bb b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
index 8202860..826681f 100644
--- a/meta/recipes-graphics/cairo/cairo_1.10.2.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
@@ -2,7 +2,7 @@  require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"