diff options
Diffstat (limited to 'cairo')
-rw-r--r-- | cairo/cairo-1.8.0.patch | 251 | ||||
-rwxr-xr-x | cairo/cairo/dummy_pkg_config | 3 | ||||
-rw-r--r-- | cairo/cairo/makefile.mk | 208 | ||||
-rw-r--r-- | cairo/pixman-0.12.0.patch | 25 | ||||
-rw-r--r-- | cairo/pixman/makefile.mk | 164 | ||||
-rw-r--r-- | cairo/prj/build.lst | 4 | ||||
-rw-r--r-- | cairo/prj/d.lst | 15 |
7 files changed, 670 insertions, 0 deletions
diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch new file mode 100644 index 000000000000..dc2b6e44cd77 --- /dev/null +++ b/cairo/cairo-1.8.0.patch @@ -0,0 +1,251 @@ +diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo-1.8.0/build/Makefile.win32.common +--- misc/build/cairo-1.8.0.org/build/Makefile.win32.common 2008-09-25 14:36:35.000000000 +0300 ++++ misc/build/cairo-1.8.0/build/Makefile.win32.common 2008-11-14 22:20:08.000000000 +0200 +@@ -18,8 +18,8 @@ + OPT := -O2 + endif + +-PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman +-PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib ++PIXMAN_CFLAGS := -I$(SOLARSRC)/cairo/$(INPATH)/inc ++PIXMAN_LIBS := $(SOLARSRC)/cairo/$(INPATH)/lib/pixman-1.lib + + CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib + ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) +@@ -27,13 +27,15 @@ + endif + ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00) + else +-CAIRO_LIBS += zdll.lib ++CAIRO_LIBS += zlib.lib + endif + + DEFAULT_CFLAGS = -MD -nologo $(OPT) + DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE + DEFAULT_CFLAGS += -I. -I$(top_srcdir) + DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) ++DEFAULT_CFLAGS += $(SOLARINC) ++DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX + + CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) + +@@ -55,7 +57,7 @@ + + $(CFG)/%.obj: %.c + @mkdir -p $(CFG) +- @$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $< ++ $(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $< + + $(CFG)/%-static.obj: %.c + @mkdir -p $(CFG) +diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.features misc/build/cairo-1.8.0/build/Makefile.win32.features +--- misc/build/cairo-1.8.0.org/build/Makefile.win32.features 2008-09-25 02:15:49.000000000 +0300 ++++ misc/build/cairo-1.8.0/build/Makefile.win32.features 2008-11-04 22:19:52.000000000 +0200 +@@ -10,11 +10,11 @@ + CAIRO_HAS_WIN32_FONT=1 + CAIRO_HAS_OS2_SURFACE=0 + CAIRO_HAS_BEOS_SURFACE=0 +-CAIRO_HAS_PNG_FUNCTIONS=1 ++CAIRO_HAS_PNG_FUNCTIONS=1 + CAIRO_HAS_GLITZ_SURFACE=0 + CAIRO_HAS_DIRECTFB_SURFACE=0 + CAIRO_HAS_FT_FONT=0 + CAIRO_HAS_PS_SURFACE=1 + CAIRO_HAS_PDF_SURFACE=1 +-CAIRO_HAS_SVG_SURFACE=1 ++CAIRO_HAS_SVG_SURFACE=0 + CAIRO_HAS_TEST_SURFACES=0 +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 +@@ -4397,7 +4397,7 @@ + + cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +@@ -4406,7 +4406,7 @@ + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' +@@ -25304,19 +25304,39 @@ + rm -f confcache + + +-{ echo "$as_me:$LINENO: checking for compress in -lz" >&5 +-echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; } +-if test "${ac_cv_lib_z_compress+set}" = set; then ++save_libs="$LIBS" ++LIBS="$LIBS $ZLIB3RDLIB" ++ ++for ac_func in $COMPRESS ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" +-cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $ac_func + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -25324,11 +25344,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char compress (); ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ + int + main () + { +-return compress (); ++return $ac_func (); + ; + return 0; + } +@@ -25351,22 +25378,25 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- ac_cv_lib_z_compress=yes ++ eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_z_compress=no ++ eval "$as_ac_var=no" + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5 +-echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; } +-if test $ac_cv_lib_z_compress = yes; then +- if test "${ac_cv_header_zlib_h+set}" = set; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ if test "${ac_cv_header_zlib_h+set}" = set; then + { echo "$as_me:$LINENO: checking for zlib.h" >&5 + echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } + if test "${ac_cv_header_zlib_h+set}" = set; then +@@ -25506,7 +25536,9 @@ + else + have_libz="no (requires zlib http://www.gzip.org/zlib/)" + fi ++done + ++LIBS="$save_libs" + + + { echo "$as_me:$LINENO: checking for X" >&5 +@@ -34097,7 +34129,7 @@ + + # The ps backend requires zlib. + use_ps=$have_libz +- ps_NONPKGCONFIG_LIBS=-lz ++ ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + cairo_cv_ps_use=$use_ps + cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" +@@ -34444,7 +34476,7 @@ + + # The pdf backend requires zlib. + use_pdf=$have_libz +- pdf_NONPKGCONFIG_LIBS=-lz ++ pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + cairo_cv_pdf_use=$use_pdf + cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS" +diff -ur misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c misc/build/cairo-1.8.0/src/cairo-deflate-stream.c +--- misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c 2008-09-25 13:03:43.000000000 +0300 ++++ misc/build/cairo-1.8.0/src/cairo-deflate-stream.c 2008-11-14 22:21:00.000000000 +0200 +@@ -36,7 +36,11 @@ + + #include "cairoint.h" + #include "cairo-output-stream-private.h" ++#ifdef ZLIB_FIX ++#include <zlib/zlib.h> ++#else + #include <zlib.h> ++#endif + + #define BUFFER_SIZE 16384 + +diff -ur misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c misc/build/cairo-1.8.0/src/cairo-pdf-surface.c +--- misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c 2008-09-25 14:36:35.000000000 +0300 ++++ misc/build/cairo-1.8.0/src/cairo-pdf-surface.c 2008-11-14 22:20:41.000000000 +0200 +@@ -51,7 +51,11 @@ + #include "cairo-type3-glyph-surface-private.h" + + #include <time.h> ++#ifdef ZLIB_FIX ++#include <zlib/zlib.h> ++#else + #include <zlib.h> ++#endif + + /* Issues: + * +diff -ur misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c misc/build/cairo-1.8.0/src/cairo-ps-surface.c +--- misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c 2008-09-25 14:36:35.000000000 +0300 ++++ misc/build/cairo-1.8.0/src/cairo-ps-surface.c 2008-11-14 22:21:33.000000000 +0200 +@@ -67,7 +67,11 @@ + #include <stdio.h> + #include <ctype.h> + #include <time.h> ++#ifdef ZLIB_FIX ++#include <zlib/zlib.h> ++#else + #include <zlib.h> ++#endif + #include <errno.h> + + #define DEBUG_PS 0 diff --git a/cairo/cairo/dummy_pkg_config b/cairo/cairo/dummy_pkg_config new file mode 100755 index 000000000000..829303ea5b21 --- /dev/null +++ b/cairo/cairo/dummy_pkg_config @@ -0,0 +1,3 @@ +#!/bin/sh + + diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk new file mode 100644 index 000000000000..4bf3911b1ca9 --- /dev/null +++ b/cairo/cairo/makefile.mk @@ -0,0 +1,208 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. + +PRJNAME=cairo +TARGET=so_cairo +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(ENABLE_CAIRO)" == "" +all: + @echo "Nothing to do (Cairo not enabled)." + +.ELIF "$(SYSTEM_CAIRO)" == "YES" +all: + @echo "Nothing to do, using system cairo." + +.ENDIF + +# --- Files -------------------------------------------------------- + +CAIROVERSION=1.8.0 + +TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION) +TARFILE_MD5=4ea70ea87b47e92d318d4e7f5b940f47 + +PATCH_FILES=..$/$(TARFILE_NAME).patch + +cairo_CFLAGS=$(SOLARINC) +cairo_LDFLAGS=$(SOLARLIB) + +cairo_CPPFLAGS= + +.IF "$(SYSTEM_ZLIB)"!="YES" +cairo_CPPFLAGS+=-I$(SOLARINCDIR)$/external$/zlib +cairo_COMPRESS=z_compress +.ELSE +cairo_COMPRESS=compress +.ENDIF +cairo_CPPFLAGS+=$(INCLUDE) + +.IF "$(OS)"=="WNT" +# --------- Windows ------------------------------------------------- +.IF "$(COM)"=="GCC" +cairo_LDFLAGS+=-no-undefined -L$(ILIB:s/;/ -L/) +cairo_CPPFLAGS+=-nostdinc +cairo_CC=$(CC) -mthreads + +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +cairo_CC+=-shared-libgcc +.ENDIF +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +cairo_LIBS+=$(MINGW_SHARED_LIBSTDCPP) +.ENDIF + +CONFIGURE_DIR= +CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure +CONFIGURE_FLAGS=--disable-xlib --disable-ft --disable-pthread --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config CC="$(cairo_CC)" LIBS="$(cairo_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) OBJDUMP="$(WRAPCMD) objdump" +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) +.IF "$(GUI)$(COM)"=="WNTGCC" +.EXPORT : PWD +.ENDIF + +.ELSE # WNT, not GCC +BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release +BUILD_DIR= +.ENDIF + +OUT2INC+=src$/cairo-win32.h + +.ELIF "$(GUIBASE)"=="aqua" +# ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- +.IF "$(SYSBASE)"!="" +.IF "$(EXTRA_CFLAGS)" != "" +cairo_CFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) +cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) +.ENDIF # "$(EXTRA_CFLAGS)" != "" +.ENDIF # "$(SYSBASE)"!="" +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) +cairo_CPPFLAGS+=$(EXTRA_CDEFS) +cairo_LDFLAGS+=$(EXTRA_LINKFLAGS) +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) + +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 +.ELIF "$(OS)$(COM)"=="SOLARISC52" +cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" + +.IF "$(SYSBASE)"!="" +cairo_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS) +.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" +cairo_LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl +.ENDIF +.ENDIF # "$(SYSBASE)"!="" + +LDFLAGS:=$(cairo_LDFLAGS) +.EXPORT: LDFLAGS + +.IF "$(COMNAME)"=="sunpro5" +cairo_CFLAGS+=-xc99=none +.ENDIF + +.IF "$(CPU)"=="I" +cairo_CFLAGS+=-march=i486 +.ENDIF + +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) +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) + +OUT2INC+=src$/cairo-xlib.h \ + src$/cairo-xlib-xrender.h \ + src$/cairo-ft.h + +.ENDIF + + +# -------- All platforms -------------------------------------------- + +.IF "$(OS)" != "WNT" || "$(COM)" == "GCC" +# all other platforms except vanilla WNT, which does not use configure + +.IF "$(BUILD_PIXMAN)" == "YES" +# pixman is in this module +# We include paths to this module also in LDFLAGS/CFLAGS to guarantee search order. +# However pixman_* vars need to be also set for configure to work properly on all platforms. +CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1" +.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 + +.IF "$(SYSTEM_LIBPNG)" != "YES" +CONFIGURE_FLAGS+=png_CFLAGS="-I$(SOLARINCDIR)$/external$/libpng" png_LIBS="-L$(SOLARLIBDIR) -lpng" +.ENDIF + + +OUT2INC+=cairo-version.h \ + src$/cairo-deprecated.h \ + src$/cairo-features.h \ + src$/cairo-pdf.h \ + src$/cairo-ps.h \ + src$/cairo.h + +.IF "$(OS)"=="MACOSX" +EXTRPATH=LOADER +OUT2LIB+=src$/.libs$/libcairo*.dylib +.ELIF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +OUT2BIN+=src$/.libs$/*.a +OUT2BIN+=src$/.libs$/*.dll +.ELSE +OUT2LIB+=src$/release$/*.lib +OUT2BIN+=src$/release$/*.dll +.ENDIF +.ELSE +OUT2LIB+=src$/.libs$/libcairo.so* +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch new file mode 100644 index 000000000000..4aa06811fbfc --- /dev/null +++ b/cairo/pixman-0.12.0.patch @@ -0,0 +1,25 @@ +--- 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 @@ + + + ++# getisax is falsely detected when using OOo build script on Linux/FBSD... ++case "$build_os" in ++ linux-gnu*) ++ ;; ++ freebsd*) ++ ;; ++ *) + + for ac_func in getisax + do +@@ -19834,6 +19841,8 @@ + fi + done + ++ ;; ++esac + { 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 diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk new file mode 100644 index 000000000000..b94e7673d996 --- /dev/null +++ b/cairo/pixman/makefile.mk @@ -0,0 +1,164 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. + +PRJNAME=cairo +TARGET=so_pixman +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(ENABLE_CAIRO)" == "" +all: + @echo "Nothing to do (Cairo not enabled)." + +.ELIF "$(BUILD_PIXMAN)" == "" +all: + @echo "Not building pixman." + +.ENDIF + +# --- Files -------------------------------------------------------- + +PIXMANVERSION=0.12.0 + +TARFILE_NAME=pixman-$(PIXMANVERSION) +TARFILE_MD5=09357cc74975b01714e00c5899ea1881 + +PATCH_FILES=..$/$(TARFILE_NAME).patch + +# Note: we are building static pixman library to avoid linking problems. +# However, for Unix dynamic library must be used (especially due to 64bit issues) + +.IF "$(OS)"=="WNT" +# --------- Windows ------------------------------------------------- +.IF "$(COM)"=="GCC" +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure +CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(pixman_CFLAGS) -mthreads" LDFLAGS="$(pixman_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" OBJDUMP="$(WRAPCMD) objdump" +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) +.IF "$(GUI)$(COM)"=="WNTGCC" +.EXPORT : PWD +.ENDIF + +.ELSE # WNT, not GCC +BUILD_DIR=pixman +BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 +.ENDIF + +.ELIF "$(GUIBASE)"=="aqua" +# ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure +CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)" +.IF "$(SYSBASE)"!="" +.IF "$(EXTRA_CFLAGS)"!="" +CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)" +.ENDIF # "$(EXTRA_CDEFS)"!="" +.ENDIF # "$(SYSBASE)"!="" +BUILD_ACTION=$(GNUMAKE) +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) + +.ELSE +# ----------- Unix --------------------------------------------------------- +.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" + +.IF "$(OS)$(COM)"=="SOLARISC52" +LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' +.ENDIF # "$(OS)$(COM)"=="SOLARISC52" + +.IF "$(SYSBASE)"!="" +pixman_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS) +.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" +LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl +.ENDIF +.ENDIF # "$(SYSBASE)"!="" + +.EXPORT: LDFLAGS + +.IF "$(COMNAME)"=="sunpro5" +pixman_CFLAGS+=-xc99=none +.ENDIF + +.IF "$(CPU)"=="I" +pixman_CFLAGS+=-march=i486 +.ENDIF + +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) +BUILD_DIR=$(CONFIGURE_DIR) +.ENDIF + + + +# -------- All platforms -------------------------------------------- + +OUT2INC=pixman$/pixman-version.h \ + pixman$/pixman.h + +.IF "$(OS)"=="MACOSX" +OUT2LIB+=pixman$/.libs$/libpixman-1.a +.ELIF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +OUT2LIB+=pixman$/.libs$/*.a +.ELSE +OUT2LIB+=pixman$/release$/*.lib +.ENDIF +.ELSE +.IF "$(CPUNAME)"=="X86_64" +OUT2LIB+=pixman$/.libs$/libpixman-1.so +.ELSE +OUT2LIB+=pixman$/.libs$/libpixman-1.a +.ENDIF +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst new file mode 100644 index 000000000000..c59a5c4bbdd8 --- /dev/null +++ b/cairo/prj/build.lst @@ -0,0 +1,4 @@ +lcairo cairo : ZLIB:zlib 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 new file mode 100644 index 000000000000..6cd8613cf677 --- /dev/null +++ b/cairo/prj/d.lst @@ -0,0 +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 + +..\%__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 |