Update to version 0.11.10, a bug-fix release. In addition,

add a 'gen-symfile' target for regenerating the libtool
export symfile.  This should be run upon updating the package.
While here, silence needless autotools warnings and update
sse2 conditional in hacks.mk.

Changes since 0.11.8:

              Add depth 30 formats to pixman_format_supported_source.

              [sse2] Change pixman-sse to pass __mm128i args as
              pointers, so as not to

              Use CopyAreasse2, plus a compatibility fix

              Use hidden attribute for private functions when
              compiling with Sun Studio

              Minor portability fixes
              Post-release version-bump
              Update RELEASING and release targets in Makefile.am
              Fix typo in sse2 configure logic
              TODO
              Don't require GCC 4.2 on x86-64
              Bug 16921. MMX and SSE2 intrinsics not enabled when
              compiling with Intel'
              Remove use of MMX extensions.
              Be consistent in naming SSE2 related things SSE2
              A few other renamings of SSE->SSE2
              Rename pixman-sse.h pixman-sse2.h
              Make sure pixman-combine{32,64}.h are disted
              Use error instead of #error in a couple of other places
              Check for __sun || __sun in pixman.h. Update TODO
              Bump release
              Update RELEASING

              Add sys/inttypes.h include for AIX

9 files changed, 58 insertions, 63 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 9eb5726a780..72b703a050f 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2008/07/18 19:03:32 bjs Exp $
+# $NetBSD: Makefile,v 1.18 2008/09/06 20:09:15 bjs Exp $
 #
 
-DISTNAME=	pixman-0.11.8
-PKGREVISION=	1
+DISTNAME=	pixman-0.11.10
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,9 +14,16 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config perl
-
-CONFIGURE_ENV+=	AUTOMAKE=${TRUE:Q}	# XXX quiet!
+USE_TOOLS+=	pkg-config perl diff awk
+###
+### XXX Quiet, please!
+###
+.if empty(USE_TOOLS:Mauto*)
+CONFIGURE_ENV+=	AUTOCONF=true
+CONFIGURE_ENV+=	AUTOHEADER=true
+CONFIGURE_ENV+=	ACLOCAL=true
+CONFIGURE_ENV+=	AUTOMAKE=${TRUE:Q}
+.endif
 
 PKGCONFIG_OVERRIDE+=	pixman-1.pc.in
 PKGCONFIG_OVERRIDE+=	pixman-1-uninstalled.pc.in
@@ -27,19 +33,23 @@ PKGCONFIG_OVERRIDE+=	pixman-1-uninstalled.pc.in
 ###	tradition of portability, we'll opt to use libtool to export
 ###	the desired symbols, hiding the rest.
 ###
-###	I have verified the list of visible symbols is unchanged from
-###	the "factory" build.
+###	To regenerate the libtool symfile, invoke the 'gen-symfile'
+###	target, making sure to define PKG_DEVELOPER.  This target
+###	requires nm, awk, and tee.  The new symfile will be in
+###	${WRKDIR}.
 ###
 MAKE_ENV+=	PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q}
 PIXMAN_SYMFILE=	${WRKDIR}/pixman.sym
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Msunpro) || empty(CC_VERSION:Mgcc-4.1*)
-CONFIGURE_ARGS+=	--disable-sse2
-.endif
-
 post-extract:
 	${CP} ${FILESDIR}/pixman.sym ${WRKDIR}
 
+.if defined(NM) && defined(PKG_DEVELOPER)
+gen-symfile: build
+	${NM} -DP ${WRKSRC}/pixman/.libs/libpixman-1.so | 	\
+	${AWK} '/^pixman/ { print $$1 }' | 			\
+	${TOOLS_PLATFORM.tee} > ${WRKDIR}/pixman.sym &&		\
+	${DIFF} ${FILESDIR}/pixman.sym ${WRKDIR}/pixman.sym
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index ea03aa83dbf..cfb56d8fe6a 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2008/07/19 09:57:09 abs Exp $
+$NetBSD: distinfo,v 1.19 2008/09/06 20:09:15 bjs Exp $
 
