Update to latest GIT snapshot. Minor fixes, plus all patches are no

longer needed (finally).  Bump rev.

5 files changed, 6 insertions, 85 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 8d0c87643c8..d8c5a4f9d04 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/01/18 03:12:13 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2008/02/07 06:40:27 bjs Exp $
 #
 
 DISTNAME=	pixman-0.9.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 4cc39ef3d48..a832e168b54 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/01/18 03:12:40 bjs Exp $
+$NetBSD: distinfo,v 1.5 2008/02/07 06:40:27 bjs Exp $
 
-SHA1 (pixman-0.9.6.tar.bz2) = 922405d4eaf79af902a71fab141049ca360dc1c8
-RMD160 (pixman-0.9.6.tar.bz2) = cdd1fa5272429a95bb5343028bead70d7dde2dec
-Size (pixman-0.9.6.tar.bz2) = 278790 bytes
-SHA1 (patch-aa) = cd646d6ec515a66247fb9f16d1b46648f4926af1
-SHA1 (patch-ab) = 38ebdb75be9fc41e61c0cc594b3a13c6778d2f23
-SHA1 (patch-ac) = 8dab9fc8a2c9a38b950f3688d6c5d9f749b41796
+SHA1 (pixman-0.9.6.tar.bz2) = 9dc40e9c1610080a92b054cdbf1c417f605eb5ce
+RMD160 (pixman-0.9.6.tar.bz2) = 928e18c06b959b6e7cb7f13ebf113fd2d8cf9493
+Size (pixman-0.9.6.tar.bz2) = 281291 bytes
diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa
deleted file mode 100644
index e7fa8483239..00000000000
--- a/x11/pixman/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/01/18 03:12:41 bjs Exp $
-
-Not only OpenBSD has <inttypes.h>.
-
---- pixman/pixman.h.orig	2007-12-17 18:50:58.000000000 -0500
-+++ pixman/pixman.h
-@@ -75,7 +75,7 @@ SOFTWARE.
- #if defined (__SVR4) && defined (__sun)
- #  include <sys/int_types.h>
- #  include <stdint.h>
--#elif defined (__OpenBSD__)
-+#elif defined (HAVE_INTTYPES_H)
- #  include <inttypes.h>
- #elif defined (_MSC_VER)
- typedef __int8 int8_t;
-@@ -370,7 +370,7 @@ pixman_bool_t pixman_fill (uint32_t *bit
- 			   int y,
- 			   int width,
- 			   int height,
--			   uint32_t xor);
-+			   uint32_t _xor);
- /*
-  * Images
-  */
diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab
deleted file mode 100644
index 6eee20cf1d2..00000000000
--- a/x11/pixman/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/11/08 19:51:43 bjs Exp $
-
-Some platforms (such as NetBSD) have UINT32_MAX without UINT32_MIN.
-This makes sense to me, as what else could be the minimum 
---- pixman/pixman-private.h.orig	2007-10-24 12:30:17.000000000 -0400
-+++ pixman/pixman-private.h
-@@ -48,7 +48,10 @@
- #endif
- 
- #ifndef UINT32_MIN
--# define UINT32_MIN             (0)
-+# define UINT32_MIN             (0) /* XXX What else could this possibly be? */
-+#endif
-+
-+#ifndef  UINT32_MAX
- # define UINT32_MAX             (4294967295U)
- #endif
- 
diff --git a/x11/pixman/patches/patch-ac b/x11/pixman/patches/patch-ac
deleted file mode 100644
index 2a12bdb3e05..00000000000
--- a/x11/pixman/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/01/09 04:16:41 bjs Exp $
-
-Don't use the pixbuf fast paths when the source picture has alpha. Patch
-from GIT, fixes bug #13650.
-
---- pixman/pixman-pict.c.orig	2007-12-17 18:50:58.000000000 -0500
-+++ pixman/pixman-pict.c
-@@ -1426,26 +1426,14 @@ static const FastPathInfo mmx_fast_paths
-     { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8b8g8r8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8r8g8b8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8b8g8r8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_a8r8g8b8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_a8b8g8r8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_a8r8g8b8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_a8b8g8r8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8r8g8b8, PIXMAN_r5g6b5,   fbCompositeSrc_8888RevNPx0565mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8b8g8r8, PIXMAN_r5g6b5,   fbCompositeSrc_8888RevNPx0565mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_a8r8g8b8, PIXMAN_r5g6b5,   fbCompositeSrc_8888RevNPx0565mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_a8b8g8r8, PIXMAN_r5g6b5,   fbCompositeSrc_8888RevNPx0565mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8r8g8b8, PIXMAN_a8b8g8r8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8b8g8r8, PIXMAN_a8b8g8r8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8r8g8b8, PIXMAN_x8b8g8r8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8b8g8r8, PIXMAN_x8b8g8r8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8r8g8b8, PIXMAN_a8b8g8r8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8b8g8r8, PIXMAN_a8b8g8r8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8r8g8b8, PIXMAN_x8b8g8r8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8b8g8r8, PIXMAN_x8b8g8r8, fbCompositeSrc_8888RevNPx8888mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8r8g8b8, PIXMAN_b5g6r5,   fbCompositeSrc_8888RevNPx0565mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8b8g8r8, PIXMAN_b5g6r5,   fbCompositeSrc_8888RevNPx0565mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8r8g8b8, PIXMAN_b5g6r5,   fbCompositeSrc_8888RevNPx0565mmx, NEED_PIXBUF },
--    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8b8g8r8, PIXMAN_b5g6r5,   fbCompositeSrc_8888RevNPx0565mmx, NEED_PIXBUF },
-     { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8,       PIXMAN_a8r8g8b8, fbCompositeSrc_x888xnx8888mmx,    NEED_SOLID_MASK },
-     { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8,       PIXMAN_x8r8g8b8, fbCompositeSrc_x888xnx8888mmx,	   NEED_SOLID_MASK },
-     { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8,	PIXMAN_a8b8g8r8, fbCompositeSrc_x888xnx8888mmx,	   NEED_SOLID_MASK },