pixman: Changes to 'upstream-experimental'

[Maarten Lankhorst <mlankhorst-guest@alioth.debian.org>]

 configure.ac        |    4 ++--
 pixman/pixman-mmx.c |    2 +-
 pixman/pixman-ppc.c |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a5e5179b5624c99c812e9bf6e7b907e355a811e8
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date:   Mon Dec 10 06:46:20 2012 -0500

    Pre-release version bump to 0.28.2

diff --git a/configure.ac b/configure.ac
index e746af8..d23054f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 28)
-m4_define([pixman_micro], 1)
+m4_define([pixman_micro], 2)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 

commit 6e270a7968ef45941a255919e83518fa1962d662
Author: Benjamin Gilbert <bgilbert@backtick.net>
Date:   Sat Dec 1 23:55:31 2012 -0500

    Fix thread safety on mingw-w64 and clang
    
    After finding a working TLS storage class specifier, configure was
    continuing to test other candidates.  This caused it to prefer
    __declspec(thread) over __thread.  However, __declspec(thread) is
    ignored with a warning by mingw-w64 [1] and silently ignored by clang [2].
    The resulting binary behaved as if PIXMAN_NO_TLS was defined.
    
    Bug introduced by a069da6c.
    
    [1] https://bugs.freedesktop.org/show_bug.cgi?id=57591
    [2] http://lists.freedesktop.org/archives/pixman/2012-October/002320.html

diff --git a/configure.ac b/configure.ac
index fe87d52..e746af8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -860,7 +860,7 @@ AC_CACHE_VAL(ac_cv_tls, [
 #error OpenBSD has broken __thread support
 #endif
 
-int $kw test;], [], ac_cv_tls=$kw)
+int $kw test;], [], [ac_cv_tls=$kw; break])
     done
 ])
 AC_MSG_RESULT($ac_cv_tls)

commit d91f550b2a6a5029996a97282025930e67f468ae
Author: Stefan Weil <sw@weilnetz.de>
Date:   Tue Nov 13 19:44:15 2012 +0100

    Always use xmmintrin.h for 64 bit Windows
    
    MinGW-w64 uses the GNU compiler and does not define _MSC_VER.
    Nevertheless, it provides xmmintrin.h and must be handled
    here like the MS compiler. Otherwise compilation fails due to
    conflicting declarations.
    
    Signed-off-by: Stefan Weil <sw@weilnetz.de>

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 1e6dbe8..76b6ced 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -62,7 +62,7 @@ _mm_empty (void)
 #endif
 
 #ifdef USE_X86_MMX
-# if (defined(__SUNPRO_C) || defined(_MSC_VER))
+# if (defined(__SUNPRO_C) || defined(_MSC_VER) || defined(_WIN64))
 #  include <xmmintrin.h>
 # else
 /* We have to compile with -msse to use xmmintrin.h, but that causes SSE

commit 2092aa0d92f3aa6e3c30d46771bfbbc92c062cc4
Author: Joshua Root <jmr@macports.org>
Date:   Fri Nov 9 14:39:14 2012 +1100

    Fix undeclared variable use and sysctlbyname error handling on ppc
    
    Fixes bug 56889.

diff --git a/pixman/pixman-ppc.c b/pixman/pixman-ppc.c
index f1bea1e..a6e7bb0 100644
--- a/pixman/pixman-ppc.c
+++ b/pixman/pixman-ppc.c
@@ -37,10 +37,10 @@
 static pixman_bool_t
 pixman_have_vmx (void)
 {
+    int error, have_vmx;
     size_t length = sizeof(have_vmx);
-    int error, have_mmx;
 
-    sysctlbyname ("hw.optional.altivec", &have_vmx, &length, NULL, 0);
+    error = sysctlbyname ("hw.optional.altivec", &have_vmx, &length, NULL, 0);
 
     if (error)
 	return FALSE;
@@ -56,9 +56,9 @@ pixman_have_vmx (void)
 static pixman_bool_t
 pixman_have_vmx (void)
 {
+    int error, have_vmx;
     int mib[2] = { CTL_MACHDEP, CPU_ALTIVEC };
     size_t length = sizeof(have_vmx);
-    int error, have_vmx;
 
     error = sysctl (mib, 2, &have_vmx, &length, NULL, 0);
 

commit 9029026edd46dbfcc651f596d763533496554936
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date:   Mon Dec 10 06:46:09 2012 -0500

    Post-release version bump to 0.28.1

diff --git a/configure.ac b/configure.ac
index 65f7162..fe87d52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 28)
-m4_define([pixman_micro], 0)
+m4_define([pixman_micro], 1)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])