Update to pixman 0.10 plus some tiny patches from GIT.

Notable improvements:

 * Support for new YUV formats
 * MMX acceleration now works with MS Visual C++
 * Many performance improvements and bug fixes

8 files changed, 183 insertions, 9 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index d921a0ea0fb..556b6be2924 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2008/03/03 02:25:38 bjs Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/07 15:02:04 bjs Exp $
 #
 
-DISTNAME=	pixman-0.9.6pl0
+DISTNAME=	pixman-0.10.0
 PKGNAME=	${DISTNAME:C/pl[0-9]*//}
-PKGREVISION=	6
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	bjs@NetBSD.org
diff --git a/x11/pixman/PLIST b/x11/pixman/PLIST
index 5ed928ff386..0d6062ae5c8 100644
--- a/x11/pixman/PLIST
+++ b/x11/pixman/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/07 15:02:04 bjs Exp $
 include/pixman-1/pixman.h
+include/pixman-1/pixman-version.h
 lib/libpixman-1.la
 lib/pkgconfig/pixman-1.pc
 @dirrm include/pixman-1
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 3b527737672..b95d842c2a6 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.7 2008/03/03 02:25:38 bjs Exp $
+$NetBSD: distinfo,v 1.8 2008/04/07 15:02:04 bjs Exp $
 
-SHA1 (pixman-0.9.6pl0.tar.bz2) = 3f1cb286b577413df576a96282dbb6fbd8eb4d20
-RMD160 (pixman-0.9.6pl0.tar.bz2) = e148da105f72ca128c04159958b425fec8fbfe4b
-Size (pixman-0.9.6pl0.tar.bz2) = 282864 bytes
+SHA1 (pixman-0.10.0.tar.bz2) = 9262e945281877c42d484098de664dcf1a68d857
+RMD160 (pixman-0.10.0.tar.bz2) = 16c356f5fa3dfa4c0196456552daca3ab6244276
+Size (pixman-0.10.0.tar.bz2) = 312275 bytes
+SHA1 (patch-aa) = 56388eac3744ea78e4c2ba656d5c5110623a7de4
+SHA1 (patch-ab) = 5322a03dbcacca50898e3a318174cb47344da28e
+SHA1 (patch-ac) = 093aab2151261285506197e566dd3ae62b06b716
+SHA1 (patch-ad) = d35b932e5fb29b5022fc1f02a9568183ae4cdbd4
+SHA1 (patch-ae) = 9fb4cedc19c07c368af02589fda6d5d9cd47c174
diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa
new file mode 100644
index 00000000000..200ef593a8d
--- /dev/null
+++ b/x11/pixman/patches/patch-aa
@@ -0,0 +1,41 @@
+$NetBSD: patch-aa,v 1.6 2008/04/07 15:02:05 bjs Exp $
+
+--- pixman/pixman-combine.c.orig	2008-03-24 09:13:13.000000000 -0400
++++ pixman/pixman-combine.c
+@@ -17,7 +17,7 @@
+ /*
+  * Combine src and mask
+  */
+-FASTCALL void
++FASTCALL static void
+ pixman_fbCombineMaskU (uint32_t *src, const uint32_t *mask, int width)
+ {
+     int i;
+@@ -1165,7 +1165,7 @@ fbCombineConjointXorC (uint32_t *dest, u
+     fbCombineConjointGeneralC (dest, src, mask, width, CombineXor);
+ }
+ 
+-CombineFuncU pixman_fbCombineFuncU[] = {
++static CombineFuncU pixman_fbCombineFuncU[] = {
+     fbCombineClear,
+     fbCombineSrcU,
+     NULL, /* CombineDst */
+@@ -1212,7 +1212,7 @@ CombineFuncU pixman_fbCombineFuncU[] = {
+     fbCombineConjointXorU,
+ };
+ 
+-CombineFuncC pixman_fbCombineFuncC[] = {
++static CombineFuncC pixman_fbCombineFuncC[] = {
+     fbCombineClearC,
+     fbCombineSrcC,
+     NULL, /* Dest */
+@@ -1258,3 +1258,9 @@ CombineFuncC pixman_fbCombineFuncC[] = {
+     fbCombineConjointAtopReverseC,
+     fbCombineConjointXorC,
+ };
++
++FbComposeFunctions pixman_composeFunctions = {
++    pixman_fbCombineFuncU,
++    pixman_fbCombineFuncC,
++    pixman_fbCombineMaskU
++};
diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab
new file mode 100644
index 00000000000..a36e7212ef2
--- /dev/null
+++ b/x11/pixman/patches/patch-ab
@@ -0,0 +1,85 @@
+$NetBSD: patch-ab,v 1.5 2008/04/07 15:02:05 bjs Exp $
+
+--- pixman/pixman-compose.c.orig	2008-03-24 09:13:13.000000000 -0400
++++ pixman/pixman-compose.c
+@@ -37,7 +37,6 @@
+ 
+ #ifdef PIXMAN_FB_ACCESSORS
+ #define PIXMAN_COMPOSITE_RECT_GENERAL pixman_composite_rect_general_accessors
+-#define PIXMAN_COMPOSE_FUNCTIONS pixman_composeFunctions_accessors
+ 
+ #define FETCH_PROC_FOR_PICTURE pixman_fetchProcForPicture_accessors
+ #define FETCH_PIXEL_PROC_FOR_PICTURE pixman_fetchPixelProcForPicture_accessors
+@@ -50,7 +49,6 @@
+ #else
+ 
+ #define PIXMAN_COMPOSITE_RECT_GENERAL pixman_composite_rect_general_no_accessors
+-#define PIXMAN_COMPOSE_FUNCTIONS pixman_composeFunctions
+ 
+ #define FETCH_PROC_FOR_PICTURE pixman_fetchProcForPicture
+ #define FETCH_PIXEL_PROC_FOR_PICTURE pixman_fetchPixelProcForPicture
+@@ -142,15 +140,6 @@ static void fbFetch(bits_image_t * pict,
+     fetch(pict, x, y, width, buffer);
+ }
+ 
+-#ifdef PIXMAN_FB_ACCESSORS	/* The accessor version can't be parameterized from outside */
+-static const
+-#endif
+-FbComposeFunctions PIXMAN_COMPOSE_FUNCTIONS = {
+-    pixman_fbCombineFuncU,
+-    pixman_fbCombineFuncC,
+-    pixman_fbCombineMaskU
+-};
+-
+ static void
+ fbStore(bits_image_t * pict, int x, int y, int width, uint32_t *buffer)
+ {
+@@ -313,7 +302,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
+ 	PIXMAN_FORMAT_RGB (data->mask->bits.format))
+     {
+ 	uint32_t *mask_buffer = dest_buffer + data->width;
+-	CombineFuncC compose = PIXMAN_COMPOSE_FUNCTIONS.combineC[data->op];
++	CombineFuncC compose = pixman_composeFunctions.combineC[data->op];
+ 	if (!compose)
+ 	    return;
+ 
+@@ -377,7 +366,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
+     else
+     {
+ 	uint32_t *src_mask_buffer = 0, *mask_buffer = 0;
+-	CombineFuncU compose = PIXMAN_COMPOSE_FUNCTIONS.combineU[data->op];
++	CombineFuncU compose = pixman_composeFunctions.combineU[data->op];
+ 	if (!compose)
+ 	    return;
+ 
+@@ -406,7 +395,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
+ 
+ 		    if (mask_buffer)
+ 		    {
+-			PIXMAN_COMPOSE_FUNCTIONS.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
++			pixman_composeFunctions.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
+ 			src_mask_buffer = mask_buffer;
+ 		    }
+ 		    else
+@@ -421,9 +410,9 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
+ 			      0xff000000);
+ 
+ 		    if (mask_buffer)
+-			PIXMAN_COMPOSE_FUNCTIONS.combineMaskU (src_buffer,
+-							       mask_buffer,
+-							       data->width);
++			pixman_composeFunctions.combineMaskU (src_buffer,
++							      mask_buffer,
++							      data->width);
+ 
+ 		    src_mask_buffer = src_buffer;
+ 		}
+@@ -433,7 +422,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
+ 		fetchMask (data->mask, data->xMask, data->yMask + i,
+ 			   data->width, mask_buffer, 0, 0);
+ 
+-		PIXMAN_COMPOSE_FUNCTIONS.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
++		pixman_composeFunctions.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
+ 
+ 		src_mask_buffer = mask_buffer;
+ 	    }
diff --git a/x11/pixman/patches/patch-ac b/x11/pixman/patches/patch-ac
new file mode 100644
index 00000000000..088382e1e3a
--- /dev/null
+++ b/x11/pixman/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2008/04/07 15:02:05 bjs Exp $
+
+--- pixman/pixman-pict.c.orig	2008-03-27 06:58:20.000000000 -0400
++++ pixman/pixman-pict.c
+@@ -1428,6 +1428,8 @@ static const FastPathInfo mmx_fast_paths
+ 
+     { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8,  PIXMAN_null,	PIXMAN_a8r8g8b8, fbCompositeCopyAreammx, 0 },
+     { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8,  PIXMAN_null,	PIXMAN_a8b8g8r8, fbCompositeCopyAreammx, 0 },
++    { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8,  PIXMAN_null,	PIXMAN_x8r8g8b8, fbCompositeCopyAreammx, 0 },
++    { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8,  PIXMAN_null,	PIXMAN_x8b8g8r8, fbCompositeCopyAreammx, 0 },
+     { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8,  PIXMAN_null,	PIXMAN_x8r8g8b8, fbCompositeCopyAreammx, 0 },
+     { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8,  PIXMAN_null,	PIXMAN_x8b8g8r8, fbCompositeCopyAreammx, 0 },
+     { PIXMAN_OP_SRC, PIXMAN_r5g6b5,    PIXMAN_null,     PIXMAN_r5g6b5,   fbCompositeCopyAreammx, 0 },
diff --git a/x11/pixman/patches/patch-ad b/x11/pixman/patches/patch-ad
new file mode 100644
index 00000000000..9c3c3bcb3ea
--- /dev/null
+++ b/x11/pixman/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2008/04/07 15:02:05 bjs Exp $
+
+--- pixman/pixman-private.h.orig	2008-03-24 09:13:13.000000000 -0400
++++ pixman/pixman-private.h
+@@ -332,10 +332,6 @@ union pixman_image
+ };
+ 
+ 
+-extern CombineFuncU pixman_fbCombineFuncU[];
+-extern CombineFuncC pixman_fbCombineFuncC[];
+-FASTCALL void pixman_fbCombineMaskU (uint32_t *src, const uint32_t *mask, int width);
+-
+ #define LOG2_BITMAP_PAD 5
+ #define FB_STIP_SHIFT	LOG2_BITMAP_PAD
+ #define FB_STIP_UNIT	(1 << FB_STIP_SHIFT)
diff --git a/x11/pixman/patches/patch-ae b/x11/pixman/patches/patch-ae
new file mode 100644
index 00000000000..445fa063b6d
--- /dev/null
+++ b/x11/pixman/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2008/04/07 15:02:05 bjs Exp $
+
+--- pixman/pixman.h.orig	2008-03-27 06:58:20.000000000 -0400
++++ pixman/pixman.h
+@@ -563,10 +563,6 @@ pixman_bool_t   pixman_image_set_filter 
+ 						      const pixman_fixed_t         *filter_params,
+ 						      int                           n_filter_params);
+ PIXMAN_EXPORT
+-void            pixman_image_set_filter_params       (pixman_image_t               *image,
+-						      pixman_fixed_t               *params,
+-						      int                           n_params);
+-PIXMAN_EXPORT
+ void		pixman_image_set_source_clipping     (pixman_image_t		   *image,
+ 						      pixman_bool_t                 source_clipping);
+ PIXMAN_EXPORT