[arch-commits] Commit in pixman/repos (4 files)

[andyrtr at archlinux.org]

    Date: Thursday, May 31, 2012 @ 13:12:13
  Author: andyrtr
Revision: 160260

db-move: moved pixman from [testing] to [extra] (i686)

Added:
  pixman/repos/extra-i686/PKGBUILD
    (from rev 160259, pixman/repos/testing-i686/PKGBUILD)
  pixman/repos/extra-i686/test_failures_on_x86-32.diff
    (from rev 160259, pixman/repos/testing-i686/test_failures_on_x86-32.diff)
Deleted:
  pixman/repos/extra-i686/PKGBUILD
  pixman/repos/testing-i686/

------------------------------+
 PKGBUILD                     |   69 +++++++++++++++++++++--------------------
 test_failures_on_x86-32.diff |   46 +++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 33 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-05-31 17:10:59 UTC (rev 160259)
+++ extra-i686/PKGBUILD	2012-05-31 17:12:13 UTC (rev 160260)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=pixman
-pkgver=0.24.4
-pkgrel=1
-pkgdesc="The pixel-manipulation library for X and cairo"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org"
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('683450f917015366ac7918fc517c76801aeff374')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: pixman/repos/extra-i686/PKGBUILD (from rev 160259, pixman/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-05-31 17:12:13 UTC (rev 160260)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=pixman
+pkgver=0.26.0
+pkgrel=1
+pkgdesc="The pixel-manipulation library for X and cairo"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org"
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
+        test_failures_on_x86-32.diff)
+sha1sums=('d772cf794ec5da0966eba3cb360919a0a5e0d23f'
+          '24a688271d5cf2c4137a147deaa2975122c01aa8')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/test_failures_on_x86-32.diff
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: pixman/repos/extra-i686/test_failures_on_x86-32.diff (from rev 160259, pixman/repos/testing-i686/test_failures_on_x86-32.diff)
===================================================================
--- extra-i686/test_failures_on_x86-32.diff	                        (rev 0)
+++ extra-i686/test_failures_on_x86-32.diff	2012-05-31 17:12:13 UTC (rev 160260)
@@ -0,0 +1,46 @@
+From da6193b1fcc1dfab27f4c36917864f2f2c41cf3e Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88 at gmail.com>
+Date: Sun, 27 May 2012 17:01:57 +0000
+Subject: 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;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe