[arch-commits] Commit in cairo/trunk (2 files)

[Andreas Radke]

    Date: Thursday, January 31, 2013 @ 18:47:33
  Author: andyrtr
Revision: 176806

upgpkg: cairo 1.12.12-1

upstream update 1.12.12

Modified:
  cairo/trunk/PKGBUILD
Deleted:
  cairo/trunk/xlib_Do_not_upload_the_whole_image_just_because_we_want_an_entire_row.patch

-----------------------------------------------------------------------------+
 PKGBUILD                                                                    |   11 -
 xlib_Do_not_upload_the_whole_image_just_because_we_want_an_entire_row.patch |   90 ----------
 2 files changed, 4 insertions(+), 97 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-31 17:39:46 UTC (rev 176805)
+++ PKGBUILD	2013-01-31 17:47:33 UTC (rev 176806)
@@ -3,8 +3,8 @@
 # Contributor: Brice Carpentier <brice at daknet.org>
 
 pkgname=cairo
-pkgver=1.12.10
-pkgrel=3
+pkgver=1.12.12
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -15,14 +15,11 @@
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-        xlib_Do_not_upload_the_whole_image_just_because_we_want_an_entire_row.patch)
-sha1sums=('be06d5aaa272bbbd08380f71ca710d5612881493'
-          '0631cc80b7512275d2be1d7d41497384013963ed')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('8e597874da5b861287893d87dd4ab32471e99c82')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ${srcdir}/xlib_Do_not_upload_the_whole_image_just_because_we_want_an_entire_row.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \

Deleted: xlib_Do_not_upload_the_whole_image_just_because_we_want_an_entire_row.patch
===================================================================
--- xlib_Do_not_upload_the_whole_image_just_because_we_want_an_entire_row.patch	2013-01-31 17:39:46 UTC (rev 176805)
+++ xlib_Do_not_upload_the_whole_image_just_because_we_want_an_entire_row.patch	2013-01-31 17:47:33 UTC (rev 176806)
@@ -1,90 +0,0 @@
-From fa4f48cccb6c7f4e1afb2ff4b98b906b7d8d4afc Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-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 <chris at chris-wilson.co.uk>
-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 <chris at chris-wilson.co.uk>
-Date:   Wed Jan 2 22:27:55 2013 +0000
-
-    xlib: Use SHM transport for ordinary image uploads
-
-Reported-by: Gökçen Eraslan <gokcen.eraslan at gmail.com>
-Reported-by: Guillaume Ayoub <guillaume.ayoub at kozea.fr>
-Reported-by: Emmanuel Benisty <benisty.e at gmail.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59635
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
----
-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