diff options
author | mh0310.choi <mh0310.choi@samsung.com> | 2015-07-28 10:46:57 +0900 |
---|---|---|
committer | mh0310.choi <mh0310.choi@samsung.com> | 2015-07-28 13:08:12 +0900 |
commit | 5e67a6f721eaedda61300baf0799199c7771ebd0 (patch) | |
tree | 6cd50b52498aab50e79b966cdccc2a137db316d9 /build | |
parent | d3aeffba37161d2b76b29c4ea13369bd67a47a8e (diff) | |
download | cairo-5e67a6f721eaedda61300baf0799199c7771ebd0.tar.gz cairo-5e67a6f721eaedda61300baf0799199c7771ebd0.tar.bz2 cairo-5e67a6f721eaedda61300baf0799199c7771ebd0.zip |
Cairo version Upgrade for Tizen3.0submit/tizen_tv/20150728.091927submit/tizen_mobile/20150728.091912submit/tizen_common/20150728.091859accepted/tizen/tv/20150729.011254accepted/tizen/mobile/20150729.011230
- from 1.12.14 to 1.14.2
Change-Id: I3b62d212041b337bbb926d579f9ce74f42a45c3b
Diffstat (limited to 'build')
27 files changed, 39 insertions, 227 deletions
diff --git a/build/.gitignore b/build/.gitignore index 53f31d770..2f0183557 100755..100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -1,3 +1,4 @@ +ar-lib compile config.guess config.sub @@ -10,3 +11,6 @@ mkinstalldirs #Makefile.win32.features-h libtool.m4 lt*.m4 +gtk-doc.m4 +test-driver + diff --git a/build/Makefile.am.analysis b/build/Makefile.am.analysis index a44077ab4..a44077ab4 100755..100644 --- a/build/Makefile.am.analysis +++ b/build/Makefile.am.analysis diff --git a/build/Makefile.am.changelog b/build/Makefile.am.changelog index 07e603695..07e603695 100755..100644 --- a/build/Makefile.am.changelog +++ b/build/Makefile.am.changelog diff --git a/build/Makefile.am.common b/build/Makefile.am.common index b955af58f..b955af58f 100755..100644 --- a/build/Makefile.am.common +++ b/build/Makefile.am.common diff --git a/build/Makefile.am.gtk-doc b/build/Makefile.am.gtk-doc index c3d642b09..c3d642b09 100755..100644 --- a/build/Makefile.am.gtk-doc +++ b/build/Makefile.am.gtk-doc diff --git a/build/Makefile.am.releasing b/build/Makefile.am.releasing index b17faabce..b17faabce 100755..100644 --- a/build/Makefile.am.releasing +++ b/build/Makefile.am.releasing diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common index 01a38cd32..7d7e9735f 100755..100644 --- a/build/Makefile.win32.common +++ b/build/Makefile.win32.common @@ -23,18 +23,29 @@ CFG_CFLAGS := -MD -O2 CFG_LDFLAGS := endif -PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman -PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib +ifeq ($(PIXMAN_PATH),) +PIXMAN_PATH := $(top_builddir)/../pixman +endif +PIXMAN_CFLAGS := -I$(PIXMAN_PATH)/pixman/ +PIXMAN_LIBS := $(PIXMAN_PATH)/pixman/$(CFG)/pixman-1.lib CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib + ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) -LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/ -CAIRO_LIBS += $(top_builddir)/../libpng/libpng.lib +ifeq ($(LIBPNG_PATH),) +LIBPNG_PATH := $(top_builddir)/../libpng +endif +LIBPNG_CFLAGS += -I$(LIBPNG_PATH)/ +CAIRO_LIBS += $(LIBPNG_PATH)/libpng.lib endif + ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00) else -ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/ -CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib +ifeq ($(ZLIB_PATH),) +ZLIB_PATH := $(top_builddir)/../zlib +endif +ZLIB_CFLAGS += -I$(ZLIB_PATH)/ +CAIRO_LIBS += $(ZLIB_PATH)/zdll.lib endif DEFAULT_CFLAGS = -nologo $(CFG_CFLAGS) diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features index cf7721ad2..5a5848da6 100755..100644 --- a/build/Makefile.win32.features +++ b/build/Makefile.win32.features @@ -1,7 +1,5 @@ # Generated by configure. Modify to customize. -CAIRO_HAS_TLS=0 -CAIRO_HAS_PTHREAD_SETSPECIFIC=0 CAIRO_HAS_XLIB_SURFACE=0 CAIRO_HAS_XLIB_XRENDER_SURFACE=0 CAIRO_HAS_XCB_SURFACE=0 @@ -25,10 +23,10 @@ CAIRO_HAS_GLESV2_SURFACE=0 CAIRO_HAS_GLESV3_SURFACE=0 CAIRO_HAS_COGL_SURFACE=0 CAIRO_HAS_DIRECTFB_SURFACE=0 -CAIRO_HAS_TG_SURFACE=0 CAIRO_HAS_VG_SURFACE=0 CAIRO_HAS_EGL_FUNCTIONS=0 CAIRO_HAS_GLX_FUNCTIONS=0 +CAIRO_HAS_CGL_FUNCTIONS=0 CAIRO_HAS_WGL_FUNCTIONS=0 CAIRO_HAS_SCRIPT_SURFACE=1 CAIRO_HAS_FT_FONT=0 @@ -39,7 +37,6 @@ CAIRO_HAS_SVG_SURFACE=1 CAIRO_HAS_TEST_SURFACES=0 CAIRO_HAS_TEE_SURFACE=0 CAIRO_HAS_XML_SURFACE=0 -CAIRO_HAS_OPENMP=0 CAIRO_HAS_PTHREAD=0 CAIRO_HAS_GOBJECT_FUNCTIONS=0 CAIRO_HAS_TRACE=0 diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h index f5164d71b..6c0e91f8f 100755..100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -5,12 +5,6 @@ $(top_srcdir)/src/cairo-features.h: $(top_srcdir)/build/Makefile.win32.features @echo "/* Generated by Makefile.win32.features-h. Do not edit. */" > $(top_srcdir)/src/cairo-features.h @echo "#ifndef CAIRO_FEATURES_H" >> $(top_srcdir)/src/cairo-features.h @echo "#define CAIRO_FEATURES_H 1" >> $(top_srcdir)/src/cairo-features.h -ifeq ($(CAIRO_HAS_TLS),1) - @echo "#define CAIRO_HAS_TLS 1" >> $(top_srcdir)/src/cairo-features.h -endif -ifeq ($(CAIRO_HAS_PTHREAD_SETSPECIFIC),1) - @echo "#define CAIRO_HAS_PTHREAD_SETSPECIFIC 1" >> $(top_srcdir)/src/cairo-features.h -endif ifeq ($(CAIRO_HAS_XLIB_SURFACE),1) @echo "#define CAIRO_HAS_XLIB_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h endif @@ -80,9 +74,6 @@ endif ifeq ($(CAIRO_HAS_DIRECTFB_SURFACE),1) @echo "#define CAIRO_HAS_DIRECTFB_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h endif -ifeq ($(CAIRO_HAS_TG_SURFACE),1) - @echo "#define CAIRO_HAS_TG_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h -endif ifeq ($(CAIRO_HAS_VG_SURFACE),1) @echo "#define CAIRO_HAS_VG_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h endif @@ -92,6 +83,9 @@ endif ifeq ($(CAIRO_HAS_GLX_FUNCTIONS),1) @echo "#define CAIRO_HAS_GLX_FUNCTIONS 1" >> $(top_srcdir)/src/cairo-features.h endif +ifeq ($(CAIRO_HAS_CGL_FUNCTIONS),1) + @echo "#define CAIRO_HAS_CGL_FUNCTIONS 1" >> $(top_srcdir)/src/cairo-features.h +endif ifeq ($(CAIRO_HAS_WGL_FUNCTIONS),1) @echo "#define CAIRO_HAS_WGL_FUNCTIONS 1" >> $(top_srcdir)/src/cairo-features.h endif @@ -127,9 +121,6 @@ ifeq ($(CAIRO_HAS_XML_SURFACE),1) @echo "#define CAIRO_HAS_XML_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h endif @echo "#define CAIRO_HAS_USER_FONT 1" >> $(top_srcdir)/src/cairo-features.h -ifeq ($(CAIRO_HAS_OPENMP),1) - @echo "#define CAIRO_HAS_OPENMP 1" >> $(top_srcdir)/src/cairo-features.h -endif ifeq ($(CAIRO_HAS_PTHREAD),1) @echo "#define CAIRO_HAS_PTHREAD 1" >> $(top_srcdir)/src/cairo-features.h endif diff --git a/build/Makefile.win32.inform b/build/Makefile.win32.inform index ba1116505..ba1116505 100755..100644 --- a/build/Makefile.win32.inform +++ b/build/Makefile.win32.inform diff --git a/build/aclocal.cairo.m4 b/build/aclocal.cairo.m4 index 2f4873b04..2f4873b04 100755..100644 --- a/build/aclocal.cairo.m4 +++ b/build/aclocal.cairo.m4 diff --git a/build/aclocal.compare.m4 b/build/aclocal.compare.m4 index bd6c51b28..bd6c51b28 100755..100644 --- a/build/aclocal.compare.m4 +++ b/build/aclocal.compare.m4 diff --git a/build/aclocal.enable.m4 b/build/aclocal.enable.m4 index f3522b983..f3522b983 100755..100644 --- a/build/aclocal.enable.m4 +++ b/build/aclocal.enable.m4 diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4 index 18ec31618..8f85f0862 100755..100644 --- a/build/aclocal.float.m4 +++ b/build/aclocal.float.m4 @@ -24,16 +24,17 @@ AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN], # is found, the user is instructed to specify the ordering. ax_cv_c_float_words_bigendian=unknown -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +AC_LINK_IFELSE([AC_LANG_SOURCE([[ -double d = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0; +double d __attribute__((used)) = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0; +int main() { return 0; } ]])], [ -if strings - conftest.$ac_objext | grep noonsees >/dev/null ; then +if strings - conftest$ac_exeext | grep noonsees >/dev/null ; then ax_cv_c_float_words_bigendian=yes fi -if strings - conftest.$ac_objext | grep seesnoon >/dev/null ; then +if strings - conftest$ac_exeext | grep seesnoon >/dev/null ; then if test "$ax_cv_c_float_words_bigendian" = unknown; then ax_cv_c_float_words_bigendian=no else diff --git a/build/aclocal.gtk-doc.m4 b/build/aclocal.gtk-doc.m4 index bfdfa1da6..bfdfa1da6 100755..100644 --- a/build/aclocal.gtk-doc.m4 +++ b/build/aclocal.gtk-doc.m4 diff --git a/build/aclocal.makefile.m4 b/build/aclocal.makefile.m4 index 70777810d..70777810d 100755..100644 --- a/build/aclocal.makefile.m4 +++ b/build/aclocal.makefile.m4 diff --git a/build/aclocal.pkg.m4 b/build/aclocal.pkg.m4 index cf90a9678..cf90a9678 100755..100644 --- a/build/aclocal.pkg.m4 +++ b/build/aclocal.pkg.m4 diff --git a/build/configure.ac.analysis b/build/configure.ac.analysis index 11c52e70d..11c52e70d 100755..100644 --- a/build/configure.ac.analysis +++ b/build/configure.ac.analysis diff --git a/build/configure.ac.features b/build/configure.ac.features index 0457bf31c..adb840fd8 100755..100644 --- a/build/configure.ac.features +++ b/build/configure.ac.features @@ -367,7 +367,6 @@ AC_DEFUN([CAIRO_REPORT], echo " Recording: yes (always builtin)" echo " Observer: yes (always builtin)" echo " Mime: yes (always builtin)" - echo " TG: $use_tg" echo " Tee: $use_tee" echo " XML: $use_xml" echo " Skia: $use_skia" @@ -384,6 +383,7 @@ AC_DEFUN([CAIRO_REPORT], echo " PDF: $use_pdf" echo " SVG: $use_svg" echo " OpenGL: $use_gl" + echo " EvasGL: $use_evasgl" echo " OpenGL ES 2.0: $use_glesv2" echo " OpenGL ES 3.0: $use_glesv3" echo " BeOS: $use_beos" @@ -403,6 +403,7 @@ AC_DEFUN([CAIRO_REPORT], echo " PNG functions: $use_png" echo " GLX functions: $use_glx" echo " WGL functions: $use_wgl" + echo " CGL functions: $use_cgl" echo " EGL functions: $use_egl" echo " X11-xcb functions: $use_xlib_xcb" echo " XCB-shm functions: $use_xcb_shm" @@ -413,7 +414,6 @@ AC_DEFUN([CAIRO_REPORT], echo "" echo "And the following internal features:" echo " pthread: $use_pthread" - echo " openmp: $use_openmp" echo " gtk-doc: $enable_gtk_doc" echo " gcov support: $use_gcov" echo " symbol-lookup: $use_symbol_lookup" diff --git a/build/configure.ac.noversion b/build/configure.ac.noversion index 18c4bd5f7..18c4bd5f7 100755..100644 --- a/build/configure.ac.noversion +++ b/build/configure.ac.noversion diff --git a/build/configure.ac.openmp b/build/configure.ac.openmp deleted file mode 100755 index e5bff7f23..000000000 --- a/build/configure.ac.openmp +++ /dev/null @@ -1,74 +0,0 @@ -m4_define([libcairo_openmp_program],[dnl - #include <stdio.h> - - extern unsigned int lcg_seed; - #pragma omp threadprivate(lcg_seed) - unsigned int lcg_seed; - - unsigned function(unsigned a, unsigned b) - { - lcg_seed ^= b; - return ((a + b) ^ a ) + lcg_seed; - } - - int main(int argc, char **argv) - { - int i; - int n1 = 0, n2 = argc; - unsigned checksum = 0; - int verbose = argv != NULL; - unsigned (*test_function)(unsigned, unsigned); - test_function = function; - #pragma omp parallel for reduction(+:checksum) default(none) \ - shared(n1, n2, test_function, verbose) - for (i = n1; i < n2; i++) - { - unsigned crc = test_function (i, 0); - if (verbose) - printf ("%d: %08X\n", i, crc); - checksum += crc; - } - printf("%u\n", checksum); - return 0; - } -}]) - -AC_DEFUN([CAIRO_CHECK_OPENMP],[dnl - CAIRO_CC_TRY_LINK_WITH_ENV_SILENT( - [CFLAGS="$CFLAGS $2"; - LIBS="$LIBS $3"], - [$4], - [$1_CFLAGS="$2"; - $1_LIBS="$3"; - $5], - [$1_CFLAGS=""; - $1_LIBS=""; - $6]) -]) - -AC_DEFUN([CAIRO_CONFIGURE_OPENMP],[dnl - if test "x$OPENMP_CFLAGS" = "x"; then - OPENMP_CFLAGS="-fopenmp" - fi - if test "x$OPENMP_LIBS" = "x"; then - OPENMP_LIBS="-lgomp" - fi - - CAIRO_CHECK_OPENMP( - [openmp], [$OPENMP_CFLAGS], [$OPENMP_LIBS], - [libcairo_openmp_program], - [have_openmp=yes], - [have_openmp=no]) - OPENMP_CFLAGS= - OPENMP_LIBS= - - dnl Tell autoconf about the results. - if test "x$have_openmp" = "xyes"; then - AC_DEFINE([CAIRO_HAS_OPENMP], 1, - [Define to 1 if we have openmp support]) - fi - - dnl Set the output variables for CAIRO_ENABLE. - use_openmp="$have_openmp" - openmp_REQUIRES="" -]) diff --git a/build/configure.ac.pthread b/build/configure.ac.pthread index 29c930da9..29c930da9 100755..100644 --- a/build/configure.ac.pthread +++ b/build/configure.ac.pthread diff --git a/build/configure.ac.system b/build/configure.ac.system index b9d71c8d7..b9d71c8d7 100755..100644 --- a/build/configure.ac.system +++ b/build/configure.ac.system diff --git a/build/configure.ac.tls b/build/configure.ac.tls deleted file mode 100755 index 881c919c4..000000000 --- a/build/configure.ac.tls +++ /dev/null @@ -1,108 +0,0 @@ -m4_define([libcairo_pthread_setspecific_program],[dnl - #include <stdlib.h> - #include <pthread.h> - #include <stdio.h> - - static pthread_once_t once_control = PTHREAD_ONCE_INIT; - static pthread_key_t key; - - static void - make_key (void) - { - pthread_key_create (&key, NULL); - } - - int - main (int argc, char **argv) - { - void *value = NULL; - - if (pthread_once (&once_control, make_key) != 0) - { - value = NULL; - } - else - { - value = pthread_getspecific (key); - if (!value) - { - value = malloc (100); - pthread_setspecific (key, value); - } - } - - printf ("%d, %p\n", argc, argv); - return 0; - } -}]) - -AC_DEFUN([CAIRO_CONFIGURE_TLS], [dnl - have_tls=no - AC_CACHE_VAL(ac_cv_tls, [ - ac_cv_tls=none - keywords="__thread __declspec(thread)" - for kw in $keywords ; do - AC_TRY_COMPILE([ - #if defined(__MINGW32__) && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) - #error This MinGW version has broken __thread support - #endif - #ifdef __OpenBSD__ - #error OpenBSD has broken __thread support - #endif - - int $kw test;], [], [ac_cv_tls=$kw; break]) - done - ]) - - if test "$ac_cv_tls" != "none"; then - have_tls=yes - AC_DEFINE([CAIRO_HAS_TLS], 1, [Define to 1 if we have tls support]) - AC_DEFINE_UNQUOTED([TLS], $ac_cv_tls, [The compiler supported TLS storage class]) - fi - - dnl Set the output variables for CAIRO_ENABLE. - use_tls="$have_tls" - tls_REQUIRES="" -]) - -AC_DEFUN([CAIRO_CHECK_PTHREAD_SETSPECIFIC],[dnl - CAIRO_CC_TRY_LINK_WITH_ENV_SILENT( - [CFLAGS="$CFLAGS $2"; - LIBS="$LIBS $3"], - [$4], - [$1_CFLAGS="$2"; - $1_LIBS="$3"; - $5], - [$1_CFLAGS=""; - $1_LIBS=""; - $6]) -]) - -AC_DEFUN([CAIRO_CONFIGURE_PTHREAD_SETSPECIFIC],[dnl - if test "x$PTHREAD_SETSPECIFIC_CFLAGS" = "x"; then - PTHREAD_SETSPECIFIC_CFLAGS="-D_REENTRANT" - fi - - if test "x$PTHREAD_SETSPECIFIC_LIBS" = "x"; then - PTHREAD_SETSPECIFIC_LIBS="-lpthread" - fi - - CAIRO_CHECK_PTHREAD_SETSPECIFIC( - [pthread_setspecific], [$PTHREAD_SETSPECIFIC_CFLAGS], [$PTHREAD_SETSPECIFIC_LIBS], - [libcairo_pthread_setspecific_program], - [have_pthread_setspecific=yes], - [have_pthread_setspecific=no]) - - PTHREAD_SETSPECIFIC_CFLAGS= - PTHREAD_SETSPECIFIC_LIBS= - - dnl Tell autoconf about the results. - if test "x$have_pthread_setspecific" = "xyes"; then - AC_DEFINE([CAIRO_HAS_PTHREAD_SETSPECIFIC], 1, - [Define to 1 if we have pthread_setspecific support]) - fi - - dnl Set the output variables for CAIRO_ENABLE. - use_pthread_setspecific="$have_pthread_setspecific" - pthread_setspecific_REQUIRES="" -]) diff --git a/build/configure.ac.tools b/build/configure.ac.tools index a24dbcecb..a24dbcecb 100755..100644 --- a/build/configure.ac.tools +++ b/build/configure.ac.tools diff --git a/build/configure.ac.version b/build/configure.ac.version index a91cee39e..a91cee39e 100755..100644 --- a/build/configure.ac.version +++ b/build/configure.ac.version diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings index f984eb29c..74e6634b2 100755..100644 --- a/build/configure.ac.warnings +++ b/build/configure.ac.warnings @@ -11,16 +11,17 @@ dnl MAYBE_WARN in an ignorable way (like adding whitespace) # -Wlogical-op causes too much noise from strcmp("literal", str) MAYBE_WARN="-Wall -Wextra \ --Wold-style-definition -Wdeclaration-after-statement \ -Wmissing-declarations -Werror-implicit-function-declaration \ --Wnested-externs -Wpointer-arith -Wwrite-strings \ --Wsign-compare -Wstrict-prototypes -Wmissing-prototypes \ --Wpacked -Wswitch-enum -Wmissing-format-attribute \ --Wbad-function-cast -Wvolatile-register-var \ +-Wpointer-arith -Wwrite-strings -Wsign-compare -Wpacked +-Wswitch-enum -Wmissing-format-attribute -Wvolatile-register-var \ -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \ -Wno-missing-field-initializers -Wno-unused-parameter \ -Wno-attributes -Wno-long-long -Winline" +MAYBE_C_SPECIFIC_WARN="-Wold-style-definition \ +-Wdeclaration-after-statement -Wstrict-prototypes \ +-Wmissing-prototypes -Wbad-function-cast -Wnested-externs" + # New -Wno options should be added here # gcc-4.4 and later accept every -Wno- option but may complain later that this # option is unknow each time another warning happen. @@ -35,17 +36,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ dnl We also abuse the warning-flag facility to enable other compiler dnl options. Namely, the following: - -dnl -flto working really needs a test link, not just a compile - -safe_MAYBE_WARN="$MAYBE_WARN" -MAYBE_WARN="$MAYBE_WARN -flto" -AC_TRY_LINK([],[ - int main(int argc, char **argv) { return 0; } -],[],[ - MAYBE_WARN="$safe_MAYBE_WARN" -]) - MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" dnl Also to turn various gcc/glibc-specific preprocessor checks @@ -77,7 +67,7 @@ AC_CACHE_CHECK([for supported warning flags], cairo_cv_warn_cflags, [ CAIRO_CC_TRY_FLAG([-W$W -Wno-$W],, [WARN_CFLAGS="$WARN_CFLAGS -Wno-$W"]) done cairo_cv_warn_cflags=$WARN_CFLAGS - cairo_cv_warn_maybe=$MAYBE_WARN + cairo_cv_warn_maybe="$MAYBE_WARN $MAYBE_C_SPECIFIC_WARN" AC_MSG_CHECKING([which warning flags were supported]) ]) |