Merge branch 'master' into feature/gnumake4

Conflicts:
	cairo/cairo-1.8.0.patch
	cairo/prj/build.lst
	gdk-pixbuf/makefile.mk
	libcroco/makefile.mk

6 files changed, 120 insertions, 28 deletions

diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index dc2b6e44cd77..36b68e976953 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -55,6 +55,17 @@ diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.features misc/build/cai
 -CAIRO_HAS_SVG_SURFACE=1
 +CAIRO_HAS_SVG_SURFACE=0
  CAIRO_HAS_TEST_SURFACES=0
+--- misc/build/cairo-1.8.0.org/build/config.sub
++++ misc/build/cairo-1.8.0/build/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
 --- misc/build/cairo-1.8.0.org/configure	2008-09-26 01:57:30.000000000 +0300
 +++ misc/build/cairo-1.8.0/configure	2008-11-04 22:21:26.000000000 +0200
@@ -186,6 +197,15 @@ diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
  
  
  { echo "$as_me:$LINENO: checking for X" >&5
+@@ -31723,7 +31723,7 @@
+ 
+   if test "x$png_REQUIRES" = x; then
+     # libpng13 is GnuWin32's libpng-1.2.8 :-(
+-    for l in libpng12 libpng13 libpng10 ; do
++    for l in libpng12 libpng13 libpng14 libpng10 ; do
+       if $PKG_CONFIG --exists $l ; then
+         png_REQUIRES=$l
+         use_png=yes
 @@ -34097,7 +34129,7 @@
  
      # The ps backend requires zlib.
@@ -249,3 +269,17 @@ diff -ur misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c misc/build/cairo-1.8.
  #include <errno.h>
  
  #define DEBUG_PS 0
+--- misc/build/cairo-1.8.0.org/src/cairo-output-stream.c
++++ misc/build/cairo-1.8.0/src/cairo-output-stream.c
+@@ -281,7 +281,11 @@
+ 	d = 0.0;
+ 
+     locale_data = localeconv ();
++#ifdef __ANDROID__
++    decimal_point = ".";
++#else
+     decimal_point = locale_data->decimal_point;
++#endif
+     decimal_point_len = strlen (decimal_point);
+ 
+     assert (decimal_point_len != 0);
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 4bf3911b1ca9..4059504e35bc 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -109,6 +109,9 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS)
 CONFIGURE_DIR=
 CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
 CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
 cairo_CPPFLAGS+=$(EXTRA_CDEFS)
 cairo_LDFLAGS+=$(EXTRA_LINKFLAGS)
 BUILD_ACTION=$(GNUMAKE)
@@ -120,7 +123,7 @@ OUT2INC+=src$/cairo-quartz.h
 .ELSE
 # ----------- Unix ---------------------------------------------------------
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
+cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
 .ELIF "$(OS)$(COM)"=="SOLARISC52"
 cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 .ENDIF  # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
@@ -144,8 +147,32 @@ cairo_CFLAGS+=-march=i486
 .ENDIF
 
 CONFIGURE_DIR=
+
+.IF "$(OS)"=="ANDROID"
+# No pkg-config in the Android NDK
+CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
+.ELSE
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-xlib --enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+.ENDIF
+
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS=--disable-shared
+.ELSE
+CONFIGURE_FLAGS=--disable-static --enable-xlib
+.ENDIF
+
+.IF "$(OS)"=="ANDROID"
+CONFIGURE_FLAGS+=--disable-ft
+.ELSE
+CONFIGURE_FLAGS+=--enable-ft
+.ENDIF
+
+CONFIGURE_FLAGS+=--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -169,6 +196,11 @@ OUT2INC+=src$/cairo-xlib.h \
 CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1"
 .ENDIF
 
+.IF "$(debug)"!=""
+cairo_CFLAGS+=-g
+CONFIGURE_FLAGS+= STRIP=" "
+.ENDIF
+
 CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)"
 
 .ENDIF
