Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f29e89412263f76a03e966fe6e8b190287bf8d8
commit 9f29e89412263f76a03e966fe6e8b190287bf8d8 Author: Baste <[email protected]> Date: Tue Jan 29 16:47:44 2013 +0100 cairo-1.12.10-1-x86_64 * Version bump diff --git a/source/xlib/cairo/FrugalBuild b/source/xlib/cairo/FrugalBuild index 2b956f7..aeba63b 100644 --- a/source/xlib/cairo/FrugalBuild +++ b/source/xlib/cairo/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: bouleetbil <[email protected]> pkgname=cairo -pkgver=1.12.8 +pkgver=1.12.10 pkgrel=1 pkgdesc="A vector graphics library with cross-device output support" url="http://cairographics.org"; @@ -15,10 +15,10 @@ groups=('xlib') archs=('x86_64' 'i686') up2date="lynx -dump 'http://cairographics.org/releases/?C=D;O=A'|grep -m1 '/LATEST-cairo'|sed 's/.*ro-\(.*\).*/\1/'" source=($url/releases/$pkgname-$pkgver.tar.xz \ - $pkgname-respect-fontconfig.patch) + xlib-regression-fix.patch) options=('scriptlet') Fconfopts+=" --enable-egl --enable-gl --enable-gtk-doc --enable-pdf --enable-ps --enable-xcb --enable-tee" -sha1sums=('56a10bf3b804367c97734d655c23a9f652d5c297' \ - '76fdca5bf0a803a37869f725adbedd9f0691671d') +sha1sums=('be06d5aaa272bbbd08380f71ca710d5612881493' \ + 'abbf3d25935662fb3ac6822f0ccbc07574c99eeb') # optimization OK diff --git a/source/xlib/cairo/xlib-regression-fix.patch b/source/xlib/cairo/xlib-regression-fix.patch new file mode 100644 index 0000000..e317d63 --- /dev/null +++ b/source/xlib/cairo/xlib-regression-fix.patch @@ -0,0 +1,91 @@ +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
