diff options
| author | root <root@rshg054.dnsready.net> | 2012-06-02 00:01:53 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-06-02 00:01:53 +0000 |
| commit | 211709a2f09bd677aa1deac0dc82fde6ce1c8626 (patch) | |
| tree | bd95688134860851652ff3d47f376702917f1b76 /extra/pixman | |
| parent | 7087de492f6effbd08f6b644ce85d1b1ea58fb14 (diff) | |
Sat Jun 2 00:01:53 UTC 2012
Diffstat (limited to 'extra/pixman')
| -rw-r--r-- | extra/pixman/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/pixman/test_failures_on_x86-32.diff | 46 |
2 files changed, 53 insertions, 4 deletions
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index 83f1867d3..7fa36b87c 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149727 2012-02-09 19:48:22Z andyrtr $ +# $Id: PKGBUILD 160261 2012-05-31 17:12:14Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman -pkgver=0.24.4 +pkgver=0.26.0 pkgrel=1 pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64) @@ -11,11 +11,14 @@ 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') +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 } diff --git a/extra/pixman/test_failures_on_x86-32.diff b/extra/pixman/test_failures_on_x86-32.diff new file mode 100644 index 000000000..6e333c03a --- /dev/null +++ b/extra/pixman/test_failures_on_x86-32.diff @@ -0,0 +1,46 @@ +From da6193b1fcc1dfab27f4c36917864f2f2c41cf3e Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@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 |