Import upstream release 1.11.21.11.2upstream-experimental

1 files changed, 39 insertions, 158 deletions

diff --git a/configure b/configure
index 3bf06eb..c728e82 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for cairo 1.10.2.
+# Generated by GNU Autoconf 2.67 for cairo 1.11.2.
 #
 # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=cairo>.
 #
@@ -702,8 +702,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cairo'
 PACKAGE_TARNAME='cairo'
-PACKAGE_VERSION='1.10.2'
-PACKAGE_STRING='cairo 1.10.2'
+PACKAGE_VERSION='1.11.2'
+PACKAGE_STRING='cairo 1.11.2'
 PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=cairo'
 PACKAGE_URL=''
 
@@ -841,8 +841,6 @@ CAIRO_HAS_DIRECTFB_SURFACE_FALSE
 CAIRO_HAS_DIRECTFB_SURFACE_TRUE
 directfb_LIBS
 directfb_CFLAGS
-BUILD_PRIVATE_GLEW_FALSE
-BUILD_PRIVATE_GLEW_TRUE
 CAIRO_HAS_GL_SURFACE_FALSE
 CAIRO_HAS_GL_SURFACE_TRUE
 gl_LIBS
@@ -1747,7 +1745,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cairo 1.10.2 to adapt to many kinds of systems.
+\`configure' configures cairo 1.11.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1821,7 +1819,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cairo 1.10.2:";;
+     short | recursive ) echo "Configuration of cairo 1.11.2:";;
    esac
   cat <<\_ACEOF
 
@@ -2130,7 +2128,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cairo configure 1.10.2
+cairo configure 1.11.2
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2909,7 +2907,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cairo $as_me 1.10.2, which was
+It was created by cairo $as_me 1.11.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -5041,7 +5039,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cairo'
- VERSION='1.10.2'
+ VERSION='1.11.2'
 
 
 # Some tools Automake needs.
@@ -6063,13 +6061,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6066: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6064: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6069: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6067: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6072: output\"" >&5)
+  (eval echo "\"\$as_me:6070: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7271,7 +7269,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7274 "configure"' > conftest.$ac_ext
+  echo '#line 7272 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8531,11 +8529,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8534: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8532: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8538: \$? = $ac_status" >&5
+   echo "$as_me:8536: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8870,11 +8868,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8873: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8871: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8877: \$? = $ac_status" >&5
+   echo "$as_me:8875: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8975,11 +8973,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8978: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8976: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8982: \$? = $ac_status" >&5
+   echo "$as_me:8980: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9030,11 +9028,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9033: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9031: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9037: \$? = $ac_status" >&5
+   echo "$as_me:9035: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11414,7 +11412,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11417 "configure"
+#line 11415 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11510,7 +11508,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11513 "configure"
+#line 11511 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12166,11 +12164,11 @@ fi
 
 
 CAIRO_VERSION_MAJOR=1
-CAIRO_VERSION_MINOR=10
+CAIRO_VERSION_MINOR=11
 CAIRO_VERSION_MICRO=2
 CAIRO_VERSION_SONUM=2
-CAIRO_RELEASE_STATUS=release
-CAIRO_LIBTOOL_VERSION_INFO=11002:2:11000
+CAIRO_RELEASE_STATUS=snapshot
+CAIRO_LIBTOOL_VERSION_INFO=11104:0:11102
 
 
 
@@ -15595,11 +15593,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15598: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15596: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15602: \$? = $ac_status" >&5
+   echo "$as_me:15600: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15694,11 +15692,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15697: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15695: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15701: \$? = $ac_status" >&5
+   echo "$as_me:15699: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15746,11 +15744,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15749: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15747: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15753: \$? = $ac_status" >&5
+   echo "$as_me:15751: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17222,6 +17220,8 @@ CAIRO_NONPKGCONFIG_LIBS="$LIBS"
 # -Wcast-align generates lots of false positive reports we need to
 # cast image data from uint8_t to uin32_t.
 
+# -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 \
@@ -17231,7 +17231,7 @@ MAYBE_WARN="-Wall -Wextra \
 -Wbad-function-cast -Wvolatile-register-var \
 -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
 -Wno-missing-field-initializers -Wno-unused-parameter \
--Wno-attributes -Wno-long-long -Winline -Wlogical-op"
+-Wno-attributes -Wno-long-long -Winline"
 
 MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
 			-erroff=E_ENUM_TYPE_MISMATCH_OP"
@@ -26752,7 +26752,6 @@ fi
 
 
 
-use_glew="no (not required by any backend)"
 																	# Check whether --enable-gl was given.
 if test "${enable_gl+set}" = set; then :
   enableval=$enable_gl; enable_gl=$enableval
@@ -26766,7 +26765,7 @@ fi
 	 ;; #(
   	yes|auto) :
     																																																																if test "x$cairo_cv_gl_cache_version" != "x6" -o \
-			    "x$cairo_cv_gl_cache_commands_len" != "x954" -o \
+			    "x$cairo_cv_gl_cache_commands_len" != "x370" -o \
 			    "x$cairo_cv_gl_cache_vars" != "x BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"; then :
   unset cairo_cv_gl_use
 fi
@@ -26883,118 +26882,13 @@ $as_echo "yes" >&6; }
 	:
 fi
 
-  # Disable system GLEW on UNIX since it assumes X and crashes with EGL
-  have_glew="no"
-  case "$host" in
-    *-linux*|*-*bsd*|*-solaris*)
-      ;;
-    *)
-      ac_fn_c_check_header_mongrel "$LINENO" "GL/glew.h" "ac_cv_header_GL_glew_h" "$ac_includes_default"
-if test "x$ac_cv_header_GL_glew_h" = x""yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glewInit in -lGLEW" >&5
-$as_echo_n "checking for glewInit in -lGLEW... " >&6; }
-if test "${ac_cv_lib_GLEW_glewInit+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGLEW  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char glewInit ();
-int
-main ()
-{
-return glewInit ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GLEW_glewInit=yes
-else
-  ac_cv_lib_GLEW_glewInit=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLEW_glewInit" >&5
-$as_echo "$ac_cv_lib_GLEW_glewInit" >&6; }
-if test "x$ac_cv_lib_GLEW_glewInit" = x""yes; then :
-  have_glew="GLEW"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glewInit in -lglew32" >&5
-$as_echo_n "checking for glewInit in -lglew32... " >&6; }
-if test "${ac_cv_lib_glew32_glewInit+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lglew32  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char glewInit ();
-int
-main ()
-{
-return glewInit ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_glew32_glewInit=yes
-else
-  ac_cv_lib_glew32_glewInit=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glew32_glewInit" >&5
-$as_echo "$ac_cv_lib_glew32_glewInit" >&6; }
-if test "x$ac_cv_lib_glew32_glewInit" = x""yes; then :
-  have_glew="glew32"
-fi
-
-fi
-
-fi
-
-
-      ;;
-  esac
-  if test "x$have_glew" != "xno"; then :
-
-    gl_NONPKGCONFIG_LIBS="-l$have_glew $gl_NONPKGCONFIG_LIBS"
-    use_glew="yes (system library)"
-
-else
-
-    use_glew="yes (private copy)"
-    CAIRO_CFLAGS="$CAIRO_CFLAGS -I\$(top_srcdir)/src/glew"
-
-fi
   need_glx_functions=yes
   need_wgl_functions=yes
   need_egl_functions=yes
 
 			cairo_cv_gl_use=$use_gl
 			cairo_cv_gl_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
-			cairo_cv_gl_cache_commands_len="954"
+			cairo_cv_gl_cache_commands_len="370"
 			cairo_cv_gl_cache_version="6"
 				cairo_cv_gl_BASE=$gl_BASE
 cairo_cv_gl_REQUIRES=$gl_REQUIRES
@@ -27223,14 +27117,6 @@ fi
 
 
 
- if test "x$use_glew" = "xyes (private copy)"; then
-  BUILD_PRIVATE_GLEW_TRUE=
-  BUILD_PRIVATE_GLEW_FALSE='#'
-else
-  BUILD_PRIVATE_GLEW_TRUE='#'
-  BUILD_PRIVATE_GLEW_FALSE=
-fi
-
 
 
 																	# Check whether --enable-directfb was given.
@@ -31601,7 +31487,7 @@ image_NONPKGCONFIG_LIBS="$ac_env_image_NONPKGCONFIG_LIBS_value"
 image_NONPKGCONFIG_EXTRA_LIBS="$ac_env_image_NONPKGCONFIG_EXTRA_LIBS_value"
 
 
-  pixman_REQUIRES="pixman-1 >= 0.18.4"
+  pixman_REQUIRES="pixman-1 >= 0.20.2"
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pixman" >&5
@@ -35092,10 +34978,6 @@ if test -z "${CAIRO_HAS_GL_SURFACE_TRUE}" && test -z "${CAIRO_HAS_GL_SURFACE_FAL
   as_fn_error $? "conditional \"CAIRO_HAS_GL_SURFACE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${BUILD_PRIVATE_GLEW_TRUE}" && test -z "${BUILD_PRIVATE_GLEW_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_PRIVATE_GLEW\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${CAIRO_HAS_DIRECTFB_SURFACE_TRUE}" && test -z "${CAIRO_HAS_DIRECTFB_SURFACE_FALSE}"; then
   as_fn_error $? "conditional \"CAIRO_HAS_DIRECTFB_SURFACE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -35628,7 +35510,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cairo $as_me 1.10.2, which was
+This file was extended by cairo $as_me 1.11.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -35694,7 +35576,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cairo config.status 1.10.2
+cairo config.status 1.11.2
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -38777,7 +38659,6 @@ fi
 	echo ""
 	echo "The following functions:"
 	echo "  PNG functions:   $use_png"
-	echo "  GLEW functions:  $use_glew"
 	echo "  GLX functions:   $use_glx"
 	echo "  WGL functions:   $use_wgl"
 	echo "  EGL functions:   $use_egl"