-SHA1 (pixman-0.11.8.tar.bz2) = 8db43d9fe094073cfcb03c1b1c86296b5a7df1aa
-RMD160 (pixman-0.11.8.tar.bz2) = c1a69a2110b09c0af2bbc05637e74eebdfa7a120
-Size (pixman-0.11.8.tar.bz2) = 360229 bytes
-SHA1 (patch-aa) = 70ed22b9c271e3329344719f575e3bf6ec6d9f89
-SHA1 (patch-ab) = d62794cb2bd230628fa3f263253b39ab106c943f
-SHA1 (patch-ac) = cce53aed1451e328a57c2f3dc80391b3959194af
-SHA1 (patch-ad) = d9305331e7cc19ffa212c87839ed268666ec4b00
-SHA1 (patch-ae) = 1f7f7d9c396ea7e9b90fbb675d0d42de6c439b1a
+SHA1 (pixman-0.11.10.tar.bz2) = d4468ac46056185b2d0a0fe94bc9a2e496d44365
+RMD160 (pixman-0.11.10.tar.bz2) = 8d7350e8d9e995a1f977e03e7a66cdd19e851cb0
+Size (pixman-0.11.10.tar.bz2) = 364132 bytes
+SHA1 (patch-aa) = 5129f82ee9907ed179315a4790667f0b825175bb
+SHA1 (patch-ab) = e76a306cbf2975dec3020cd7a310941b3085782d
+SHA1 (patch-ac) = c798e52ecd8fc2a5788552df0a0842f524705126
+SHA1 (patch-ad) = b2fa221652bc5f8bec000e071417b0180816a451
+SHA1 (patch-ae) = 5690db2799e3750d54cf1cb20bd5734a245f8eb8
diff --git a/x11/pixman/files/pixman.sym b/x11/pixman/files/pixman.sym
index ccfa1e58c0b..748e71f1121 100644
--- a/x11/pixman/files/pixman.sym
+++ b/x11/pixman/files/pixman.sym
@@ -24,7 +24,7 @@ pixman_image_set_accessors
 pixman_image_set_alpha_map
 pixman_image_set_clip_region
 pixman_image_set_clip_region32
-pixman_image_set_component_alpha  
+pixman_image_set_component_alpha
 pixman_image_set_filter
 pixman_image_set_has_client_clip
 pixman_image_set_indexed
diff --git a/x11/pixman/hacks.mk b/x11/pixman/hacks.mk
index 305e7ffd1c3..32b6c052b96 100644
--- a/x11/pixman/hacks.mk
+++ b/x11/pixman/hacks.mk
@@ -1,12 +1,15 @@
-# $NetBSD: hacks.mk,v 1.1 2008/07/18 03:34:10 bjs Exp $
+# $NetBSD: hacks.mk,v 1.2 2008/09/06 20:09:15 bjs Exp $
 #
 .if !defined(PIXMAN_HACKS_MK)
 PIXMAN_HACKS_MK=	# empty
+.  include "../../mk/bsd.fast.prefs.mk"
 .  include "../../mk/compiler.mk"
 ###
-### XXX SSE2 intrinsics require gcc-4.2+ to build.
+### XXX SSE2 intrinsics require gcc-4.2+ to build unless
+###	${MACHINE_ARCH} == "x86_64".
 ###
-.  if !empty(PKGSRC_COMPILER:Msunpro) || empty(CC_VERSION:Mgcc-4.2*)
+.  if !empty(PKGSRC_COMPILER:Msunpro) || \
+   (empty(MACHINE_ARCH:Mx86_64) && empty(CC_VERSION:Mgcc-[4-9].[2-9]*))
 CONFIGURE_ARGS+=	--disable-sse2
 .  endif
 .endif
diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa
index 88e56483467..964f85ac9b4 100644
--- a/x11/pixman/patches/patch-aa
+++ b/x11/pixman/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2008/07/18 03:34:10 bjs Exp $
+$NetBSD: patch-aa,v 1.9 2008/09/06 20:09:16 bjs Exp $
 
---- pixman/Makefile.am.orig	2008-06-09 01:56:58.000000000 -0400
+--- pixman/Makefile.am.orig	2008-09-04 14:56:10.000000000 -0400
 +++ pixman/Makefile.am
 @@ -1,5 +1,6 @@
  lib_LTLIBRARIES = libpixman-1.la
diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab
index ee58d5616bd..aa5ece86e9c 100644
--- a/x11/pixman/patches/patch-ab
+++ b/x11/pixman/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2008/07/18 03:34:10 bjs Exp $
+$NetBSD: patch-ab,v 1.8 2008/09/06 20:09:16 bjs Exp $
 
---- pixman/Makefile.in.orig	2008-06-09 12:35:15.000000000 -0400
+--- pixman/Makefile.in.orig	2008-09-06 06:07:43.000000000 -0400
 +++ pixman/Makefile.in
-@@ -260,7 +260,8 @@ target_alias = @target_alias@
+@@ -263,7 +263,8 @@ target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  lib_LTLIBRARIES = libpixman-1.la
diff --git a/x11/pixman/patches/patch-ac b/x11/pixman/patches/patch-ac
index 2f8d28164d6..f274f76efcc 100644
--- a/x11/pixman/patches/patch-ac
+++ b/x11/pixman/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.6 2008/06/19 17:51:27 bjs Exp $
+$NetBSD: patch-ac,v 1.7 2008/09/06 20:09:16 bjs Exp $
 
