Maintaining this package seems like a full-time job!

Correct the sse2 detection logic in configure/configure.ac.
Bump PKGREVISION.

4 files changed, 31 insertions, 11 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index eaad5295f3d..9eb5726a780 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.16 2008/07/18 03:34:10 bjs Exp $
+# $NetBSD: Makefile,v 1.17 2008/07/18 19:03:32 bjs Exp $
 #
 
 DISTNAME=	pixman-0.11.8
+PKGREVISION=	1
 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
@@ -17,6 +17,8 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config perl
 
+CONFIGURE_ENV+=	AUTOMAKE=${TRUE:Q}	# XXX quiet!
+
 PKGCONFIG_OVERRIDE+=	pixman-1.pc.in
 PKGCONFIG_OVERRIDE+=	pixman-1-uninstalled.pc.in
 ###
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 58395210a6e..2ae5a9ae6e5 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2008/07/18 03:34:10 bjs Exp $
+$NetBSD: distinfo,v 1.17 2008/07/18 19:03:32 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-aa) = ab482868ebfa231942fa591968a3ef5ff2988e46
 SHA1 (patch-ab) = d62794cb2bd230628fa3f263253b39ab106c943f
 SHA1 (patch-ac) = cce53aed1451e328a57c2f3dc80391b3959194af
-SHA1 (patch-ad) = c7fe169e062bbdc58db484874409a502f0f80018
-SHA1 (patch-ae) = 007f2487b53975eb10550b6540650a220e6b60d8
+SHA1 (patch-ad) = d9305331e7cc19ffa212c87839ed268666ec4b00
+SHA1 (patch-ae) = 1f7f7d9c396ea7e9b90fbb675d0d42de6c439b1a
diff --git a/x11/pixman/patches/patch-ad b/x11/pixman/patches/patch-ad
index eed1987c561..e5fafc59fea 100644
--- a/x11/pixman/patches/patch-ad
+++ b/x11/pixman/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2008/06/19 17:51:27 bjs Exp $
+$NetBSD: patch-ad,v 1.3 2008/07/18 19:03:32 bjs Exp $
 
---- configure.ac.orig	2008-06-09 12:32:10.000000000 -0400
+--- configure.ac.orig	2008-07-17 13:38:50.000000000 -0400
 +++ configure.ac
-@@ -112,14 +112,14 @@ dnl ====================================
+@@ -109,14 +109,14 @@ dnl ====================================
  dnl -fvisibility stuff
  
  have_gcc4=no
@@ -24,3 +24,12 @@ $NetBSD: patch-ad,v 1.2 2008/06/19 17:51:27 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 f4cc8611cc0..3cef77db203 100644
--- a/x11/pixman/patches/patch-ae
+++ b/x11/pixman/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2008/07/13 23:16:02 bjs Exp $
+$NetBSD: patch-ae,v 1.6 2008/07/18 19:03:32 bjs Exp $
 
---- configure.orig	2008-06-25 07:55:10.000000000 -0400
+--- configure.orig	2008-07-17 13:39:07.000000000 -0400
 +++ configure
 @@ -19773,6 +19773,7 @@ fi
  
@@ -19,3 +19,12 @@ $NetBSD: patch-ae,v 1.5 2008/07/13 23:16:02 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; }; }