qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to pixman 0.32.6

Browse Source
This commit is contained in:
matthieu 2014-07-20 19:22:20 +00:00
parent 7eba4784b6
commit aefac52141
8 changed files with 76 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pixman/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.22 2013/12/01 20:34:20 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.23 2014/07/20 19:22:20 matthieu Exp $
.include <bsd.own.mk>
SHARED_LIBS= pixman-1 32.4
SHARED_LIBS= pixman-1 32.6
.if ${MACHINE_ARCH} == arm
CONFIGURE_ARGS += --disable-arm-simd --disable-arm-neon

3
lib/pixman/config.h.in
View File

@ -21,6 +21,9 @@
/* Whether the tool chain supports __float128 */
#undef HAVE_FLOAT128
/* Whether the compiler supports GCC vector extensions */
#undef HAVE_GCC_VECTOR_EXTENSIONS
/* Define to 1 if you have the `getisax' function. */
#undef HAVE_GETISAX

51
lib/pixman/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for pixman 0.32.4.
# Generated by GNU Autoconf 2.69 for pixman 0.32.6.
#
# 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.32.4'
PACKAGE_STRING='pixman 0.32.4'
PACKAGE_VERSION='0.32.6'
PACKAGE_STRING='pixman 0.32.6'
PACKAGE_BUGREPORT='pixman@lists.freedesktop.org'
PACKAGE_URL=''
@ -1390,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.32.4 to adapt to many kinds of systems.
\`configure' configures pixman 0.32.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1460,7 +1460,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of pixman 0.32.4:";;
short | recursive ) echo "Configuration of pixman 0.32.6:";;
esac
cat <<\_ACEOF
@ -1595,7 +1595,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
pixman configure 0.32.4
pixman configure 0.32.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2193,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.32.4, which was
It was created by pixman $as_me 0.32.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3017,7 +3017,7 @@ fi
# Define the identity of the package.
PACKAGE='pixman'
VERSION='0.32.4'
VERSION='0.32.6'
cat >>confdefs.h <<_ACEOF
@ -12201,13 +12201,13 @@ fi
LT_VERSION_INFO="32:4:32"
LT_VERSION_INFO="32:6:32"
PIXMAN_VERSION_MAJOR=0
PIXMAN_VERSION_MINOR=32
PIXMAN_VERSION_MICRO=4
PIXMAN_VERSION_MICRO=6
@ -14469,6 +14469,33 @@ fi
$as_echo "$support_for_builtin_clz" >&6; }
support_for_gcc_vector_extensions=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC vector extensions" >&5
$as_echo_n "checking for GCC vector extensions... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
unsigned int __attribute__ ((vector_size(16))) e, a, b;
int main (void) { e = a - ((b << 27) + (b >> (32 - 27))) + 1; return e[0]; }
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
support_for_gcc_vector_extensions=yes
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test x$support_for_gcc_vector_extensions = xyes; then
$as_echo "#define HAVE_GCC_VECTOR_EXTENSIONS /**/" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $support_for_gcc_vector_extensions" >&5
$as_echo "$support_for_gcc_vector_extensions" >&6; }
# Check whether --enable-libpng was given.
if test "${enable_libpng+set}" = set; then :
enableval=$enable_libpng; have_libpng=$enableval
@ -15232,7 +15259,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.32.4, which was
This file was extended by pixman $as_me 0.32.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -15298,7 +15325,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.32.4
pixman config.status 0.32.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

20
lib/pixman/configure.ac
View File

@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 32)
m4_define([pixman_micro], 4)
m4_define([pixman_micro], 6)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@ -1061,6 +1061,24 @@ fi
AC_MSG_RESULT($support_for_builtin_clz)
dnl =====================================
dnl GCC vector extensions
support_for_gcc_vector_extensions=no
AC_MSG_CHECKING(for GCC vector extensions)
AC_LINK_IFELSE([AC_LANG_SOURCE([[
unsigned int __attribute__ ((vector_size(16))) e, a, b;
int main (void) { e = a - ((b << 27) + (b >> (32 - 27))) + 1; return e[0]; }
]])], support_for_gcc_vector_extensions=yes)
if test x$support_for_gcc_vector_extensions = xyes; then
AC_DEFINE([HAVE_GCC_VECTOR_EXTENSIONS], [],
[Whether the compiler supports GCC vector extensions])
fi
AC_MSG_RESULT($support_for_gcc_vector_extensions)
dnl ==================
dnl libpng

2
lib/pixman/pixman/pixman-bits-image.c
View File

@ -926,7 +926,7 @@ create_bits (pixman_format_code_t format,
if (_pixman_multiply_overflows_size (height, stride))
return NULL;
buf_size = height * stride;
buf_size = (size_t)height * stride;
if (rowstride_bytes)
*rowstride_bytes = stride;

3
lib/pixman/pixman/pixman-mips-dspr2-asm.h
View File

@ -72,7 +72,10 @@
#define LEAF_MIPS32R2(symbol) \
.globl symbol; \
.align 2; \
#ifdef __ELF__
.hidden symbol; \
.type symbol, @function; \
#endif
.ent symbol, 0; \
symbol: .frame sp, 0, ra; \
.set push; \

10
lib/pixman/test/utils-prng.c
View File

@ -27,7 +27,7 @@
#include "utils.h"
#include "utils-prng.h"
#if defined(GCC_VECTOR_EXTENSIONS_SUPPORTED) && defined(__SSE2__)
#if defined(HAVE_GCC_VECTOR_EXTENSIONS) && defined(__SSE2__)
#include <xmmintrin.h>
#endif
@ -52,7 +52,7 @@ void smallprng_srand_r (smallprng_t *x, uint32_t seed)
*/
void prng_srand_r (prng_t *x, uint32_t seed)
{
#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED
#ifdef HAVE_GCC_VECTOR_EXTENSIONS
int i;
prng_rand_128_data_t dummy;
smallprng_srand_r (&x->p0, seed);
@ -75,7 +75,7 @@ void prng_srand_r (prng_t *x, uint32_t seed)
static force_inline void
store_rand_128_data (void *addr, prng_rand_128_data_t *d, int aligned)
{
#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED
#ifdef HAVE_GCC_VECTOR_EXTENSIONS
if (aligned)
{
*(uint8x16 *)addr = d->vb;
@ -120,7 +120,7 @@ randmemset_internal (prng_t *prng,
{
prng_rand_128_r (&local_prng, &t);
prng_rand_128_r (&local_prng, &randdata);
#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED
#ifdef HAVE_GCC_VECTOR_EXTENSIONS
if (flags & RANDMEMSET_MORE_FF)
{
const uint8x16 const_C0 =
@ -199,7 +199,7 @@ randmemset_internal (prng_t *prng,
}
else
{
#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED
#ifdef HAVE_GCC_VECTOR_EXTENSIONS
const uint8x16 bswap_shufflemask =
{
3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12

9
lib/pixman/test/utils-prng.h
View File

@ -79,8 +79,7 @@
/*****************************************************************************/
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
#define GCC_VECTOR_EXTENSIONS_SUPPORTED
#ifdef HAVE_GCC_VECTOR_EXTENSIONS
typedef uint32_t uint32x4 __attribute__ ((vector_size(16)));
typedef uint8_t uint8x16 __attribute__ ((vector_size(16)));
#endif
@ -92,7 +91,7 @@ typedef struct
typedef struct
{
#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED
#ifdef HAVE_GCC_VECTOR_EXTENSIONS
uint32x4 a, b, c, d;
#else
smallprng_t p1, p2, p3, p4;
@ -104,7 +103,7 @@ typedef union
{
uint8_t b[16];
uint32_t w[4];
#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED
#ifdef HAVE_GCC_VECTOR_EXTENSIONS
uint8x16 vb;
uint32x4 vw;
#endif
@ -134,7 +133,7 @@ prng_rand_r (prng_t *x)
static force_inline void
prng_rand_128_r (prng_t *x, prng_rand_128_data_t *data)
{
#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED
#ifdef HAVE_GCC_VECTOR_EXTENSIONS
uint32x4 e = x->a - ((x->b << 27) + (x->b >> (32 - 27)));
x->a = x->b ^ ((x->c << 17) ^ (x->c >> (32 - 17)));
x->b = x->c + x->d;