Update to pixman-0.11.6. ChangeLog:

commit a766b62880108f278478888f5167a5fbf2819a97

    Add configure time options to disable mmx/sse2/vmx

commit 02268903e4311709744c11e495f9b17f171ec5e9

    pixman-sse.c: silence pointer-cast compiler warnings.

    Cast pointers to words of the same size, not 32-bits.

commit eb2d95de98683a387153f010077ad9c3c3b1b01d

    Fix implicit declaration of function 'free'.

    Otherwise pointer will be truncated on 64bit arch and
    your programs will crash.

commit 29d144712e558aaeb49f4384028dd669d76a410b

    Fix memory leak by freeing boxes{16,32}.

    After calling pixman_region_init_rects() or
    pixman_region32_init_rects(), boxes{16,32} were not freed before
    returning. Fixes bug 16312.

commit 5d32519316b40b35113c6df9e15d955a16709ba2

    Use pixman_malloc_ab instead of plain malloc for the
    fbStore64_generic scratch buffer.

commit b1c70c4e6435d7f15751111828c381feb1d139cf

    Move PIXMAN_FORMAT_16BPC to pixman-private.h

commit 7fa966df0ee781fa486715710f389b148c11d36e

    Decide based on the image formats whether we need wide compositing.

commit 7cb735c9c0fa55ae1f4d8d13da9f33e3da2ae8fe

    Take the source format into account in pixman_expand.

    Extract the original bits of the source image for each
    component and then replicate up to 16 bits to fill the wide
    components.  Make sure to hard-code the alpha value to 1 if
    the source format didn't have alpha.

commit c0d98e96605c6d03f4b02f337f2f5827165bb092

    Make expansion and contraction loops clearer.

commit fc0b28bf6af81428b7ac045614eea97fbf9c4a70

    Add wide source picture, external alpha, and transformed
    image routines.  The wide external alpha path should work
    correctly with wide formats.  The wide transformed fetch code for
    now just does a 32-bit fetch and then expands, which will lose
    precision.  Source pictures, for now, are evaluated at depth 32
    and then are expanded to depth 64.  We could get higher precision
    by evaluating them directly at depth 64, but this should be good
    enough for now.

commit 42a3a2d6fc8d3e521c6914ff8fb89f1fbc673e28

    Add wide fetch/store functions.

    Use the narrow ones and expand/contract where necessary.  Still
    need wide paths for fancy pictures, but this gets the
    basic stuff working.

commit 7591d3f1d7e0884f9362018edf720724095cf380

    Add expand and contract functions to convert between ARGB8
    and ARGB16.  The expansion function isn't quite correct,
    but gives reasonable results.

3 files changed, 13 insertions, 29 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index f3e94e41fd1..e49ad50e627 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2008/06/19 17:59:52 bjs Exp $
+# $NetBSD: Makefile,v 1.14 2008/07/13 23:16:02 bjs Exp $
 #
 
-DISTNAME=	pixman-0.11.4
-PKGNAME=	${DISTNAME:C/pl[0-9]*//}
+DISTNAME=	pixman-0.11.6
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
 
+
 MAINTAINER=	bjs@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Library of low-level pixel manipulation routines
@@ -27,8 +27,8 @@ PKGCONFIG_OVERRIDE+=	pixman-1.pc.in
 ###	I have verified the list of visible symbols is unchanged from
 ###	the "factory" build.
 ###
+MAKE_ENV+=	PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q}
 PIXMAN_SYMFILE=	${WRKDIR}/pixman.sym
-MAKE_ENV+=		PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q}
 
 post-extract:
 	${CP} ${FILESDIR}/pixman.sym ${WRKDIR}
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index d2f8c61afa1..3a7e448e802 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2008/07/12 15:34:48 tnn Exp $
+$NetBSD: distinfo,v 1.15 2008/07/13 23:16:02 bjs Exp $
 
-SHA1 (pixman-0.11.4.tar.bz2) = e74dfcc6435edf7a397e8c42ffb4d581484e05d3
-RMD160 (pixman-0.11.4.tar.bz2) = 000ec544e1c25b6ef955eed098c3906b095e10d5
-Size (pixman-0.11.4.tar.bz2) = 330235 bytes
+SHA1 (pixman-0.11.6.tar.bz2) = 9ee97f75d98678d50d4a400a9266bf05d3835481
+RMD160 (pixman-0.11.6.tar.bz2) = 0b9e7a1f8b5f724d6cb374a6ab467211c01fc880
+Size (pixman-0.11.6.tar.bz2) = 359630 bytes
 SHA1 (patch-aa) = dbb1a2ef0c8f9db1e4897b60b3c8b6dc8a44dd39
 SHA1 (patch-ab) = 41634a1a885fcf08800073ccd094db4f02020e3a
 SHA1 (patch-ac) = cce53aed1451e328a57c2f3dc80391b3959194af
 SHA1 (patch-ad) = c7fe169e062bbdc58db484874409a502f0f80018
-SHA1 (patch-ae) = cf6ce4df1d116711db6e5051e513ea2dfc121dba
+SHA1 (patch-ae) = 007f2487b53975eb10550b6540650a220e6b60d8
diff --git a/x11/pixman/patches/patch-ae b/x11/pixman/patches/patch-ae
index 2ed3ff96db7..f4cc8611cc0 100644
--- a/x11/pixman/patches/patch-ae
+++ b/x11/pixman/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2008/07/12 15:34:49 tnn Exp $
+$NetBSD: patch-ae,v 1.5 2008/07/13 23:16:02 bjs Exp $
 
---- configure.orig	2008-06-09 18:35:16.000000000 +0200
+--- configure.orig	2008-06-25 07:55:10.000000000 -0400
 +++ configure
-@@ -19770,6 +19770,7 @@ fi
+@@ -19773,6 +19773,7 @@ fi
  
  
  have_gcc4=no
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.4 2008/07/12 15:34:49 tnn Exp $
  { echo "$as_me:$LINENO: checking for -fvisibility" >&5
  echo $ECHO_N "checking for -fvisibility... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
-@@ -19807,7 +19808,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -19810,7 +19811,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -19,19 +19,3 @@ $NetBSD: patch-ae,v 1.4 2008/07/12 15:34:49 tnn Exp $
  if test "x$have_gcc4" = "xyes"; then
     CFLAGS="$CFLAGS -fvisibility=hidden"
  fi
-@@ -19969,6 +19970,7 @@ fi
- have_sse2_intrinsics=no
- { echo "$as_me:$LINENO: checking whether to use SSE2 intrinsics" >&5
- echo $ECHO_N "checking whether to use SSE2 intrinsics... $ECHO_C" >&6; }
-+if test $have_sse_intrinsics = yes; then
- xserver_save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -msse2 $SSE_CFLAGS"
- 
-@@ -20013,6 +20015,7 @@ fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$xserver_save_CFLAGS
-+fi
- { echo "$as_me:$LINENO: result: $have_sse2_intrinsics" >&5
- echo "${ECHO_T}$have_sse2_intrinsics" >&6; }
-