cairo failed on openSUSE

cairo failed on openSUSE

[Ronan Le Martret]

[-- Attachment #1: Type: text/plain, Size: 133 bytes --]

- add libpng version 15 to configure.ac of cairo. (libpng12 confict.)

-- 
Ronan Le Martret
Intel Open Source Technology Center

[-- Attachment #2: bug_cairo_png_version.patch --]
[-- Type: application/octet-stream, Size: 1515 bytes --]

diff --git a/meta/recipes-graphics/cairo/cairo_1.12.8.bb b/meta/recipes-graphics/cairo/cairo_1.12.8.bb
index 058854c..8cf93f9 100644
--- a/meta/recipes-graphics/cairo/cairo_1.12.8.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.12.8.bb
@@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
 PR = "r0"
 
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
+           file://libpng_addversion.patch \
+          "
 
 SRC_URI[md5sum] = "8b3dcade859c44fb7e56fc68edfe9a45"
 SRC_URI[sha256sum] = "8fbb6fc66117ab4100bad830cb4479497e53c6f3facb98bf05c8d298554ebdd9"
diff --git a/meta/recipes-graphics/cairo/files/libpng_addversion.patch b/meta/recipes-graphics/cairo/files/libpng_addversion.patch
new file mode 100644
index 0000000..0f40fb3
--- /dev/null
+++ b/meta/recipes-graphics/cairo/files/libpng_addversion.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index f523284..2235c16 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -308,7 +308,7 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
+   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
+   if test "x$png_REQUIRES" = x; then
+     # libpng13 is GnuWin32's libpng-1.2.8 :-(
+-    for l in libpng libpng14 libpng12 libpng13 libpng10; do
++    for l in libpng libpng15 libpng14 libpng12 libpng13 libpng10; do
+       if $PKG_CONFIG --exists $l ; then
+         png_REQUIRES=$l
+         use_png=yes

Re: cairo failed on openSUSE

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

On Thu, Jan 03, 2013 at 01:48:15PM +0100, Ronan Le Martret wrote:
> - add libpng version 15 to configure.ac of cairo. (libpng12 confict.)

Please follow:
http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

And this belongs to oe-core ML.

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]