Update to pixman 0.32.4. Tested by naddy@ and ajacoutot@

1 files changed, 188 insertions, 34 deletions

diff --git a/lib/pixman/configure b/lib/pixman/configure
index f68eac867..78dadb34f 100644
--- a/lib/pixman/configure
+++ b/lib/pixman/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pixman 0.30.2.
+# Generated by GNU Autoconf 2.69 for pixman 0.32.4.
 #
 # Report bugs to <pixman@lists.freedesktop.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pixman'
 PACKAGE_TARNAME='pixman'
-PACKAGE_VERSION='0.30.2'
-PACKAGE_STRING='pixman 0.30.2'
+PACKAGE_VERSION='0.32.4'
+PACKAGE_STRING='pixman 0.32.4'
 PACKAGE_BUGREPORT='pixman@lists.freedesktop.org'
 PACKAGE_URL=''
 
@@ -639,9 +639,10 @@ HAVE_LIBPNG
 PNG_LIBS
 PNG_CFLAGS
 TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR
+PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_LDFLAGS
-HAVE_PTHREAD_SETSPECIFIC
+HAVE_PTHREADS
 TOOLCHAIN_SUPPORTS__THREAD
 HAVE_GTK_FALSE
 HAVE_GTK_TRUE
@@ -665,12 +666,15 @@ USE_ARM_SIMD_TRUE
 USE_VMX_FALSE
 USE_VMX_TRUE
 VMX_CFLAGS
+SSSE3_CFLAGS
 SSE2_LDFLAGS
 SSE2_CFLAGS
 MMX_LDFLAGS
 MMX_CFLAGS
 IWMMXT_CFLAGS
 LS_CFLAGS
+USE_SSSE3_FALSE
+USE_SSSE3_TRUE
 USE_SSE2_FALSE
 USE_SSE2_TRUE
 USE_X86_MMX_FALSE
@@ -815,6 +819,7 @@ enable_openmp
 enable_loongson_mmi
 enable_mmx
 enable_sse2
+enable_ssse3
 enable_vmx
 enable_arm_simd
 enable_arm_neon