@@ -196,6 +228,8 @@ OUT2BIN+=src$/.libs$/*.dll
 OUT2LIB+=src$/release$/*.lib
 OUT2BIN+=src$/release$/*.dll
 .ENDIF
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+OUT2LIB+=src$/.libs$/libcairo-1.a
 .ELSE
 OUT2LIB+=src$/.libs$/libcairo.so*
 .ENDIF
diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch
index 4aa06811fbfc..8694a8778ec1 100644
--- a/cairo/pixman-0.12.0.patch
+++ b/cairo/pixman-0.12.0.patch
@@ -1,3 +1,14 @@
+--- misc/build/pixman-0.12.0/config.sub
++++ misc/build/pixman-0.12.0/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/build/pixman-0.12.0/configure.orig	2008-09-17 20:14:40.000000000 +0300
 +++ misc/build/pixman-0.12.0/configure	2008-11-08 21:17:00.000000000 +0200
 @@ -19740,6 +19740,13 @@
@@ -23,3 +34,14 @@
  { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
  echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
  if test "${ac_cv_c_bigendian+set}" = set; then
+--- misc/pixman-0.12.0/Makefile.in	2008-09-17 19:14:38.000000000 +0200
++++ misc/build/pixman-0.12.0/Makefile.in	2010-09-28 14:27:47.000000000 +0200
+@@ -203,7 +203,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pixman test
++SUBDIRS = pixman
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pixman-1.pc
+ GPGKEY = 6FF7C1A8
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index b94e7673d996..d2124079c5d2 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -85,6 +85,9 @@ CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)"
 CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)"
 .ENDIF # "$(EXTRA_CDEFS)"!=""
 .ENDIF # "$(SYSBASE)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -92,7 +95,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 .ELSE
 # ----------- Unix ---------------------------------------------------------
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 
 .IF "$(OS)$(COM)"=="SOLARISC52"
@@ -120,14 +123,15 @@ pixman_CFLAGS+=-fPIC
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-.IF "$(CPUNAME)"=="X86_64"
-# static builds tend to fail on 64bit
-CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS=--disable-shared
 .ELSE
-# use static lib to avoid linking problems with older system pixman libs
-CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no
+CONFIGURE_FLAGS=--disable-static
 .ENDIF
 CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -148,12 +152,10 @@ OUT2LIB+=pixman$/.libs$/*.a
 .ELSE
 OUT2LIB+=pixman$/release$/*.lib
 .ENDIF
-.ELSE
-.IF "$(CPUNAME)"=="X86_64"
-OUT2LIB+=pixman$/.libs$/libpixman-1.so
-.ELSE
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB+=pixman$/.libs$/libpixman-1.a
-.ENDIF
+.ELSE
+OUT2LIB+=pixman$/.libs$/libpixman-1.so*
 .ENDIF
 
 # --- Targets ------------------------------------------------------
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index c59a5c4bbdd8..a4d0da413fae 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo	cairo	: ZLIB:zlib soltools stlport NULL
+lcairo	cairo	: ZLIB:zlib libpng soltools stlport NULL
 lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
 lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
 lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL
diff --git a/cairo/prj/d.lst b/cairo/prj/d.lst
index 6cd8613cf677..79ca424607a9 100644
--- a/cairo/prj/d.lst
+++ b/cairo/prj/d.lst
@@ -1,15 +1,15 @@
-mkdir: %_DEST%\inc%_EXT%\cairo
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\cairo
-..\%__SRC%\inc\cairo*.h %_DEST%\inc%_EXT%\cairo\cairo*.h
-..\%__SRC%\inc\cairo*.h %_DEST%\inc%_EXT%\external\cairo\cairo*.h
+mkdir: %_DEST%\inc\cairo
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\cairo
+..\%__SRC%\inc\cairo*.h %_DEST%\inc\cairo\cairo*.h
+..\%__SRC%\inc\cairo*.h %_DEST%\inc\external\cairo\cairo*.h
 
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.*
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\lib*.la %_DEST%\lib%_EXT%\lib*.la
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.dll.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
+..\%__SRC%\lib\lib*.so.* %_DEST%\lib\lib*.so.*
+..\%__SRC%\lib\lib*.dylib %_DEST%\lib\lib*.dylib
+..\%__SRC%\lib\lib*.a %_DEST%\lib\lib*.a
+..\%__SRC%\lib\lib*.la %_DEST%\lib\lib*.la
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\bin\*.dll.a %_DEST%\lib\*.a