cairo.inc: drop obsolete CFLAGS += "-ffat-lto-objects" workaround
PATCH 1/2 cairo.inc: drop obsolete CFLAGS += "-ffat-lto-objects" workaround
LTO support was removed from Cairo in 1.12.18 (and 1.14.0).
https://bugs.freedesktop.org/show_bug.cgi?id=77060
http://cgit.freedesktop.org/cairo/commit/?h=1.12&id=213b3b9b8b92944506c712aa4d728903c547f879
--- meta/recipes-graphics/cairo/cairo.inc | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-graphics/cairo/cairo.inc +0 -2
@@ -44,5 +44,3 @@ export ac_cv_lib_bfd_bfd_openr="no" export ac_cv_lib_lzo2_lzo2a_decompress="no" BBCLASSEXTEND = "native" - -CFLAGS += "-ffat-lto-objects"
Signature · 1 line
1.9.1
PATCH 2/2 cairo: update 1.14.2 -> 1.14.4
Release 1.14.4 (2015-10-28 Bryce Harrington <[email protected]>)
========================================================================
Just in time for Halloween we see another bug-fix release for Cairo. This brings a few dozen straightforward bug fixes with no API changes.
In addition, this includes a typical assortment of fixes to tests, cleanup of warnings and memory leaks, correction of misspellings, updates to documentation, etc.
For a complete log of changes since 1.14.2, please see:
http://cairographics.org/releases/ChangeLog.cairo-1.14.4
---
...anspose-the-matrix-in-_cairo_gl_shader_bi.patch | 49 ----------------------
.../cairo/{cairo_1.14.2.bb => cairo_1.14.4.bb} | 5 +--
2 files changed, 2 insertions(+), 52 deletions(-)
delete mode 100644 meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch
rename meta/recipes-graphics/cairo/{cairo_1.14.2.bb => cairo_1.14.4.bb} (88%)meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch deleted +0 -49
@@ -1,49 +0,0 @@ -Upstream-Status: Backport - - http://lists.cairographics.org/archives/cairo/2015-May/026253.html - http://cgit.freedesktop.org/cairo/commit/?id=f52f0e2feb1ad0a4de23c475a8c020d41a1764a8 - -Signed-off-by: Andre McCurdy <[email protected]> - - -From f52f0e2feb1ad0a4de23c475a8c020d41a1764a8 Mon Sep 17 00:00:00 2001 -From: Zan Dobersek <[email protected]> -Date: Fri, 8 May 2015 01:50:25 -0700 -Subject: [PATCH] Manually transpose the matrix in _cairo_gl_shader_bind_matrix() - -To maintain compatibility with OpenGL ES 2.0, the matrix in -_cairo_gl_shader_bind_matrix() should be manually transposed, -and GL_FALSE passed as the transpose argument to the -glUniformMatrix3fv() call as it is the only valid value for -that parameter in OpenGL ES 2.0. - -Reviewed-by: Bryce Harrington <[email protected]> -Acked-by: "Henry (Yu) Song" <[email protected]> ---- - src/cairo-gl-shaders.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c -index 2710606..fe975d2 100644 ---- a/src/cairo-gl-shaders.c -+++ b/src/cairo-gl-shaders.c -@@ -973,12 +973,12 @@ _cairo_gl_shader_bind_matrix (cairo_gl_context_t *ctx, - { - cairo_gl_dispatch_t *dispatch = &ctx->dispatch; - float gl_m[9] = { -- m->xx, m->xy, m->x0, -- m->yx, m->yy, m->y0, -- 0, 0, 1 -+ m->xx, m->yx, 0, -+ m->xy, m->yy, 0, -+ m->x0, m->y0, 1 - }; - assert (location != -1); -- dispatch->UniformMatrix3fv (location, 1, GL_TRUE, gl_m); -+ dispatch->UniformMatrix3fv (location, 1, GL_FALSE, gl_m); - } - - void --- -1.9.1 -
meta/recipes-graphics/cairo/cairo_1.14.4.bb renamed from meta/recipes-graphics/cairo/cairo_1.14.2.bb +2 -3
@@ -3,10 +3,9 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" -SRC_URI += "file://Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch" -SRC_URI[md5sum] = "e1cdfaf1c6c995c4d4c54e07215b0118" -SRC_URI[sha256sum] = "c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb" +SRC_URI[md5sum] = "90a929e8fe66fb5d19b5adaaea1e9a12" +SRC_URI[sha256sum] = "f6ec9c7c844db9ec011f0d66b57ef590c45adf55393d1fc249003512522ee716" PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
Signature · 1 line
1.9.1