Update to pixman-0.15.2 from 0.12.0

Upstream changes (since 0.12.0):
  - Fix MMX & SSE intrinsics to work with Sun compilers & Solaris
  - More SSE2 optimizations
  - Optimize rectilinear nearest-neighbour scaling
  - Add support for BGRA and BGRx formats
  and a lot of minor bug fixes and optimizations

Oked by wiz@

7 files changed, 28 insertions, 91 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 202b3b2dd26..aee983bff78 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2008/10/15 00:56:45 bjs Exp $
+# $NetBSD: Makefile,v 1.22 2009/04/23 08:30:53 sno Exp $
 #
 
-DISTNAME=	pixman-0.12.0
+DISTNAME=	pixman-0.15.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 39006b651b2..e57012c6623 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.21 2008/10/15 00:56:45 bjs Exp $
+$NetBSD: distinfo,v 1.22 2009/04/23 08:30:53 sno Exp $
 
-SHA1 (pixman-0.12.0.tar.bz2) = 0c57c6c7e21e2545257068f52517c460e6e51ae4
-RMD160 (pixman-0.12.0.tar.bz2) = 7881189a1de21ec5d2e27936c65369f121dcb15f
-Size (pixman-0.12.0.tar.bz2) = 364262 bytes
+SHA1 (pixman-0.15.2.tar.bz2) = fd44f4dc0e429bb71344d33c783837fd0b8b6b5b
+RMD160 (pixman-0.15.2.tar.bz2) = 5d925326dfdc3ad73d98eb48f92eccab0f97f63c
+Size (pixman-0.15.2.tar.bz2) = 343019 bytes
 SHA1 (patch-aa) = 5129f82ee9907ed179315a4790667f0b825175bb
-SHA1 (patch-ab) = e76a306cbf2975dec3020cd7a310941b3085782d
+SHA1 (patch-ab) = 11fe86650fe666366818dd70ecabeac7a49c1dba
 SHA1 (patch-ac) = c798e52ecd8fc2a5788552df0a0842f524705126
 SHA1 (patch-ad) = b2fa221652bc5f8bec000e071417b0180816a451
-SHA1 (patch-ae) = 5690db2799e3750d54cf1cb20bd5734a245f8eb8
-SHA1 (patch-ah) = 88a444f4ed0bc12387c22751b4cd4ef7cf5a5126
-SHA1 (patch-ai) = 5af5d1287b73ae35d6bc5a6adb5ae4709bf57e67
+SHA1 (patch-ae) = 43ac5ba418bb335ef65634bc6dea5d7dc89a19d0
diff --git a/x11/pixman/hacks.mk b/x11/pixman/hacks.mk
index 32b6c052b96..ef096d66730 100644
--- a/x11/pixman/hacks.mk
+++ b/x11/pixman/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2008/09/06 20:09:15 bjs Exp $
+# $NetBSD: hacks.mk,v 1.3 2009/04/23 08:30:53 sno Exp $
 #
 .if !defined(PIXMAN_HACKS_MK)
 PIXMAN_HACKS_MK=	# empty
@@ -8,8 +8,9 @@ PIXMAN_HACKS_MK=	# empty
 ### XXX SSE2 intrinsics require gcc-4.2+ to build unless
 ###	${MACHINE_ARCH} == "x86_64".
 ###
-.  if !empty(PKGSRC_COMPILER:Msunpro) || \
-   (empty(MACHINE_ARCH:Mx86_64) && empty(CC_VERSION:Mgcc-[4-9].[2-9]*))
+.  if empty(PKGSRC_COMPILER:Msunpro) && \
+   (empty(MACHINE_ARCH:Mx86_64) && \
+     (empty(CC_VERSION:Mgcc-4.[2-9]*) || empty(CC_VERSION:Mgcc-[5-9].*) || empty(CC_VERSION:Mgcc-[1-9][0-9]*)))
 CONFIGURE_ARGS+=	--disable-sse2
 .  endif
 .endif
diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab
index aa5ece86e9c..6cb032e21fd 100644
--- a/x11/pixman/patches/patch-ab
+++ b/x11/pixman/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.8 2008/09/06 20:09:16 bjs Exp $
+$NetBSD: patch-ab,v 1.9 2009/04/23 08:30:53 sno Exp $
 
---- pixman/Makefile.in.orig	2008-09-06 06:07:43.000000000 -0400
-+++ pixman/Makefile.in
-@@ -263,7 +263,8 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
+--- pixman/Makefile.in.orig	2009-04-09 20:23:27.000000000 +0000
++++ pixman/Makefile.in	2009-04-12 08:55:34.000000000 +0000
+@@ -288,7 +288,8 @@
  top_srcdir = @top_srcdir@
  lib_LTLIBRARIES = libpixman-1.la
--libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined
-+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined \
+ libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
+-	-no-undefined $(am__append_2) $(am__append_7)
++	-no-undefined $(am__append_2) $(am__append_7) \
 +	-export-symbols $(PIXMAN_SYMFILE)
- libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_2) $(am__append_4) \
- 	$(am__append_6)
+ libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_3) $(am__append_5) \
+ 	$(am__append_8) $(am__append_10)
  libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED
diff --git a/x11/pixman/patches/patch-ae b/x11/pixman/patches/patch-ae
index 498bdf2e3d6..5ac8e4479c7 100644
--- a/x11/pixman/patches/patch-ae
+++ b/x11/pixman/patches/patch-ae
@@ -1,16 +1,16 @@
-$NetBSD: patch-ae,v 1.7 2008/09/06 20:09:16 bjs Exp $
+$NetBSD: patch-ae,v 1.8 2009/04/23 08:30:53 sno Exp $
 
---- configure.orig	2008-09-06 06:07:45.000000000 -0400
-+++ configure
-@@ -20218,6 +20218,7 @@ fi
+--- configure.orig	2009-02-06 22:33:17.000000000 +0000
++++ configure	2009-04-12 08:19:38.000000000 +0000
+@@ -20588,6 +20588,7 @@
  
  
  have_gcc4=no
 +if false; then
- { echo "$as_me:$LINENO: checking for -fvisibility" >&5
- echo $ECHO_N "checking for -fvisibility... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for -fvisibility" >&5
+ $as_echo_n "checking for -fvisibility... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
-@@ -20255,7 +20256,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -20626,7 +20627,7 @@
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
diff --git a/x11/pixman/patches/patch-ah b/x11/pixman/patches/patch-ah
deleted file mode 100644
index 04974c67d18..00000000000
--- a/x11/pixman/patches/patch-ah
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/10/15 00:56:45 bjs Exp $
-
-
-1c5de7b05831b3d66821707276b71974a232f5c7
-
-Move _mm_empty() to correct place
-
-The "fbComposeSetupSSE2()" function is guarding most of its code
-depending on the capabilities of the CPU, but unfortunately the call
-to "_mm_empty()" is not part of this code path but executed
-unconditionally.  This results in a "illegal instruction" crash on
-non-MMX / non-SSE capable CPUs caused by the the "emms" instruction
-(embedded in "_mm_empty()").
-
-Fix bug 17729.
-
---- pixman/pixman-sse2.c.orig	2008-09-17 09:50:49.000000000 -0400
-+++ pixman/pixman-sse2.c
-@@ -2357,11 +2357,11 @@ fbComposeSetupSSE2(void)
-         pixman_composeFunctions.combineC[PIXMAN_OP_ADD] = sse2CombineAddC;
- 
-         pixman_composeFunctions.combineMaskU = sse2CombineMaskU;
-+
-+	_mm_empty();
-     }
- 
-     initialized = TRUE;
--
--    _mm_empty();
- }
- 
- 
diff --git a/x11/pixman/patches/patch-ai b/x11/pixman/patches/patch-ai
deleted file mode 100644
index 3c34b80b566..00000000000
--- a/x11/pixman/patches/patch-ai
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2008/10/15 00:56:45 bjs Exp $
-
-69dadf231283fadcb117b4d9e799e8633a0e4dab
-
-force alignment of arg pointer in potential SSE users
-
-Fix for bug 17824
-
---- pixman/pixman-utils.c.orig	2008-09-09 08:28:23.000000000 -0400
-+++ pixman/pixman-utils.c
-@@ -62,6 +62,9 @@ pixman_transform_point_3d (pixman_transf
-     return TRUE;
- }
- 
-+#if defined(USE_SSE2) && defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
-+__attribute__((__force_align_arg_pointer__))
-+#endif
- PIXMAN_EXPORT pixman_bool_t
- pixman_blt (uint32_t *src_bits,
- 	    uint32_t *dst_bits,
-@@ -156,6 +159,9 @@ pixman_fill32 (uint32_t *bits,
-     }
- }
- 
-+#if defined(USE_SSE2) && defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
-+__attribute__((__force_align_arg_pointer__))
-+#endif
- PIXMAN_EXPORT pixman_bool_t
- pixman_fill (uint32_t *bits,
- 	     int stride,