[Libreoffice-commits] .: 3 commits - cairo/cairo cairo/cairo-1.8.0.patch cairo/pixman cairo/pixman-0.12.0.patch expat/expat-2.0.1.patch libpng/libpng-1.5.1.patch

Tor Lillqvist tml at kemper.freedesktop.org
Thu Jun 9 14:07:38 PDT 2011 

 cairo/cairo-1.8.0.patch   |   25 +++++++++++++++++++++++++
 cairo/cairo/makefile.mk   |   20 ++++++++++++++++++--
 cairo/pixman-0.12.0.patch |   11 +++++++++++
 cairo/pixman/makefile.mk  |    2 +-
 expat/expat-2.0.1.patch   |   11 +++++++++++
 libpng/libpng-1.5.1.patch |    8 ++++----
 6 files changed, 70 insertions(+), 7 deletions(-)

New commits:
commit 887d94aceec501722a775abc517c00b34ee7665f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 10 00:07:14 2011 +0300

    Fix configury for Android, but won't build

diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index d18396c..f2ce5b6 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
@@ -258,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 754ceba..4059504 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -147,16 +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
+.ENDIF
+
 .IF "$(OS)"=="IOS"
 CONFIGURE_FLAGS=--disable-shared
 .ELSE
 CONFIGURE_FLAGS=--disable-static --enable-xlib
 .ENDIF
-CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+
+.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)
@@ -212,7 +228,7 @@ OUT2BIN+=src$/.libs$/*.dll
 OUT2LIB+=src$/release$/*.lib
 OUT2BIN+=src$/release$/*.dll
 .ENDIF
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB+=src$/.libs$/libcairo-1.a
 .ELSE
 OUT2LIB+=src$/.libs$/libcairo.so*
diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch
index c3d2145..8694a87 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 @@
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 0a1d443..d212407 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -152,7 +152,7 @@ OUT2LIB+=pixman$/.libs$/*.a
 .ELSE
 OUT2LIB+=pixman$/release$/*.lib
 .ENDIF
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB+=pixman$/.libs$/libpixman-1.a
 .ELSE
 OUT2LIB+=pixman$/.libs$/libpixman-1.so*
commit f70978cc3f5e2ef51cefa33b5cfd92946ec58954
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 10 00:05:57 2011 +0300

    Use system zlib on Android, too

diff --git a/libpng/libpng-1.5.1.patch b/libpng/libpng-1.5.1.patch
index b69735e..ebae94a 100644
--- a/libpng/libpng-1.5.1.patch
+++ b/libpng/libpng-1.5.1.patch
@@ -238,10 +238,10 @@
   * data in PNG files.
   */
 +/* WTF, surely this should depend explicitly on whether using the system or
-+ * internal zlib, not on OS... But yeah, so maybe MacOSX (and iOS) are the only OSes for which
++ * internal zlib, not on OS... But yeah, so maybe MacOSX, iOS and Android are the only OSes for which
 + * we use a system zlib but internal libpng, at least by default.
 + */
-+#if defined MACOSX || defined IOS
++#if defined MACOSX || defined IOS || defined ANDROID
  #include "zlib.h"
 +#else
 +#include <external/zlib/zlib.h>
@@ -255,7 +255,7 @@
   * of files at once by typing "pngtest -m file1.png file2.png ..."
   */
 
-+#if defined MACOSX || defined IOS
++#if defined MACOSX || defined IOS || defined ANDROID
  #include "zlib.h"
 +#else
 +#include <external/zlib/zlib.h>
@@ -271,7 +271,7 @@
  #endif
 
 -#include "zlib.h"   /* For crc32 */
-+#if defined MACOSX || defined IOS
++#if defined MACOSX || defined IOS || defined ANDROID
 +#include "zlib.h"
 +#else
 +#include <external/zlib/zlib.h>
commit 0ded1dce18a341b562ec7bb5bd2c9a65640e3098
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 9 21:51:30 2011 +0300

    First attempt at Android support

diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
index bea3d01..6c09d34 100644
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.0.1.patch
@@ -1,3 +1,14 @@
+--- misc/expat-2.0.1/conftools/config.sub
++++ misc/build/expat-2.0.1/conftools/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/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:33:55 2008
 +++ misc/build/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:26:42 2008
 @@ -1 +1,89 @@

More information about the Libreoffice-commits mailing list