@@ -1385,7 +1390,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pixman 0.30.2 to adapt to many kinds of systems.
+\`configure' configures pixman 0.32.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1455,7 +1460,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pixman 0.30.2:";;
+     short | recursive ) echo "Configuration of pixman 0.32.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1478,6 +1483,7 @@ Optional Features:
   --disable-loongson-mmi  disable Loongson MMI fast paths
   --disable-mmx           disable x86 MMX fast paths
   --disable-sse2          disable SSE2 fast paths
+  --disable-ssse3         disable SSSE3 fast paths
   --disable-vmx           disable VMX fast paths
   --disable-arm-simd      disable ARM SIMD fast paths
   --disable-arm-neon      disable ARM NEON fast paths
@@ -1589,7 +1595,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pixman configure 0.30.2
+pixman configure 0.32.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2187,7 +2193,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pixman $as_me 0.30.2, which was
+It was created by pixman $as_me 0.32.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3011,7 +3017,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pixman'
- VERSION='0.30.2'
+ VERSION='0.32.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12195,13 +12201,13 @@ fi
 
 
 
-LT_VERSION_INFO="30:2:30"
+LT_VERSION_INFO="32:4:32"
 
 PIXMAN_VERSION_MAJOR=0
 
-PIXMAN_VERSION_MINOR=30
+PIXMAN_VERSION_MINOR=32
 
-PIXMAN_VERSION_MICRO=2
+PIXMAN_VERSION_MICRO=4
 
 
 
@@ -12255,6 +12261,53 @@ rm -f core conftest.err conftest.$ac_objext \
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_yesno" >&5
 $as_echo "$_yesno" >&6; }
 
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wdeclaration-after-statement" >&5
+$as_echo_n "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; }
+		save_CFLAGS="$CFLAGS"
+	save_LDFLAGS="$LDFLAGS"
+	save_LIBS="$LIBS"
+	CFLAGS=""
+	LDFLAGS=""
+	LIBS=""
+	CFLAGS="$WERROR -Wdeclaration-after-statement"
+	CFLAGS="$save_CFLAGS $CFLAGS"
+	LDFLAGS="$save_LDFLAGS $LDFLAGS"
+	LIBS="$save_LIBS $LIBS"
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		 int main(int c, char **v) { (void)c; (void)v; return 0; }
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pixman_cc_stderr=`test -f conftest.err && cat conftest.err`
+		 pixman_cc_flag=yes
+else
+  pixman_cc_stderr=`test -f conftest.err && cat conftest.err`
+		 pixman_cc_flag=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+	if test "x$pixman_cc_stderr" != "x"; then
+		pixman_cc_flag=no
+	fi
+
+	if test "x$pixman_cc_flag" = "xyes"; then
+		_yesno=yes
+	else
+		_yesno=no
+	fi
+	CFLAGS="$save_CFLAGS"
+	LDFLAGS="$save_LDFLAGS"
+	LIBS="$save_LIBS"
+
+	if test "x$_yesno" = xyes; then
+	   CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_yesno" >&5
+$as_echo "$_yesno" >&6; }
+
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5
 $as_echo_n "checking whether the compiler supports -fno-strict-aliasing... " >&6; }
 		save_CFLAGS="$CFLAGS"
@@ -12675,6 +12728,12 @@ int main () {
         : "y" (v), "K" (5)
     );
 
+    /* Some versions of clang will choke on this */
+    asm ("pmulhuw %1, %0\n\t"
+	: "+y" (w)
+	: "y" (v)
+    );
+
     return _mm_cvtsi64_si32 (v);
 }
 _ACEOF
@@ -12793,6 +12852,69 @@ else
 fi
 
 
+
+if test "x$SSSE3_CFLAGS" = "x" ; then
+    SSSE3_CFLAGS="-mssse3 -Winline"
+fi
+
+have_ssse3_intrinsics=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use SSSE3 intrinsics" >&5
+$as_echo_n "checking whether to use SSSE3 intrinsics... " >&6; }
+xserver_save_CFLAGS=$CFLAGS
+CFLAGS="$SSSE3_CFLAGS $CFLAGS"
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <mmintrin.h>
+#include <xmmintrin.h>
+#include <emmintrin.h>
+#include <tmmintrin.h>
+int main () {
+    __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
+    c = _mm_maddubs_epi16 (a, b);
+    return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  have_ssse3_intrinsics=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS=$xserver_save_CFLAGS
+
+# Check whether --enable-ssse3 was given.
+if test "${enable_ssse3+set}" = set; then :
+  enableval=$enable_ssse3; enable_ssse3=$enableval
+else
+  enable_ssse3=auto
+fi
+
+
+if test $enable_ssse3 = no ; then
+   have_ssse3_intrinsics=disabled
+fi
+
+if test $have_ssse3_intrinsics = yes ; then
+
+$as_echo "#define USE_SSSE3 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ssse3_intrinsics" >&5
+$as_echo "$have_ssse3_intrinsics" >&6; }
+if test $enable_ssse3 = yes && test $have_ssse3_intrinsics = no ; then
+   as_fn_error $? "SSSE3 intrinsics not detected" "$LINENO" 5
+fi
+
+ if test $have_ssse3_intrinsics = yes; then
+  USE_SSSE3_TRUE=
+  USE_SSSE3_FALSE='#'
+else
+  USE_SSSE3_TRUE='#'
+  USE_SSSE3_FALSE=
+fi
+
+
 case $host_os in
    solaris*)
       # When building 32-bit binaries, apply a mapfile to ensure that the
@@ -12837,6 +12959,7 @@ esac
 
 
 
+
 if test -n "`$CC -v 2>&1 | grep version | grep Apple`"; then
     VMX_CFLAGS="-faltivec"
 else
@@ -13060,8 +13183,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifndef __IWMMXT__
 #error "IWMMXT not enabled (with -march=iwmmxt)"
 #endif
-#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5))
-#error "Need GCC >= 4.5 for IWMMXT intrinsics"
+#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8))
+#error "Need GCC >= 4.8 for IWMMXT intrinsics"
 #endif
 #include <mmintrin.h>
 int main () {
@@ -13933,13 +14056,12 @@ fi
 
 
 
-if test $ac_cv_tls = none ; then
-    support_for_pthread_setspecific=no
+support_for_pthreads=no
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setspecific" >&5
-$as_echo_n "checking for pthread_setspecific... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads" >&5
+$as_echo_n "checking for pthreads... " >&6; }
 
-        if test "z$support_for_pthread_setspecific" != "zyes"; then
+    if test "z$support_for_pthreads" != "zyes"; then
 		save_CFLAGS="$CFLAGS"
 	save_LDFLAGS="$LDFLAGS"
 	save_LIBS="$LIBS"
@@ -14004,7 +14126,7 @@ rm -f core conftest.err conftest.$ac_objext \
 		PTHREAD_CFLAGS="$CFLAGS"
 		 PTHREAD_LIBS="$LIBS"
 		 PTHREAD_LDFLAGS="$LDFLAGS"
-		 support_for_pthread_setspecific=yes
+		 support_for_pthreads=yes
 	else
 		:
 	fi
@@ -14014,7 +14136,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
     fi
 
-        if test "z$support_for_pthread_setspecific" != "zyes"; then
+    if test "z$support_for_pthreads" != "zyes"; then
 		save_CFLAGS="$CFLAGS"
 	save_LDFLAGS="$LDFLAGS"
 	save_LIBS="$LIBS"
@@ -14079,7 +14201,7 @@ rm -f core conftest.err conftest.$ac_objext \
 		PTHREAD_CFLAGS="$CFLAGS"
 		 PTHREAD_LIBS="$LIBS"
 		 PTHREAD_LDFLAGS="$LDFLAGS"
-		 support_for_pthread_setspecific=yes
+		 support_for_pthreads=yes
 	else
 		:
 	fi
@@ -14089,7 +14211,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
     fi
 
-        if test "z$support_for_pthread_setspecific" != "zyes"; then
+    if test "z$support_for_pthreads" != "zyes"; then
 		save_CFLAGS="$CFLAGS"
 	save_LDFLAGS="$LDFLAGS"
 	save_LIBS="$LIBS"
@@ -14154,7 +14276,7 @@ rm -f core conftest.err conftest.$ac_objext \
 		PTHREAD_CFLAGS="$CFLAGS"
 		 PTHREAD_LIBS="$LIBS"
 		 PTHREAD_LDFLAGS="$LDFLAGS"
-		 support_for_pthread_setspecific=yes
+		 support_for_pthreads=yes
 	else
 		:
 	fi
@@ -14164,7 +14286,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
     fi
 
-        if test "z$support_for_pthread_setspecific" != "zyes"; then
+    if test "z$support_for_pthreads" != "zyes"; then
 		save_CFLAGS="$CFLAGS"
 	save_LDFLAGS="$LDFLAGS"
 	save_LIBS="$LIBS"
@@ -14229,7 +14351,7 @@ rm -f core conftest.err conftest.$ac_objext \
 		PTHREAD_CFLAGS="$CFLAGS"
 		 PTHREAD_LIBS="$LIBS"
 		 PTHREAD_LDFLAGS="$LDFLAGS"
-		 support_for_pthread_setspecific=yes
+		 support_for_pthreads=yes
 	else
 		:
 	fi
@@ -14240,17 +14362,19 @@ rm -f core conftest.err conftest.$ac_objext \
     fi
 
 
-    if test $support_for_pthread_setspecific = yes; then
-	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+if test $support_for_pthreads = yes; then
 
-$as_echo "#define HAVE_PTHREAD_SETSPECIFIC /**/" >>confdefs.h
+$as_echo "#define HAVE_PTHREADS /**/" >>confdefs.h
 
+    if test $ac_cv_tls = none ; then
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
     fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $support_for_pthread_setspecific" >&5
-$as_echo "$support_for_pthread_setspecific" >&6; };
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $support_for_pthreads" >&5
+$as_echo "$support_for_pthreads" >&6; }
+
+
 
 
 
@@ -14319,6 +14443,32 @@ fi
 $as_echo "$support_for_float128" >&6; }
 
 
+support_for_builtin_clz=no
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5
+$as_echo_n "checking for __builtin_clz... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+unsigned int x = 11; int main (void) { return __builtin_clz(x); }
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  support_for_builtin_clz=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+if test x$support_for_builtin_clz = xyes; then
+
+$as_echo "#define HAVE_BUILTIN_CLZ /**/" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $support_for_builtin_clz" >&5
+$as_echo "$support_for_builtin_clz" >&6; }
+
+
 # Check whether --enable-libpng was given.
 if test "${enable_libpng+set}" = set; then :
   enableval=$enable_libpng; have_libpng=$enableval
@@ -14653,6 +14803,10 @@ if test -z "${USE_SSE2_TRUE}" && test -z "${USE_SSE2_FALSE}"; then
   as_fn_error $? "conditional \"USE_SSE2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_SSSE3_TRUE}" && test -z "${USE_SSSE3_FALSE}"; then
+  as_fn_error $? "conditional \"USE_SSSE3\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_VMX_TRUE}" && test -z "${USE_VMX_FALSE}"; then
   as_fn_error $? "conditional \"USE_VMX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15078,7 +15232,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pixman $as_me 0.30.2, which was
+This file was extended by pixman $as_me 0.32.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15144,7 +15298,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pixman config.status 0.30.2
+pixman config.status 0.32.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"