From c645545d245e77a83a6ce2feb7211fbea0242d46 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 24 Oct 2013 21:29:39 +0300 Subject: cairo: upgrade to upstream version 1.12.16 png.patch dropped as it's part of upstream now Signed-off-by: Marko Lindqvist Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo/png.patch | 52 ---------------------------- meta/recipes-graphics/cairo/cairo_1.12.14.bb | 48 ------------------------- meta/recipes-graphics/cairo/cairo_1.12.16.bb | 45 ++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-graphics/cairo/cairo/png.patch delete mode 100644 meta/recipes-graphics/cairo/cairo_1.12.14.bb create mode 100644 meta/recipes-graphics/cairo/cairo_1.12.16.bb (limited to 'meta/recipes-graphics/cairo') 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 @@ -libpng 1.6 is stricter in various ways, which can trip up the PNG loader as it -considers all warnings fatal. - -Upstream-Status: Backport -Signed-off-by: Ross Burton - - -From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Tue, 16 Apr 2013 10:58:56 +0100 -Subject: [PATCH] png: Avoid marking the surface as in error after a png - warning - -It turns out that libpng will continue to load an image after throwing a -warning, and that libpng16 now throws warnings for images that libpng15 -and earlier loaded without error. As we were happily loading those -images into cairo surfaces before, we are therefore being overzealous -in throwing an error now - so just squelch the warning. - -Signed-off-by: Chris Wilson ---- - src/cairo-png.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/cairo-png.c b/src/cairo-png.c -index e74a4a8..068617d 100644 ---- a/src/cairo-png.c -+++ b/src/cairo-png.c -@@ -149,13 +149,13 @@ static void - png_simple_warning_callback (png_structp png, - png_const_charp error_msg) - { -- cairo_status_t *error = png_get_error_ptr (png); -- -- /* default to the most likely error */ -- if (*error == CAIRO_STATUS_SUCCESS) -- *error = _cairo_error (CAIRO_STATUS_NO_MEMORY); -- -- /* png does not expect to abort and will try to tidy up after a warning */ -+ /* png does not expect to abort and will try to tidy up and continue -+ * loading the image after a warning. So we also want to return the -+ * (incorrect?) surface. -+ * -+ * We use our own warning callback to squelch any attempts by libpng -+ * to write to stderr as we may not be in control of that output. -+ */ - } - - --- -1.7.10.4 - diff --git a/meta/recipes-graphics/cairo/cairo_1.12.14.bb b/meta/recipes-graphics/cairo/cairo_1.12.14.bb deleted file mode 100644 index 40aa169abe..0000000000 --- a/meta/recipes-graphics/cairo/cairo_1.12.14.bb +++ /dev/null @@ -1,48 +0,0 @@ -require cairo.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" - -PR = "r0" - -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ - file://png.patch" - -SRC_URI[md5sum] = "27b634113d0f52152d60ae8e2ec7daa7" -SRC_URI[sha256sum] = "96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13" - -PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" - -SUMMARY_${PN} = "The Cairo 2D vector graphics library" -DESCRIPTION_${PN} = "Cairo is a multi-platform library providing anti-aliased \ -vector-based rendering for multiple target backends. Paths consist \ -of line segments and cubic splines and can be rendered at any width \ -with various join and cap styles. All colors may be specified with \ -optional translucence (opacity/alpha) and combined using the \ -extended Porter/Duff compositing algebra as found in the X Render \ -Extension." - -SUMMARY_cairo-gobject = "The Cairo library GObject wrapper library" -DESCRIPTION_cairo-gobject = "A GObject wrapper library for the Cairo API." - -SUMMARY_cairo-script-interpreter = "The Cairo library script interpreter" -DESCRIPTION_cairo-script-interpreter = "The Cairo script interpreter implements \ -CairoScript. CairoScript is used by tracing utilities to enable the ability \ -to replay rendering." - -DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" - -FILES_${PN} = "${libdir}/libcairo.so.*" -FILES_${PN}-dev += "${libdir}/cairo/*.la ${libdir}/cairo/*.so" -#FILES_${PN}-dbg += "${libdir}/cairo/.debug" -#FILES_${PN}-staticdev += "${libdir}/cairo/*.a" -FILES_cairo-gobject = "${libdir}/libcairo-gobject.so.*" -FILES_cairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" -FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.*" - -do_install_append () { - rm -rf ${D}${bindir}/cairo-sphinx - rm -rf ${D}${libdir}/cairo/cairo-fdr* - rm -rf ${D}${libdir}/cairo/cairo-sphinx* - rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr* - rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx* -} diff --git a/meta/recipes-graphics/cairo/cairo_1.12.16.bb b/meta/recipes-graphics/cairo/cairo_1.12.16.bb new file mode 100644 index 0000000000..246bd0be64 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo_1.12.16.bb @@ -0,0 +1,45 @@ +require cairo.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" + +SRC_URI[md5sum] = "a1304edcdc99282f478b995ee5f8f854" +SRC_URI[sha256sum] = "2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846" + +PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" + +SUMMARY_${PN} = "The Cairo 2D vector graphics library" +DESCRIPTION_${PN} = "Cairo is a multi-platform library providing anti-aliased \ +vector-based rendering for multiple target backends. Paths consist \ +of line segments and cubic splines and can be rendered at any width \ +with various join and cap styles. All colors may be specified with \ +optional translucence (opacity/alpha) and combined using the \ +extended Porter/Duff compositing algebra as found in the X Render \ +Extension." + +SUMMARY_cairo-gobject = "The Cairo library GObject wrapper library" +DESCRIPTION_cairo-gobject = "A GObject wrapper library for the Cairo API." + +SUMMARY_cairo-script-interpreter = "The Cairo library script interpreter" +DESCRIPTION_cairo-script-interpreter = "The Cairo script interpreter implements \ +CairoScript. CairoScript is used by tracing utilities to enable the ability \ +to replay rendering." + +DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" + +FILES_${PN} = "${libdir}/libcairo.so.*" +FILES_${PN}-dev += "${libdir}/cairo/*.la ${libdir}/cairo/*.so" +#FILES_${PN}-dbg += "${libdir}/cairo/.debug" +#FILES_${PN}-staticdev += "${libdir}/cairo/*.a" +FILES_cairo-gobject = "${libdir}/libcairo-gobject.so.*" +FILES_cairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" +FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.*" + +do_install_append () { + rm -rf ${D}${bindir}/cairo-sphinx + rm -rf ${D}${libdir}/cairo/cairo-fdr* + rm -rf ${D}${libdir}/cairo/cairo-sphinx* + rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr* + rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx* +} -- cgit 1.2.3-korg