pixman: Changes to 'debian-unstable'

[Cyril Brulebois <kibi@alioth.debian.org>]

 debian/changelog    |    7 +++++++
 pixman/pixman-mmx.c |    5 +++++
 2 files changed, 12 insertions(+)

New commits:
commit 3acc1ffc32330738ba24e95298713b3477bf6067
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jun 15 01:25:23 2012 +0200

    Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index a89ad75..555ede2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-pixman (0.26.0-2) UNRELEASED; urgency=low
+pixman (0.26.0-2) unstable; urgency=low
 
   * Cherry-pick from upstream master branch to fix FTBFS on *i386:
     - da6193b1fc “mmx: add missing _mm_empty calls”
 
- -- Cyril Brulebois <kibi@debian.org>  Fri, 15 Jun 2012 01:19:28 +0200
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 15 Jun 2012 01:25:20 +0200
 
 pixman (0.26.0-1) unstable; urgency=low
 

commit 1952e2a77b0897b7a050a71b9cc96379e695f192
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Jun 15 01:20:14 2012 +0200

    Document the cherry-pick, fixing FTBFS on *i386.

diff --git a/debian/changelog b/debian/changelog
index 9ec8db0..a89ad75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pixman (0.26.0-2) UNRELEASED; urgency=low
+
+  * Cherry-pick from upstream master branch to fix FTBFS on *i386:
+    - da6193b1fc “mmx: add missing _mm_empty calls”
+
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 15 Jun 2012 01:19:28 +0200
+
 pixman (0.26.0-1) unstable; urgency=low
 
   * New upstream release.

commit 1701defb499c66ed47734a0d8c704d74849d99d0
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.
    (cherry picked from commit da6193b1fcc1dfab27f4c36917864f2f2c41cf3e)

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index eb02d1a..1a014fd 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -2179,6 +2179,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp,
 	    w--;
 	}
     }
+
+    _mm_empty ();
 }
 
 static void
@@ -3323,6 +3325,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask)
 	w--;
     }
 
+    _mm_empty ();
     return iter->buffer;
 }
 
@@ -3368,6 +3371,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask)
 	w--;
     }
 
+    _mm_empty ();
     return iter->buffer;
 }
 
@@ -3413,6 +3417,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask)
 	w--;
     }
 
+    _mm_empty ();
     return iter->buffer;
 }