Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ade0b19fba6c3b5f8785e4ec7fa61d551c051e5f
commit ade0b19fba6c3b5f8785e4ec7fa61d551c051e5f Author: Baste <[email protected]> Date: Wed Nov 4 12:35:29 2015 +0100 cairo-1.14.4-1-x86_64 - 1.14.2 -> 1.14.4 diff --git a/source/xlib/cairo/FrugalBuild b/source/xlib/cairo/FrugalBuild index 63598e9..9ccb40e 100644 --- a/source/xlib/cairo/FrugalBuild +++ b/source/xlib/cairo/FrugalBuild @@ -2,13 +2,11 @@ # Maintainer: Baste <[email protected]> # Contributor: bouleetbil <[email protected]> -options+=('asneeded') - USE_DOC=${USE_DOC:-"y"} pkgname=cairo -pkgver=1.14.2 -pkgrel=2 +pkgver=1.14.4 +pkgrel=1 pkgdesc="A vector graphics library with cross-device output support" url="http://cairographics.org"; depends=('libegl' 'libgl' 'libxrender>=0.9.4-3' 'fontconfig' 'libpng>=1.4.1' 'libxcb>=1.3' 'libx11>=1.2.1' \ @@ -20,7 +18,7 @@ up2date="lynx -dump 'http://cairographics.org/releases/?C=D;O=A'|grep -m1 '/LATE source=($url/releases/$pkgname-$pkgver.tar.xz) options+=('scriptlet') Fconfopts+=" --enable-egl --enable-gl --enable-pdf --enable-ps --enable-xcb --enable-tee" -sha1sums=('c8da68aa66ca0855b5d0ff552766d3e8679e1d24') +sha1sums=('5b44471e7c328f96de6830baf8ea65030de797f9') if Fuse $USE_DOC; then makedepends=("${makedepends[@]}" 'gtk-doc>=1.24') Fconfopts+=" --enable-gtk-doc" diff --git a/source/xlib/cairo/cairo-respect-fontconfig.patch b/source/xlib/cairo/cairo-respect-fontconfig.patch deleted file mode 100644 index 3bb8b8f..0000000 --- a/source/xlib/cairo/cairo-respect-fontconfig.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur cairo-1.8.6.orig/src/cairo-ft-font.c cairo-1.8.6/src/cairo-ft-font.c ---- cairo-1.8.6.orig/src/cairo-ft-font.c 2008-12-12 20:48:04.000000000 +0800 -+++ cairo-1.8.6/src/cairo-ft-font.c 2009-02-20 14:56:57.000000000 +0800 -@@ -1448,8 +1448,15 @@ - if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT) - options->base.hint_style = other->base.hint_style; - -- if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) -- options->base.hint_style = CAIRO_HINT_STYLE_NONE; -+ //if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) -+ //options->base.hint_style = CAIRO_HINT_STYLE_NONE; -+ -+ if (other->base.hint_style == CAIRO_HINT_STYLE_NONE || -+ other->base.hint_style == CAIRO_HINT_STYLE_SLIGHT || -+ other->base.hint_style == CAIRO_HINT_STYLE_MEDIUM || -+ other->base.hint_style == CAIRO_HINT_STYLE_FULL) { -+ options->base.hint_style = other->base.hint_style; -+ } - - if (options->base.antialias == CAIRO_ANTIALIAS_NONE) { - if (options->base.hint_style == CAIRO_HINT_STYLE_NONE) diff --git a/source/xlib/cairo/xlib-regression-fix.patch b/source/xlib/cairo/xlib-regression-fix.patch deleted file mode 100644 index e317d63..0000000 --- a/source/xlib/cairo/xlib-regression-fix.patch +++ /dev/null @@ -1,91 +0,0 @@ -From fa4f48cccb6c7f4e1afb2ff4b98b906b7d8d4afc Mon Sep 17 00:00:00 2001 -From: Chris Wilson <[email protected]> -Date: Wed, 23 Jan 2013 15:04:26 +0000 -Subject: xlib: Do not upload the whole image just because we want an entire row - -Fixes regression exposed by - -commit a73e7ff0186176bc82cd3ae1432c054c1fd3aebd -Author: Chris Wilson <[email protected]> -Date: Sun Jan 6 11:29:27 2013 +0000 - - xlib: Simplify source creation by use of map-to-image - -but ultimately from - -commit 74941f822015cc50cd8477d0cf97f1a70dbff60b -Author: Chris Wilson <[email protected]> -Date: Wed Jan 2 22:27:55 2013 +0000 - - xlib: Use SHM transport for ordinary image uploads - -Reported-by: Gökçen Eraslan <[email protected]> -Reported-by: Guillaume Ayoub <[email protected]> -Reported-by: Emmanuel Benisty <[email protected]> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59635 -Signed-off-by: Chris Wilson <[email protected]> ---- -diff --git a/src/cairo-xlib-source.c b/src/cairo-xlib-source.c -index 24290f7..ca55278 100644 ---- a/src/cairo-xlib-source.c -+++ b/src/cairo-xlib-source.c -@@ -1035,7 +1035,13 @@ surface_source (cairo_xlib_surface_t *dst, - - status = _cairo_surface_unmap_image (&xsrc->base, image); - if (unlikely (status)) { -- cairo_surface_destroy (src); -+ cairo_surface_destroy (&xsrc->base); -+ return _cairo_surface_create_in_error (status); -+ } -+ -+ status = _cairo_xlib_surface_put_shm (xsrc); -+ if (unlikely (status)) { -+ cairo_surface_destroy (&xsrc->base); - return _cairo_surface_create_in_error (status); - } - } -diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c -index dbc677e..ee69b66 100644 ---- a/src/cairo-xlib-surface.c -+++ b/src/cairo-xlib-surface.c -@@ -1139,26 +1139,24 @@ _cairo_xlib_surface_draw_image (cairo_xlib_surface_t *surface, - max_request_size = XMaxRequestSize (display->display); - if (max_request_size > 8192) - max_request_size = 8192; -- if (image->stride * image->height > max_request_size) { -+ if (width * height * 4 > max_request_size) { - shm_image = _cairo_xlib_surface_create_shm__image (surface, - image->pixman_format, -- image->width, -- image->height); -+ width, height); - if (shm_image && shm_image->status == CAIRO_STATUS_SUCCESS) { - cairo_image_surface_t *clone = (cairo_image_surface_t *) shm_image; -- if (clone->stride == image->stride) { -- memcpy (clone->data, image->data, clone->stride * clone->height); -- } else { -- pixman_image_composite32 (PIXMAN_OP_SRC, -- image->pixman_image, NULL, clone->pixman_image, -- 0, 0, -- 0, 0, -- 0, 0, -- image->width, image->height); -- } -+ pixman_image_composite32 (PIXMAN_OP_SRC, -+ image->pixman_image, NULL, clone->pixman_image, -+ src_x, src_y, -+ 0, 0, -+ 0, 0, -+ width, height); - ximage.obdata = _cairo_xlib_shm_surface_get_obdata (shm_image); - ximage.data = (char *)clone->data; - ximage.bytes_per_line = clone->stride; -+ ximage.width = width; -+ ximage.height = height; -+ src_x = src_y = 0; - } - } - } else --- -cgit v0.9.0.2-2-gbebe -
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
