[pkgsrc/trunk]: pkgsrc/x11/pixman Skip the SSE2 configure test if we already ...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/043582f207bd
branches:  trunk
changeset: 541885:043582f207bd
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Apr 27 11:58:09 2008 +0000

description:
Skip the SSE2 configure test if we already know we don't have SSE,
because Sun Studio gets the result of the SSE2 test wrong.

Bump PKGREVISION.

diffstat:

 x11/pixman/Makefile         |   4 ++--
 x11/pixman/distinfo         |   4 ++--
 x11/pixman/patches/patch-af |  24 ++++++++++++++++++++----
 3 files changed, 24 insertions(+), 8 deletions(-)

diffs (81 lines):

diff -r 6eca8e41c53c -r 043582f207bd x11/pixman/Makefile
--- a/x11/pixman/Makefile       Sun Apr 27 11:00:46 2008 +0000
+++ b/x11/pixman/Makefile       Sun Apr 27 11:58:09 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/04/23 09:44:05 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/27 11:58:09 tnn Exp $
 #
 
 DISTNAME=      pixman-0.10.0
 PKGNAME=       ${DISTNAME:C/pl[0-9]*//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=  .tar.bz2
diff -r 6eca8e41c53c -r 043582f207bd x11/pixman/distinfo
--- a/x11/pixman/distinfo       Sun Apr 27 11:00:46 2008 +0000
+++ b/x11/pixman/distinfo       Sun Apr 27 11:58:09 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/04/23 12:12:06 tnn Exp $
+$NetBSD: distinfo,v 1.11 2008/04/27 11:58:09 tnn Exp $
 
 SHA1 (pixman-0.10.0.tar.bz2) = 9262e945281877c42d484098de664dcf1a68d857
 RMD160 (pixman-0.10.0.tar.bz2) = 16c356f5fa3dfa4c0196456552daca3ab6244276
@@ -8,4 +8,4 @@
 SHA1 (patch-ac) = 093aab2151261285506197e566dd3ae62b06b716
 SHA1 (patch-ad) = d35b932e5fb29b5022fc1f02a9568183ae4cdbd4
 SHA1 (patch-ae) = 9fb4cedc19c07c368af02589fda6d5d9cd47c174
-SHA1 (patch-af) = 040742ec6fc84aaa78ee4e55997a9dc216ed70af
+SHA1 (patch-af) = c2f0cd54a1bcb342a9769b34b303b143735ddc3f
diff -r 6eca8e41c53c -r 043582f207bd x11/pixman/patches/patch-af
--- a/x11/pixman/patches/patch-af       Sun Apr 27 11:00:46 2008 +0000
+++ b/x11/pixman/patches/patch-af       Sun Apr 27 11:58:09 2008 +0000
@@ -1,8 +1,15 @@
-$NetBSD: patch-af,v 1.1 2008/04/23 09:44:05 tnn Exp $
+$NetBSD: patch-af,v 1.2 2008/04/27 11:58:09 tnn Exp $
+
+Basically this patch:
 
-http://gitweb.freedesktop.org/?p=pixman.git;a=blobdiff;h=637f835221631b0f3d79d8f0f3b256883d34770b;hp=79997e15ea645ab74d2858b574b4e8b451fb8084;hb=0c33317f59b93f5cab348619b1c38a5dce97de94;f=configure.ac
+http://gitweb.freedesktop.org/?p=pixman.git;a=blobdiff;h=637f835221631b0f3d79d8
+f0f3b256883d34770b;hp=79997e15ea645ab74d2858b574b4e8b451fb8084;hb=0c33317f59b93f
+5cab348619b1c38a5dce97de94;f=configure.ac
 
---- configure.orig     2008-04-23 11:18:48.000000000 +0200
+... but also avoid --param inline-unit-growth with gcc3,
+and don't attempt to use SSE2 if the SSE test failed.
+
+--- configure.orig     2008-03-27 15:02:11.000000000 +0100
 +++ configure
 @@ -19762,7 +19762,11 @@ fi
  echo "${ECHO_T}$have_gcc4" >&6; }
@@ -27,7 +34,7 @@
  #if !defined(__amd64__) && !defined(__x86_64__)
  #error "Need x86-64 for SSE"
  #endif
-@@ -19900,18 +19907,26 @@ fi
+@@ -19900,18 +19907,27 @@ fi
  
  
  
@@ -41,6 +48,7 @@
  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 $MMX_CFLAGS"
 +CFLAGS="$CFLAGS -msse2 $SSE_CFLAGS"
@@ -56,3 +64,11 @@
  int main () {
      __m128i a, b, c;
        c = _mm_xor_si128 (a, b);
+@@ -19945,6 +19961,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; }
+