cairo/pixman-0.24.4.patch

   1 --- misc/pixman-0.24.4/Makefile.win32.common    2011-12-16 15:30:44.653987145 +0100
   2 +++ misc/build/pixman-0.24.4/Makefile.win32.common      2011-12-16 15:30:37.288130250 +0100
   3 @@ -1 +1,54 @@
   4 -dummy
   5 +LIBRARY = pixman-1
   6 +
   7 +CC = cl
   8 +LD = link
   9 +AR = lib
  10 +PERL = perl
  11 +
  12 +ifeq ($(top_builddir),)
  13 +top_builddir = $(top_srcdir)
  14 +endif
  15 +
  16 +CFG_VAR = $(CFG)
  17 +ifeq ($(CFG_VAR),)
  18 +CFG_VAR = release
  19 +endif
  20 +
  21 +ifeq ($(CFG_VAR),debug)
  22 +CFG_CFLAGS  = -MD -Od -Zi
  23 +CFG_LDFLAGS = -DEBUG
  24 +else
  25 +CFG_CFLAGS  = -MD -O2
  26 +CFG_LDFLAGS =
  27 +endif
  28 +
  29 +# Package definitions, to be used instead of those provided in config.h
  30 +PKG_CFLAGS  = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT=""
  31 +
  32 +BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman
  33 +
  34 +PIXMAN_CFLAGS  = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS)
  35 +PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS)
  36 +PIXMAN_ARFLAGS = -nologo $(LDFLAGS)
  37 +
  38 +
  39 +inform:
  40 +ifneq ($(CFG),release)
  41 +ifneq ($(CFG),debug)
  42 +ifneq ($(CFG),)
  43 +       @echo "Invalid specified configuration option: "$(CFG)"."
  44 +       @echo
  45 +       @echo "Possible choices for configuration are 'release' and 'debug'"
  46 +       @exit 1
  47 +endif
  48 +       @echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)"
  49 +endif
  50 +endif
  51 +
  52 +
  53 +$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES)
  54 +       @mkdir -p $(CFG_VAR)
  55 +       @$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
  56 +
  57 +clean: inform
  58 +       @$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
  59 --- misc/pixman-0.24.4/Makefile.in      2011-11-06 22:11:25.000000000 +0100
  60 +++ misc/build/pixman-0.24.4/Makefile.in        2011-12-16 09:06:45.317211035 +0100
  61 @@ -272,7 +272,7 @@
  62  top_build_prefix = @top_build_prefix@
  63  top_builddir = @top_builddir@
  64  top_srcdir = @top_srcdir@
  65 -SUBDIRS = pixman demos test
  66 +SUBDIRS = pixman
  67  pkgconfigdir = $(libdir)/pkgconfig
  68  pkgconfig_DATA = pixman-1.pc
  69  GPGKEY = 6FF7C1A8
  70 --- misc/pixman-0.24.4/config.sub       2008-08-30 00:27:25.000000000 +0200
  71 +++ misc/build/pixman-0.24.4/config.sub 2011-12-16 09:05:14.595773609 +0100
  72 @@ -120,7 +120,7 @@
  73  # Here we must recognize all the valid KERNEL-OS combinations.
  74  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  75  case $maybe_os in
  76 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  77 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  78    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  79    storm-chaos* | os2-emx* | rtmk-nova*)
  80      os=-$maybe_os
  81 @@ -1247,7 +1247,7 @@
  82               | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  83               | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  84               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  85 -             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  86 +             | -udi* | -linux-androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  87               | -chorusos* | -chorusrdb* \
  88               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  89               | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  90 --- misc/pixman-0.24.4/configure        2011-11-06 22:11:27.000000000 +0100
  91 +++ misc/build/pixman-0.24.4/configure  2011-12-16 09:06:16.482898083 +0100
  92 @@ -20202,6 +20202,13 @@
  93
  94
  95
  96 +# getisax is falsely detected when using OOo build script on Linux/FBSD...
  97 +case "$build_os" in
  98 +     linux-gnu*)
  99 +       ;;
 100 +     freebsd*)
 101 +       ;;
 102 +     *)
 103
 104  for ac_func in getisax
 105  do
 106 @@ -20304,6 +20311,8 @@
 107  done
 108
 109
 110 +       ;;
 111 +esac
 112   { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 113  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 114  if test "${ac_cv_c_bigendian+set}" = set; then
 115 --- misc/pixman-0.24.4/pixman/pixman-utils.c
 116 +++ misc/build/pixman-0.24.4/pixman/pixman-utils.c
 117 @@ -27,6 +27,7 @@
 118  #endif
 119  #include <stdio.h>
 120  #include <stdlib.h>
 121 +#include <limits.h>
 122
 123  #include "pixman-private.h"
 124
 125 --- misc/pixman-0.24.4/pixman/pixman-mmx.c      2011-11-06 13:47:42.000000000 -0700
 126 +++ misc/build/pixman-0.24.4/pixman/pixman-mmx.c        2011-12-19 00:41:42.280402800 -0700
 127 @@ -309,7 +309,7 @@
 128
 129  /* Elemental unaligned loads */
 130
 131 -static __inline__ __m64 ldq_u(uint64_t *p)
 132 +static inline __m64 ldq_u(uint64_t *p)
 133  {
 134  #ifdef USE_X86_MMX
 135      /* x86's alignment restrictions are very relaxed. */
 136 @@ -328,7 +328,7 @@
 137  #endif
 138  }
 139
 140 -static __inline__ uint32_t ldl_u(uint32_t *p)
 141 +static inline uint32_t ldl_u(uint32_t *p)
 142  {
 143  #ifdef USE_X86_MMX
 144      /* x86's alignment restrictions are very relaxed. */
 145