---- pixman/pixman-private.h.orig	2008-06-09 01:56:34.000000000 -0400
+--- pixman/pixman-private.h.orig	2008-08-21 21:47:50.000000000 -0400
 +++ pixman/pixman-private.h
-@@ -701,7 +701,7 @@ pixman_compute_composite_region32 (pixma
+@@ -727,7 +727,7 @@ pixman_compute_composite_region32 (pixma
  				   uint16_t		height);
  
  /* GCC visibility */
 -#if defined(__GNUC__) && __GNUC__ >= 4
 +#if 0
  #define PIXMAN_EXPORT __attribute__ ((visibility("default")))
- #else
- #define PIXMAN_EXPORT
+ /* Sun Studio 8 visibility */
+ #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
diff --git a/x11/pixman/patches/patch-ad b/x11/pixman/patches/patch-ad
index e5fafc59fea..f3277e0f640 100644
--- a/x11/pixman/patches/patch-ad
+++ b/x11/pixman/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2008/07/18 19:03:32 bjs Exp $
+$NetBSD: patch-ad,v 1.4 2008/09/06 20:09:16 bjs Exp $
 
---- configure.ac.orig	2008-07-17 13:38:50.000000000 -0400
+--- configure.ac.orig	2008-09-06 06:06:45.000000000 -0400
 +++ configure.ac
 @@ -109,14 +109,14 @@ dnl ====================================
  dnl -fvisibility stuff
@@ -10,13 +10,13 @@ $NetBSD: patch-ad,v 1.3 2008/07/18 19:03:32 bjs Exp $
 -AC_COMPILE_IFELSE([
 -#if defined(__GNUC__) && (__GNUC__ >= 4)
 -#else
--#error Need GCC 4.0 for visibility
+-error Need GCC 4.0 for visibility
 -#endif
 +dnl AC_MSG_CHECKING(for -fvisibility)
 +dnl AC_COMPILE_IFELSE([
 +dnl #if defined(__GNUC__) && (__GNUC__ >= 4)
 +dnl #else
-+dnl #error Need GCC 4.0 for visibility
++dnl error Need GCC 4.0 for visibility
 +dnl #endif
  int main () { return 0; } 
 -], have_gcc4=yes)
@@ -24,12 +24,3 @@ $NetBSD: patch-ad,v 1.3 2008/07/18 19:03:32 bjs Exp $
  
  if test "x$have_gcc4" = "xyes"; then
     CFLAGS="$CFLAGS -fvisibility=hidden"
-@@ -250,7 +250,7 @@ if test $have_sse2_intrinsics = yes ; th
- fi
- 
- AC_MSG_RESULT($have_sse2_intrinsics)
--if test $enable_sse2 = yes && test $have_sse_intrinsics = no ; then
-+if test $enable_sse2 = yes && test $have_sse2_intrinsics = no ; then
-    AC_MSG_ERROR([SSE2 intrinsics not detected])
- fi
- 
diff --git a/x11/pixman/patches/patch-ae b/x11/pixman/patches/patch-ae
index 3cef77db203..498bdf2e3d6 100644
--- a/x11/pixman/patches/patch-ae
+++ b/x11/pixman/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2008/07/18 19:03:32 bjs Exp $
+$NetBSD: patch-ae,v 1.7 2008/09/06 20:09:16 bjs Exp $
 
---- configure.orig	2008-07-17 13:39:07.000000000 -0400
+--- configure.orig	2008-09-06 06:07:45.000000000 -0400
 +++ configure
-@@ -19773,6 +19773,7 @@ fi
+@@ -20218,6 +20218,7 @@ fi
  
  
  have_gcc4=no
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.6 2008/07/18 19:03:32 bjs Exp $
  { echo "$as_me:$LINENO: checking for -fvisibility" >&5
  echo $ECHO_N "checking for -fvisibility... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
-@@ -19810,7 +19811,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -20255,7 +20256,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -19,12 +19,3 @@ $NetBSD: patch-ae,v 1.6 2008/07/18 19:03:32 bjs Exp $
  if test "x$have_gcc4" = "xyes"; then
     CFLAGS="$CFLAGS -fvisibility=hidden"
  fi
-@@ -20057,7 +20058,7 @@ fi
- 
- { echo "$as_me:$LINENO: result: $have_sse2_intrinsics" >&5
- echo "${ECHO_T}$have_sse2_intrinsics" >&6; }
--if test $enable_sse2 = yes && test $have_sse_intrinsics = no ; then
-+if test $enable_sse2 = yes && test $have_sse2_intrinsics = no ; then
-    { { echo "$as_me:$LINENO: error: SSE2 intrinsics not detected" >&5
- echo "$as_me: error: SSE2 intrinsics not detected" >&2;}
-    { (exit 1); exit 1; }; }