From b7466536290dc9a0ce84e6237d1ab5adaccb5c60 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Fri, 6 Jul 2012 00:10:15 +0100
Subject: [PATCH] 0.26.2

---
 .gitignore  | 31 +------------------------------
 emms.patch  | 45 ---------------------------------------------
 pixman.spec | 10 ++++++----
 sources     |  3 +--
 4 files changed, 8 insertions(+), 81 deletions(-)
 delete mode 100644 emms.patch

diff --git a/.gitignore b/.gitignore
index 9951a44..4cd7380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1 @@
-pixman-0.15.18.tar.bz2
-pixman-0.15.20.tar.gz
-pixman-0.15.20.tar.bz2
-pixman-0.16.0.tar.bz2
-pixman-0.16.2.tar.bz2
-pixman-0.17.2.tar.gz
-pixman-0.17.2.tar.bz2
-pixman-0.17.4.tar.bz2
-pixman-0.17.6.tar.bz2
-pixman-0.17.8.tar.bz2
-pixman-0.17.10.tar.bz2
-pixman-0.17.12.tar.bz2
-pixman-0.18.0.tar.bz2
-pixman-0.19.2.tar.gz
-/pixman-0.19.6.tar.gz
-pixman-0.20.0.tar.gz
-/pixman-0.20.2.tar.gz
-/pixman-0.21.6.tar.gz
-/pixman-0.21.8.tar.gz
-/pixman-0.22.0.tar.gz
-/pixman-0.22.2.tar.bz2
-/pixman-0.23.4.tar.gz
-/pixman-0.23.4.tar.bz2
-/pixman-0.23.6.tar.bz2
-/pixman-0.24.0.tar.bz2
-/pixman-0.24.2.tar.bz2
-/pixman-0.24.4.tar.bz2
-/pixman-0.25.2.tar.bz2
-/pixman-0.25.6.tar.bz2
-/pixman-0.26.0.tar.bz2
+/pixman-0.*.tar.bz2
diff --git a/emms.patch b/emms.patch
deleted file mode 100644
index 4f60077..0000000
--- a/emms.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit da6193b1fcc1dfab27f4c36917864f2f2c41cf3e
-Author: Matt Turner <mattst88@gmail.com>
-Date:   Sun May 27 13:01:57 2012 -0400
-
-    mmx: add missing _mm_empty calls
-    
-    Fixes spurious test failures on x86-32.
-
-diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
-index bb125bf..6e292c6 100644
---- a/pixman/pixman-mmx.c
-+++ b/pixman/pixman-mmx.c
-@@ -2232,6 +2232,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp,
- 	    w--;
- 	}
-     }
-+
-+    _mm_empty ();
- }
- 
- static void
-@@ -3542,6 +3544,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask)
- 	w--;
-     }
- 
-+    _mm_empty ();
-     return iter->buffer;
- }
- 
-@@ -3585,6 +3588,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask)
- 	w--;
-     }
- 
-+    _mm_empty ();
-     return iter->buffer;
- }
- 
-@@ -3630,6 +3634,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask)
- 	w--;
-     }
- 
-+    _mm_empty ();
-     return iter->buffer;
- }
- 
diff --git a/pixman.spec b/pixman.spec
index 4e137a7..b692b80 100644
--- a/pixman.spec
+++ b/pixman.spec
@@ -2,8 +2,8 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.26.0
-Release:        4%{?dist}
+Version:        0.26.2
+Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
@@ -16,7 +16,6 @@ URL:            http://cgit.freedesktop.org/pixman/
 Source0:	http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:	make-pixman-snapshot.sh
 
-Patch0:		emms.patch
 Patch1:		openmp.patch
 
 # BuildRequires:  automake autoconf libtool pkgconfig
@@ -35,7 +34,6 @@ Development library for pixman.
 
 %prep
 %setup -q
-%patch0 -p1 -b .emms 
 %patch1 -p1 -b .openmp
 
 %build
@@ -63,6 +61,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Thu Jul  5 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 0.26.2-1
+- update to 0.26.2
+- drop upstreamed patch
+
 * Tue Jun 26 2012 Soren Sandmann <ssp@redhat.com> - 0.26.0-4
 - Add -fopenmp to CFLAGS and LDFLAGS on the make command line instead
   of in Makefile.am.
diff --git a/sources b/sources
index e437412..8555033 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f0c196edce9cb7e1ead79c4337f5d914  pixman-0.25.6.tar.bz2
-d0c41a51db89efec669812e66a5582fa  pixman-0.26.0.tar.bz2
+6b3e4c5300adb893a2baa9631c23efb2  pixman-0.26.2.tar.bz2