- 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

1 files changed, 27 insertions, 2 deletions

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