Update to 0.30.0. Adapt patch-b[bc] to changes.

XXX: these patches should go away, or be fed upstream.

A new major release 0.30.0 of the pixman rendering library is now
available. Highlights of this release:

- Support for high-quality image downscaling [Søren]
- Much improved ARMv6 assembly [Ben Avison]
- Improved rendering quality for gradients [Søren]
- Improvements to the SSE2 backend [Chris Wilson, Siarhei Siamashka]
- Improvements to MIPS DSPr2 backend [Nemanja Lukic]
- Improvements to test suite [Siarhei, Søren Sandmann]

4 files changed, 29 insertions, 29 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 44187c01830..d76cf6ff23d 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2013/04/23 11:42:45 is Exp $
+# $NetBSD: Makefile,v 1.53 2013/05/24 13:28:04 wiz Exp $
 
-DISTNAME=	pixman-0.28.2
-PKGREVISION=	1
+DISTNAME=	pixman-0.30.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 0efabce82fe..b5e43f991ab 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.48 2013/01/30 10:21:22 wiz Exp $
+$NetBSD: distinfo,v 1.49 2013/05/24 13:28:04 wiz Exp $
 
-SHA1 (pixman-0.28.2.tar.bz2) = 9e9ede6e13061030f9c827219cb87f47e32ecdb4
-RMD160 (pixman-0.28.2.tar.bz2) = 05f7b1d7369f5d878142330f3a7cdab967a0d79d
-Size (pixman-0.28.2.tar.bz2) = 625655 bytes
+SHA1 (pixman-0.30.0.tar.bz2) = 7ef2e8a355c2ac38bd4b3390ad220801433422dc
+RMD160 (pixman-0.30.0.tar.bz2) = c17e68ac49552e38f62d70e30ca61576f91bee6d
+Size (pixman-0.30.0.tar.bz2) = 681343 bytes
 SHA1 (patch-af) = 660feebae10eccebc62cde85b05ae0042834d398
 SHA1 (patch-ba) = 9bd8a7fd0cfbd280df06d69838d3d10ab1b51e23
-SHA1 (patch-bb) = bf9a4725e5dc20af7cafbedd212f6e2e2d78fa71
-SHA1 (patch-bc) = 06ddfe91e60acd26d47dd7d7b50db6fc3fcfd4fb
+SHA1 (patch-bb) = d47b1857771b8addb6897d45782ba2735a7aacbd
+SHA1 (patch-bc) = 3e23e6c482ea193885f3f762af355ef2f692132b
 SHA1 (patch-bd) = 1b1432f4a88d5486afdb4c0cad0808d3748fa522
diff --git a/x11/pixman/patches/patch-bb b/x11/pixman/patches/patch-bb
index d7a7daa7367..dbc531ed741 100644
--- a/x11/pixman/patches/patch-bb
+++ b/x11/pixman/patches/patch-bb
@@ -1,12 +1,13 @@
-$NetBSD: patch-bb,v 1.2 2012/05/12 17:38:32 wiz Exp $
+$NetBSD: patch-bb,v 1.3 2013/05/24 13:28:04 wiz Exp $
 
---- pixman/pixman-private.h.orig	2012-02-09 00:00:47.000000000 +0000
+--- pixman/pixman-private.h.orig	2013-04-30 20:42:20.000000000 +0000
 +++ pixman/pixman-private.h
-@@ -636,6 +636,7 @@ _pixman_iter_get_scanline_noop (pixman_i
- #define FAST_PATH_SAMPLES_COVER_CLIP_NEAREST	(1 << 23)
- #define FAST_PATH_SAMPLES_COVER_CLIP_BILINEAR	(1 << 24)
- #define FAST_PATH_BITS_IMAGE			(1 << 25)
-+#define FAST_PATH_NEEDS_WORKAROUND		(1 << 26)
+@@ -11,6 +11,8 @@
+ #define BILINEAR_INTERPOLATION_BITS 7
+ #define BILINEAR_INTERPOLATION_RANGE (1 << BILINEAR_INTERPOLATION_BITS)
  
- #define FAST_PATH_PAD_REPEAT						\
-     (FAST_PATH_NO_NONE_REPEAT		|				\
++#define FAST_PATH_NEEDS_WORKAROUND		(1 << 26)
++
+ /*
+  * C specific part
+  */
diff --git a/x11/pixman/patches/patch-bc b/x11/pixman/patches/patch-bc
index 38ba46428ed..30d152e7687 100644
--- a/x11/pixman/patches/patch-bc
+++ b/x11/pixman/patches/patch-bc
@@ -1,6 +1,6 @@
-$NetBSD: patch-bc,v 1.3 2013/01/30 10:21:22 wiz Exp $
+$NetBSD: patch-bc,v 1.4 2013/05/24 13:28:04 wiz Exp $
 
---- pixman/pixman.c.orig	2012-12-10 11:34:13.000000000 +0000
+--- pixman/pixman.c.orig	2013-04-18 05:03:32.000000000 +0000
 +++ pixman/pixman.c
 @@ -152,6 +152,57 @@ optimize_operator (pixman_op_t     op,
      return operator_table[op].opaque_info[is_dest_opaque | is_source_opaque];
@@ -60,10 +60,10 @@ $NetBSD: patch-bc,v 1.3 2013/01/30 10:21:22 wiz Exp $
  /*
   * Computing composite region
   */
-@@ -576,6 +627,13 @@ pixman_image_composite32 (pixman_op_t   
-     uint32_t src_flags, mask_flags, dest_flags;
-     pixman_region32_t region;
-     pixman_box32_t extents;
+@@ -588,6 +639,13 @@ pixman_image_composite32 (pixman_op_t   
+     pixman_composite_info_t info;
+     const pixman_box32_t *pbox;
+     int n;
 +    uint32_t *src_bits;
 +    int src_dx, src_dy;
 +    uint32_t *mask_bits;
@@ -71,15 +71,15 @@ $NetBSD: patch-bc,v 1.3 2013/01/30 10:21:22 wiz Exp $
 +    uint32_t *dest_bits;
 +    int dest_dx, dest_dy;
 +    pixman_bool_t need_workaround;
-     pixman_implementation_t *imp;
-     pixman_composite_func_t func;
  
-@@ -614,6 +672,16 @@ pixman_image_composite32 (pixman_op_t   
+     _pixman_image_validate (src);
+     if (mask)
+@@ -624,6 +682,16 @@ pixman_image_composite32 (pixman_op_t   
  	    src_format = mask_format = PIXMAN_rpixbuf;
      }
  
 +    /* Check for workaround */
-+    need_workaround = (src_flags | mask_flags | dest_flags) & FAST_PATH_NEEDS_WORKAROUND;
++    need_workaround = (info.src_flags | info.mask_flags | info.dest_flags) & FAST_PATH_NEEDS_WORKAROUND;
 +
 +    if (need_workaround)
 +    {
@@ -91,7 +91,7 @@ $NetBSD: patch-bc,v 1.3 2013/01/30 10:21:22 wiz Exp $
      pixman_region32_init (&region);
  
      if (!_pixman_compute_composite_region32 (
-@@ -707,6 +775,13 @@ pixman_image_composite32 (pixman_op_t   
+@@ -710,6 +778,13 @@ pixman_image_composite32 (pixman_op_t   
      }
  
  out: