From d4c7c9d943de36d991ab7887a566b2dc66d6cda9 Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Wed, 23 Apr 2008 12:12:06 +0000
Subject: Back out patch-ac rev. 1.3, which doesn't seem to be needed when
 using patch-af. See PR pkg/38484 for the discussion.

---
 x11/pixman/distinfo         |  4 ++--
 x11/pixman/patches/patch-ac | 29 ++---------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

(limited to 'x11')

diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index a0f42ba05eb..e7a3764129f 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2008/04/23 09:44:05 tnn Exp $
+$NetBSD: distinfo,v 1.10 2008/04/23 12:12:06 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) = d668e2df1b111af10a4f4ebaeeb2df24d37a1c76
+SHA1 (patch-ac) = 093aab2151261285506197e566dd3ae62b06b716
 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 c9e0f88c0b7..aa16294b8c2 100644
--- a/x11/pixman/patches/patch-ac
+++ b/x11/pixman/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2008/04/23 09:44:05 tnn Exp $
+$NetBSD: patch-ac,v 1.5 2008/04/23 12:12:06 tnn Exp $
 
---- pixman/pixman-pict.c.orig	2008-03-27 11:58:20.000000000 +0100
+--- pixman/pixman-pict.c.orig	2008-03-27 06:58:20.000000000 -0400
 +++ pixman/pixman-pict.c
 @@ -1428,6 +1428,8 @@ static const FastPathInfo mmx_fast_paths
  
@@ -11,28 +11,3 @@ $NetBSD: patch-ac,v 1.4 2008/04/23 09:44:05 tnn 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
-- 
cgit v1.2.3