From 399cb3be848ab06592cf5eb6951787701b2b801d Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 14 Sep 2010 12:27:12 +0200 Subject: cairo-pixman-makefile-mk.diff: Build pixman as shared library on x86_64 too --- cairo/pixman/makefile.mk | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'cairo') diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index f3c1c091639c..6d2504b6fbb8 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -92,7 +92,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 -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" @@ -120,13 +120,7 @@ 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 -.ELSE -# use static lib to avoid linking problems with older system pixman libs -CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no -.ENDIF CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) @@ -149,11 +143,7 @@ OUT2LIB+=pixman$/.libs$/*.a OUT2LIB+=pixman$/release$/*.lib .ENDIF .ELSE -.IF "$(CPUNAME)"=="X86_64" -OUT2LIB+=pixman$/.libs$/libpixman-1.so -.ELSE -OUT2LIB+=pixman$/.libs$/libpixman-1.a -.ENDIF +OUT2LIB+=pixman$/.libs$/libpixman-1.so* .ENDIF # --- Targets ------------------------------------------------------ -- cgit From 8f44f0d5f0b56226fc5bee4fcae8a1c7cc143aa8 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 14 Sep 2010 12:31:24 +0200 Subject: cairo-cairo-makefile-mk.diff: Fix linking of internal cairo library --- cairo/cairo/makefile.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cairo') diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index a29012892576..88953d03b46c 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -120,7 +120,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 -Wl,-z,noexecstack +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" @@ -169,6 +169,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 -- cgit From f7cefa123e655c73ddd656658fcca421b641b280 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Thu, 30 Sep 2010 13:44:59 +0200 Subject: Don't build pixman/test to prevent build failure when wrong cairo is linked --- cairo/pixman-0.12.0.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'cairo') diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch index 4aa06811fbfc..c3d21459828d 100644 --- a/cairo/pixman-0.12.0.patch +++ b/cairo/pixman-0.12.0.patch @@ -23,3 +23,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 -- cgit From afd1aece660fcc8b604b11fd09d7978ede5fd570 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 28 May 2011 12:59:23 +0300 Subject: Can't use SRC_ROOT on Windows thanks to the symbolic links --- cairo/cairo-1.8.0.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cairo') diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch index 424c6041562d..e693eb4cc019 100644 --- a/cairo/cairo-1.8.0.patch +++ b/cairo/cairo-1.8.0.patch @@ -7,8 +7,8 @@ diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo -PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman -PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib -+PIXMAN_CFLAGS := -I$(SRC_ROOT)/cairo/$(INPATH)/inc -+PIXMAN_LIBS := $(SRC_ROOT)/cairo/$(INPATH)/lib/pixman-1.lib ++PIXMAN_CFLAGS := -I../../../../inc ++PIXMAN_LIBS := ../../../../lib/pixman-1.lib CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) -- cgit From 0bb3ffd6456e7a7291bbadff2f547301579f05d3 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 28 May 2011 06:04:08 -0500 Subject: cairo depend on libpng --- cairo/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cairo') diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst index c531e6c0ffb9..5827e76d25f5 100644 --- a/cairo/prj/build.lst +++ b/cairo/prj/build.lst @@ -1,4 +1,4 @@ -lcairo cairo : ZLIB:zlib soltools NULL +lcairo cairo : ZLIB:zlib libpng soltools 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 -- cgit From 9fc04f1763980a0238ec934c09c90d419c6d064a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 01:15:48 +0300 Subject: Cross-compiling and iOS support --- cairo/cairo/makefile.mk | 12 +++++++++++- cairo/pixman/makefile.mk | 11 ++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) (limited to 'cairo') diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index d6d17390db66..a077ec98af05 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -145,7 +145,15 @@ cairo_CFLAGS+=-march=i486 CONFIGURE_DIR= 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) +.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 "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -201,6 +209,8 @@ OUT2BIN+=src$/.libs$/*.dll OUT2LIB+=src$/release$/*.lib OUT2BIN+=src$/release$/*.dll .ENDIF +.ELIF "$(OS)"=="IOS" +OUT2LIB+=src$/.libs$/libcairo-1.a .ELSE OUT2LIB+=src$/.libs$/libcairo.so* .ENDIF diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 6d2504b6fbb8..1f61bfa897a6 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -120,8 +120,15 @@ pixman_CFLAGS+=-fPIC CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -142,6 +149,8 @@ OUT2LIB+=pixman$/.libs$/*.a .ELSE OUT2LIB+=pixman$/release$/*.lib .ENDIF +.ELIF "$(OS)"=="IOS" +OUT2LIB+=pixman$/.libs$/libpixman-1.a .ELSE OUT2LIB+=pixman$/.libs$/libpixman-1.so* .ENDIF -- cgit From e5c37050bab08fdfc08febf5a243372686ef423d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 02:57:36 +0300 Subject: Drop unnecessary quotes around platform triplets --- cairo/cairo/makefile.mk | 2 +- cairo/pixman/makefile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cairo') diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index a077ec98af05..0d3cd3344332 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -152,7 +152,7 @@ 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 "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 1f61bfa897a6..83ea75922178 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -127,7 +127,7 @@ CONFIGURE_FLAGS=--disable-static .ENDIF CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) -- cgit From 9eeeab292cf799a839439310feeee9ac752b0013 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 30 May 2011 15:07:49 +0100 Subject: allow building non-system cairo with system libpng14 --- cairo/cairo-1.8.0.patch | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'cairo') diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch index e693eb4cc019..d18396c0ac03 100644 --- a/cairo/cairo-1.8.0.patch +++ b/cairo/cairo-1.8.0.patch @@ -186,6 +186,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. -- cgit From 56f35e6b3924b0c36146c33dc8c7dcf2c04b39da Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 3 Jun 2011 13:27:35 +0300 Subject: Drop %_EXT% which was always empty --- cairo/prj/d.lst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'cairo') 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 -- cgit From 718381b51c459b55ce25326215fe0edce5572e88 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 00:30:56 +0300 Subject: Fix cairo build when cross-compiling to ppc MacOSX --- cairo/cairo/makefile.mk | 3 +++ cairo/pixman/makefile.mk | 3 +++ 2 files changed, 6 insertions(+) (limited to 'cairo') diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 0d3cd3344332..abe850db851e 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)"!="" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF cairo_CPPFLAGS+=$(EXTRA_CDEFS) cairo_LDFLAGS+=$(EXTRA_LINKFLAGS) BUILD_ACTION=$(GNUMAKE) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 83ea75922178..b344520f66af 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)"!="" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -- cgit From 78f9b77628e5288e47ad5de4722c4a69c6295406 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 09:07:30 +0300 Subject: Always compare CROSS_COMPILING explicitly to "YES" --- cairo/cairo/makefile.mk | 4 ++-- cairo/pixman/makefile.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cairo') diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index abe850db851e..754ceba71f13 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -109,7 +109,7 @@ 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)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF cairo_CPPFLAGS+=$(EXTRA_CDEFS) @@ -154,7 +154,7 @@ CONFIGURE_FLAGS=--disable-shared 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 "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index b344520f66af..0a1d443942c3 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -85,7 +85,7 @@ 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)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) @@ -129,7 +129,7 @@ CONFIGURE_FLAGS=--disable-shared CONFIGURE_FLAGS=--disable-static .ENDIF CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) -- cgit From 95b0fe9f51462b2ee158bf50b83ccc849422f690 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 10 Jun 2011 00:07:14 +0300 Subject: Fix configury for Android, but won't build --- cairo/cairo-1.8.0.patch | 25 +++++++++++++++++++++++++ cairo/cairo/makefile.mk | 20 ++++++++++++++++++-- cairo/pixman-0.12.0.patch | 11 +++++++++++ cairo/pixman/makefile.mk | 2 +- 4 files changed, 55 insertions(+), 3 deletions(-) (limited to 'cairo') diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch index d18396c0ac03..f2ce5b67bfd4 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 #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 754ceba71f13..4059504e35bc 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 c3d21459828d..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 @@ diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 0a1d443942c3..d2124079c5d2 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* -- cgit