- add patch from git for disabling gcc --param inline-* if not GCC, and

  change patch to disable if not GCC4.
- add patch from PR pkg/38484 to fix missing symbol pixman_have_sse
- bump PKGREVISION

4 files changed, 90 insertions, 5 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 556b6be2924..6137cbf9314 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2008/04/07 15:02:04 bjs Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/23 09:44:05 tnn Exp $
 #
 
 DISTNAME=	pixman-0.10.0
 PKGNAME=	${DISTNAME:C/pl[0-9]*//}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index b95d842c2a6..a0f42ba05eb 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.8 2008/04/07 15:02:04 bjs Exp $
+$NetBSD: distinfo,v 1.9 2008/04/23 09:44:05 tnn Exp $
 
 SHA1 (pixman-0.10.0.tar.bz2) = 9262e945281877c42d484098de664dcf1a68d857
 RMD160 (pixman-0.10.0.tar.bz2) = 16c356f5fa3dfa4c0196456552daca3ab6244276
 Size (pixman-0.10.0.tar.bz2) = 312275 bytes
 SHA1 (patch-aa) = 56388eac3744ea78e4c2ba656d5c5110623a7de4
 SHA1 (patch-ab) = 5322a03dbcacca50898e3a318174cb47344da28e
-SHA1 (patch-ac) = 093aab2151261285506197e566dd3ae62b06b716
+SHA1 (patch-ac) = d668e2df1b111af10a4f4ebaeeb2df24d37a1c76
 SHA1 (patch-ad) = d35b932e5fb29b5022fc1f02a9568183ae4cdbd4
 SHA1 (patch-ae) = 9fb4cedc19c07c368af02589fda6d5d9cd47c174
+SHA1 (patch-af) = 040742ec6fc84aaa78ee4e55997a9dc216ed70af
diff --git a/x11/pixman/patches/patch-ac b/x11/pixman/patches/patch-ac
index 088382e1e3a..c9e0f88c0b7 100644
--- a/x11/pixman/patches/patch-ac
+++ b/x11/pixman/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2008/04/07 15:02:05 bjs Exp $
+$NetBSD: patch-ac,v 1.4 2008/04/23 09:44:05 tnn Exp $
 
---- pixman/pixman-pict.c.orig	2008-03-27 06:58:20.000000000 -0400
+--- pixman/pixman-pict.c.orig	2008-03-27 11:58:20.000000000 +0100
 +++ pixman/pixman-pict.c
 @@ -1428,6 +1428,8 @@ static const FastPathInfo mmx_fast_paths
  
@@ -11,3 +11,28 @@ $NetBSD: patch-ac,v 1.3 2008/04/07 15:02:05 bjs Exp $
      { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8,  PIXMAN_null,	PIXMAN_x8r8g8b8, fbCompositeCopyAreammx, 0 },
      { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8,  PIXMAN_null,	PIXMAN_x8b8g8r8, fbCompositeCopyAreammx, 0 },
      { PIXMAN_OP_SRC, PIXMAN_r5g6b5,    PIXMAN_null,     PIXMAN_r5g6b5,   fbCompositeCopyAreammx, 0 },
+@@ -1751,7 +1753,7 @@ pixman_image_composite (pixman_op_t     
+ }
+ 
+ 
+-#ifdef USE_MMX
++#if defined(USE_MMX) || defined(USE_SSE2)
+ /* The CPU detection code needs to be in a file not compiled with
+  * "-mmmx -msse", as gcc would generate CMOV instructions otherwise
+  * that would lead to SIGILL instructions on old CPUs that don't have
+@@ -1933,6 +1935,7 @@ static unsigned int detectCPUFeatures(vo
+     return features;
+ }
+ 
++#ifdef USE_MMX
+ pixman_bool_t
+ pixman_have_mmx (void)
+ {
+@@ -1948,6 +1951,7 @@ pixman_have_mmx (void)
+ 
+     return mmx_present;
+ }
++#endif
+ 
+ #ifdef USE_SSE2
+ pixman_bool_t
diff --git a/x11/pixman/patches/patch-af b/x11/pixman/patches/patch-af
new file mode 100644
index 00000000000..3c372b5d7b5
--- /dev/null
+++ b/x11/pixman/patches/patch-af
@@ -0,0 +1,58 @@
+$NetBSD: patch-af,v 1.1 2008/04/23 09:44:05 tnn Exp $
+
+http://gitweb.freedesktop.org/?p=pixman.git;a=blobdiff;h=637f835221631b0f3d79d8f0f3b256883d34770b;hp=79997e15ea645ab74d2858b574b4e8b451fb8084;hb=0c33317f59b93f5cab348619b1c38a5dce97de94;f=configure.ac
+
+--- configure.orig	2008-04-23 11:18:48.000000000 +0200
++++ configure
+@@ -19762,7 +19762,11 @@ fi
+ echo "${ECHO_T}$have_gcc4" >&6; }
+ 
+ 
+-MMX_CFLAGS="-mmmx -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
++MMX_CFLAGS="-mmmx -Winline"
++
++if test "x$have_gcc4" = "xyes"; then
++    MMX_CFLAGS="$MMX_CFLAGS --param inline-unit-growth=10000 --param large-function-growth=10000"
++fi
+ 
+ have_mmx_intrinsics=no
+ { echo "$as_me:$LINENO: checking whether to use MMX intrinsics" >&5
+@@ -19839,6 +19843,9 @@ CFLAGS="$CFLAGS -msse $MMX_CFLAGS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ 
++#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
++#error "Need GCC >= 3.4 for SSE intrinsics"
++#endif
+ #if !defined(__amd64__) && !defined(__x86_64__)
+ #error "Need x86-64 for SSE"
+ #endif
+@@ -19900,18 +19907,26 @@ fi
+ 
+ 
+ 
+-SSE_CFLAGS="-mmmx -msse2 -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
++SSE_CFLAGS="-mmmx -msse2 -Winline"
++
++if test "x$have_gcc4" = "xyes"; then
++    SSE_CFLAGS="$SSE_CFLAGS --param inline-unit-growth=10000 --param large-function-growth=10000 --param  max-inline-insns-single=6000"
++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; }
+ xserver_save_CFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS -msse2 $MMX_CFLAGS"
++CFLAGS="$CFLAGS -msse2 $SSE_CFLAGS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ 
++#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
++#error "Need GCC >= 3.4 for SSE2 intrinsics"
++#endif
+ #include <mmintrin.h>
+ #include <xmmintrin.h>
++#include <emmintrin.h>
+ int main () {
+     __m128i a, b, c;
+ 	c = _mm_xor_si128 (a, b);