summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-10-24 21:29:39 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-26 16:08:41 +0100
commit10f561fa0ecc904f66f9b5c64d49db78e362f56f (patch)
tree11c591bb7488e2e80157adfd78936aff0900a2fd
parent8bb28e3064823e017b0c0e5688e90d8c8d87bdb6 (diff)
downloadpoky-10f561fa0ecc904f66f9b5c64d49db78e362f56f.tar.gz
cairo: upgrade to upstream version 1.12.16
png.patch dropped as it's part of upstream now (From OE-Core rev: c645545d245e77a83a6ce2feb7211fbea0242d46) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cairo/cairo/png.patch52
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.12.16.bb (renamed from meta/recipes-graphics/cairo/cairo_1.12.14.bb)9
2 files changed, 3 insertions, 58 deletions
diff --git a/meta/recipes-graphics/cairo/cairo/png.patch b/meta/recipes-graphics/cairo/cairo/png.patch
deleted file mode 100644
index bf00332e57..0000000000
--- a/meta/recipes-graphics/cairo/cairo/png.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1libpng 1.6 is stricter in various ways, which can trip up the PNG loader as it
2considers all warnings fatal.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7
8From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
9From: Chris Wilson <chris@chris-wilson.co.uk>
10Date: Tue, 16 Apr 2013 10:58:56 +0100
11Subject: [PATCH] png: Avoid marking the surface as in error after a png
12 warning
13
14It turns out that libpng will continue to load an image after throwing a
15warning, and that libpng16 now throws warnings for images that libpng15
16and earlier loaded without error. As we were happily loading those
17images into cairo surfaces before, we are therefore being overzealous
18in throwing an error now - so just squelch the warning.
19
20Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
21---
22 src/cairo-png.c | 14 +++++++-------
23 1 file changed, 7 insertions(+), 7 deletions(-)
24
25diff --git a/src/cairo-png.c b/src/cairo-png.c
26index e74a4a8..068617d 100644
27--- a/src/cairo-png.c
28+++ b/src/cairo-png.c
29@@ -149,13 +149,13 @@ static void
30 png_simple_warning_callback (png_structp png,
31 png_const_charp error_msg)
32 {
33- cairo_status_t *error = png_get_error_ptr (png);
34-
35- /* default to the most likely error */
36- if (*error == CAIRO_STATUS_SUCCESS)
37- *error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
38-
39- /* png does not expect to abort and will try to tidy up after a warning */
40+ /* png does not expect to abort and will try to tidy up and continue
41+ * loading the image after a warning. So we also want to return the
42+ * (incorrect?) surface.
43+ *
44+ * We use our own warning callback to squelch any attempts by libpng
45+ * to write to stderr as we may not be in control of that output.
46+ */
47 }
48
49
50--
511.7.10.4
52
diff --git a/meta/recipes-graphics/cairo/cairo_1.12.14.bb b/meta/recipes-graphics/cairo/cairo_1.12.16.bb
index 40aa169abe..246bd0be64 100644
--- a/meta/recipes-graphics/cairo/cairo_1.12.14.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.12.16.bb
@@ -2,13 +2,10 @@ require cairo.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" 3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
4 4
5PR = "r0" 5SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"
6 6
7SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ 7SRC_URI[md5sum] = "a1304edcdc99282f478b995ee5f8f854"
8 file://png.patch" 8SRC_URI[sha256sum] = "2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846"
9
10SRC_URI[md5sum] = "27b634113d0f52152d60ae8e2ec7daa7"
11SRC_URI[sha256sum] = "96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13"
12 9
13PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" 10PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
14 11