cairo/pixman/pixman-0.24.4.patch

   1 --- misc/pixman-0.24.4/Makefile.in      2011-11-06 22:11:25.000000000 +0100
   2 +++ misc/build/pixman-0.24.4/Makefile.in        2011-12-16 09:06:45.317211035 +0100
   3 @@ -272,7 +272,7 @@
   4  top_build_prefix = @top_build_prefix@
   5  top_builddir = @top_builddir@
   6  top_srcdir = @top_srcdir@
   7 -SUBDIRS = pixman demos test
   8 +SUBDIRS = pixman
   9  pkgconfigdir = $(libdir)/pkgconfig
  10  pkgconfig_DATA = pixman-1.pc
  11  GPGKEY = 6FF7C1A8
  12 --- misc/pixman-0.24.4/config.sub       2008-08-30 00:27:25.000000000 +0200
  13 +++ misc/build/pixman-0.24.4/config.sub 2011-12-16 09:05:14.595773609 +0100
  14 @@ -120,7 +120,7 @@
  15  # Here we must recognize all the valid KERNEL-OS combinations.
  16  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  17  case $maybe_os in
  18 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  19 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  20    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  21    storm-chaos* | os2-emx* | rtmk-nova*)
  22      os=-$maybe_os
  23 @@ -1247,7 +1247,7 @@
  24               | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  25               | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  26               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  27 -             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  28 +             | -udi* | -linux-androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  29               | -chorusos* | -chorusrdb* \
  30               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  31               | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  32 --- misc/pixman-0.24.4/configure        2011-11-06 22:11:27.000000000 +0100
  33 +++ misc/build/pixman-0.24.4/configure  2011-12-16 09:06:16.482898083 +0100
  34 @@ -20202,6 +20202,13 @@
  35
  36
  37
  38 +# getisax is falsely detected when using OOo build script on Linux/FBSD...
  39 +case "$build_os" in
  40 +     linux-gnu*)
  41 +       ;;
  42 +     freebsd*)
  43 +       ;;
  44 +     *)
  45
  46  for ac_func in getisax
  47  do
  48 @@ -20304,6 +20311,8 @@
  49  done
  50
  51
  52 +       ;;
  53 +esac
  54   { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
  55  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
  56  if test "${ac_cv_c_bigendian+set}" = set; then
  57 @@ -24552,7 +24552,7 @@
  58          test "$cross_compiling" = yes ||
  59          $as_test_x conftest$ac_exeext
  60         }; then
  61 -  pixman_cc_stderr=`test -f conftest.err && cat conftest.err`
  62 +  pixman_cc_stderr=`test -f conftest.err && grep -v 'ld: warning: object file compiled with -mlong-branch which is no longer needed.' conftest.err`
  63                  pixman_cc_flag=yes
  64  else
  65    $as_echo "$as_me: failed program was:" >&5
  66 --- misc/pixman-0.24.4/pixman/pixman-utils.c
  67 +++ misc/build/pixman-0.24.4/pixman/pixman-utils.c
  68 @@ -27,6 +27,7 @@
  69  #endif
  70  #include <stdio.h>
  71  #include <stdlib.h>
  72 +#include <limits.h>
  73
  74  #include "pixman-private.h"
  75
  76 --- misc/pixman-0.24.4/pixman/pixman-mmx.c      2011-11-06 13:47:42.000000000 -0700
  77 +++ misc/build/pixman-0.24.4/pixman/pixman-mmx.c        2011-12-19 00:41:42.280402800 -0700
  78 @@ -309,7 +309,7 @@
  79
  80  /* Elemental unaligned loads */
  81
  82 -static __inline__ __m64 ldq_u(uint64_t *p)
  83 +static inline __m64 ldq_u(uint64_t *p)
  84  {
  85  #ifdef USE_X86_MMX
  86      /* x86's alignment restrictions are very relaxed. */
  87 @@ -328,7 +328,7 @@
  88  #endif
  89  }
  90
  91 -static __inline__ uint32_t ldl_u(uint32_t *p)
  92 +static inline uint32_t ldl_u(uint32_t *p)
  93  {
  94  #ifdef USE_X86_MMX
  95      /* x86's alignment restrictions are very relaxed. */
  96