Imported Upstream version 1.2.0

1 files changed, 61 insertions, 64 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index dd12e9d..e36530b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -43,30 +43,30 @@ host_triplet = @host@
 @CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_3 = cairo-png.pc
 @CAIRO_HAS_SVG_SURFACE_TRUE@am__append_4 = cairo-svg.pc
 @CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_5 = cairo-xlib.pc
-@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_6 = cairo-quartz.pc
-@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_7 = cairo-xcb.pc
-@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_8 = cairo-win32-surface.c cairo-win32-private.h
-@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_9 = cairo-win32.pc
+@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_6 = cairo-xlib-xrender.pc
+@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_7 = cairo-quartz.pc
+@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_8 = cairo-xcb.pc
+@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_9 = cairo-win32-surface.c cairo-win32-private.h
+@CAIRO_HAS_WIN32_SURFACE_TRUE@am__append_10 = cairo-win32.pc
 # This is not really a separate conditional.  Is TRUE iff the previous one is.
-@CAIRO_HAS_WIN32_FONT_TRUE@am__append_10 = cairo-win32-font.c
-@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_11 = cairo-beos-surface.cpp
-@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_12 = cairo-beos.pc
-@CAIRO_HAS_GLITZ_SURFACE_TRUE@am__append_13 = cairo-glitz.pc
-@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_14 = cairo-directfb.pc
-@CAIRO_HAS_FT_FONT_TRUE@am__append_15 = cairo-ft.pc
-@CAIRO_HAS_ATSUI_FONT_TRUE@am__append_16 = cairo-atsui.pc
-@CAIRO_HAS_GLITZ_SURFACE_TRUE@am__append_17 = \
+@CAIRO_HAS_WIN32_FONT_TRUE@am__append_11 = cairo-win32-font.c
+@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_12 = cairo-beos-surface.cpp
+@CAIRO_HAS_BEOS_SURFACE_TRUE@am__append_13 = cairo-beos.pc
+@CAIRO_HAS_GLITZ_SURFACE_TRUE@am__append_14 = cairo-glitz.pc
+@CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_15 = cairo-directfb.pc
+@CAIRO_HAS_FT_FONT_TRUE@am__append_16 = cairo-ft.pc
+@CAIRO_HAS_ATSUI_FONT_TRUE@am__append_17 = cairo-atsui.pc
+@CAIRO_HAS_GLITZ_SURFACE_TRUE@am__append_18 = \
 @CAIRO_HAS_GLITZ_SURFACE_TRUE@	$(srcdir)/cairo-glitz.h
 
-@CAIRO_HAS_FT_FONT_TRUE@am__append_18 = \
+@CAIRO_HAS_FT_FONT_TRUE@am__append_19 = \
 @CAIRO_HAS_FT_FONT_TRUE@	$(srcdir)/cairo-ft.h \
 @CAIRO_HAS_FT_FONT_TRUE@	$(srcdir)/cairo-pdf.h \
 @CAIRO_HAS_FT_FONT_TRUE@	$(srcdir)/cairo-ps.h
 
 subdir = src
 DIST_COMMON = $(am__cairoinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/cairo-features.h.in \
-	$(srcdir)/cairo.pc.in
+	$(srcdir)/Makefile.in $(srcdir)/cairo.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.in
@@ -74,7 +74,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = cairo-features.h cairo.pc
+CONFIG_CLEAN_FILES = cairo.pc
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -98,12 +98,12 @@ am__libcairo_la_SOURCES_DIST = cairo.c cairo.h cairo-private.h \
 	cairo-path-data.c cairo-path-data-private.h cairo-path-fill.c \
 	cairo-path-fixed-private.h cairo-path-stroke.c cairo-pen.c \
 	cairo-polygon.c cairo-rectangle.c cairo-region.c \
-	cairo-scaled-font.c cairo-slope.c cairo-spline.c \
-	cairo-stroke-style.c cairo-surface.c cairo-surface-fallback.c \
-	cairo-surface-fallback-private.h cairo-traps.c cairo-pattern.c \
-	cairo-unicode.c cairo-output-stream.c \
-	cairo-output-stream-private.h cairo-wideint.c \
-	cairo-wideint-private.h cairo-meta-surface.c \
+	cairo-scaled-font.c cairo-scaled-font-test.h cairo-slope.c \
+	cairo-spline.c cairo-stroke-style.c cairo-surface.c \
+	cairo-surface-fallback.c cairo-surface-fallback-private.h \
+	cairo-traps.c cairo-pattern.c cairo-unicode.c \
+	cairo-output-stream.c cairo-output-stream-private.h \
+	cairo-wideint.c cairo-wideint-private.h cairo-meta-surface.c \
 	cairo-meta-surface-private.h cairo-paginated-surface.c \
 	cairo-paginated-surface-private.h cairo-analysis-surface.c \
 	cairo-analysis-surface-private.h cairo-atsui-font.c \
@@ -214,12 +214,10 @@ AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
-ATSUI_FONT_FEATURE = @ATSUI_FONT_FEATURE@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BEOS_SURFACE_FEATURE = @BEOS_SURFACE_FEATURE@
 CAIRO_CAN_TEST_GLITZ_AGL_SURFACE_FALSE = @CAIRO_CAN_TEST_GLITZ_AGL_SURFACE_FALSE@
 CAIRO_CAN_TEST_GLITZ_AGL_SURFACE_TRUE = @CAIRO_CAN_TEST_GLITZ_AGL_SURFACE_TRUE@
 CAIRO_CAN_TEST_GLITZ_EGL_SURFACE_FALSE = @CAIRO_CAN_TEST_GLITZ_EGL_SURFACE_FALSE@
@@ -265,11 +263,13 @@ CAIRO_HAS_XCB_SURFACE_FALSE = @CAIRO_HAS_XCB_SURFACE_FALSE@
 CAIRO_HAS_XCB_SURFACE_TRUE = @CAIRO_HAS_XCB_SURFACE_TRUE@
 CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HAS_XLIB_SURFACE_FALSE@
 CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS_XLIB_SURFACE_TRUE@
+CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE@
+CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@
 CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_REQUIRES = @CAIRO_REQUIRES@
 CAIRO_VERSION_MAJOR = @CAIRO_VERSION_MAJOR@
 CAIRO_VERSION_MICRO = @CAIRO_VERSION_MICRO@
 CAIRO_VERSION_MINOR = @CAIRO_VERSION_MINOR@
-CAIRO_VERSION_OTHER = @CAIRO_VERSION_OTHER@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -282,9 +282,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DIRECTFB_SURFACE_FEATURE = @DIRECTFB_SURFACE_FEATURE@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -307,18 +304,12 @@ FREETYPE_CONFIG = @FREETYPE_CONFIG@
 FREETYPE_CONFIG_CFLAGS = @FREETYPE_CONFIG_CFLAGS@
 FREETYPE_CONFIG_LIBS = @FREETYPE_CONFIG_LIBS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
-FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
-FT_FONT_FEATURE = @FT_FONT_FEATURE@
 GLITZ_AGL_CFLAGS = @GLITZ_AGL_CFLAGS@
 GLITZ_AGL_LIBS = @GLITZ_AGL_LIBS@
-GLITZ_CFLAGS = @GLITZ_CFLAGS@
 GLITZ_EGL_CFLAGS = @GLITZ_EGL_CFLAGS@
 GLITZ_EGL_LIBS = @GLITZ_EGL_LIBS@
 GLITZ_GLX_CFLAGS = @GLITZ_GLX_CFLAGS@
 GLITZ_GLX_LIBS = @GLITZ_GLX_LIBS@
-GLITZ_LIBS = @GLITZ_LIBS@
-GLITZ_REQUIRES = @GLITZ_REQUIRES@
-GLITZ_SURFACE_FEATURE = @GLITZ_SURFACE_FEATURE@
 GLITZ_WGL_CFLAGS = @GLITZ_WGL_CFLAGS@
 GLITZ_WGL_LIBS = @GLITZ_WGL_LIBS@
 GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
@@ -354,38 +345,19 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PDF_LIBS = @PDF_LIBS@
-PDF_SURFACE_FEATURE = @PDF_SURFACE_FEATURE@
 PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@
 PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_FUNCTIONS_FEATURE = @PNG_FUNCTIONS_FEATURE@
-PNG_LIBS = @PNG_LIBS@
-PNG_REQUIRES = @PNG_REQUIRES@
 POPPLER_CFLAGS = @POPPLER_CFLAGS@
 POPPLER_LIBS = @POPPLER_LIBS@
-PS_LIBS = @PS_LIBS@
-PS_SURFACE_FEATURE = @PS_SURFACE_FEATURE@
-QUARTZ_SURFACE_FEATURE = @QUARTZ_SURFACE_FEATURE@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SVG_SURFACE_FEATURE = @SVG_SURFACE_FEATURE@
 USE_MMX_FALSE = @USE_MMX_FALSE@
 USE_MMX_TRUE = @USE_MMX_TRUE@
 VERSION = @VERSION@
 VERSION_INFO = @VERSION_INFO@
 WARN_CFLAGS = @WARN_CFLAGS@
-WIN32_FONT_FEATURE = @WIN32_FONT_FEATURE@
-WIN32_SURFACE_FEATURE = @WIN32_SURFACE_FEATURE@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_LIBS = @XCB_LIBS@
-XCB_SURFACE_FEATURE = @XCB_SURFACE_FEATURE@
-XLIB_SURFACE_FEATURE = @XLIB_SURFACE_FEATURE@
-XRENDER_CFLAGS = @XRENDER_CFLAGS@
-XRENDER_LIBS = @XRENDER_LIBS@
-XRENDER_REQUIRES = @XRENDER_REQUIRES@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
@@ -413,7 +385,11 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+directfb_CFLAGS = @directfb_CFLAGS@
+directfb_LIBS = @directfb_LIBS@
 exec_prefix = @exec_prefix@
+glitz_CFLAGS = @glitz_CFLAGS@
+glitz_LIBS = @glitz_LIBS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -428,12 +404,18 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+png_CFLAGS = @png_CFLAGS@
+png_LIBS = @png_LIBS@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+xcb_CFLAGS = @xcb_CFLAGS@
+xcb_LIBS = @xcb_LIBS@
+xlib_xrender_CFLAGS = @xlib_xrender_CFLAGS@
+xlib_xrender_LIBS = @xlib_xrender_LIBS@
 font_subset_sources = \
 	cairo-font-subset.c			\
 	cairo-font-subset-private.h		\
@@ -443,9 +425,9 @@ font_subset_sources = \
 
 backend_pkgconfigs = $(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6) \
-	$(am__append_7) $(am__append_9) $(am__append_12) \
+	$(am__append_7) $(am__append_8) $(am__append_10) \
 	$(am__append_13) $(am__append_14) $(am__append_15) \
-	$(am__append_16)
+	$(am__append_16) $(am__append_17)
 @CAIRO_HAS_PS_SURFACE_TRUE@libcairo_ps_headers = cairo-ps.h
 @CAIRO_HAS_PS_SURFACE_TRUE@libcairo_ps_sources = cairo-ps-surface.c cairo-ps-test.h
 @CAIRO_HAS_PDF_SURFACE_TRUE@libcairo_font_subset_sources = $(font_subset_sources)
@@ -462,15 +444,16 @@ backend_pkgconfigs = $(am__append_1) $(am__append_2) $(am__append_3) \
 
 @CAIRO_HAS_XLIB_SURFACE_TRUE@libcairo_xlib_headers = cairo-xlib.h cairo-xlib-xrender.h
 @CAIRO_HAS_XLIB_SURFACE_TRUE@libcairo_xlib_sources = cairo-xlib-surface.c cairo-xlib-screen.c cairo-xlib-private.h cairo-xlib-test.h
+@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@libcairo_xlib_xrender_headers = cairo-xlib-xrender.h
 @CAIRO_HAS_QUARTZ_SURFACE_TRUE@libcairo_quartz_headers = cairo-quartz.h
 @CAIRO_HAS_QUARTZ_SURFACE_TRUE@libcairo_quartz_sources = cairo-quartz-surface.c cairo-quartz-private.h
 @CAIRO_HAS_XCB_SURFACE_TRUE@libcairo_xcb_headers = cairo-xcb.h cairo-xcb-xrender.h
 @CAIRO_HAS_XCB_SURFACE_TRUE@libcairo_xcb_sources = cairo-xcb-surface.c
-libcairo_win32_sources = $(am__append_8) $(am__append_10)
+libcairo_win32_sources = $(am__append_9) $(am__append_11)
 @CAIRO_HAS_WIN32_SURFACE_TRUE@libcairo_win32_headers = cairo-win32.h
 @CAIRO_HAS_WIN32_SURFACE_TRUE@export_symbols = -export-symbols cairo.def
 @CAIRO_HAS_WIN32_SURFACE_TRUE@cairo_def_dependency = cairo.def
-libcairo_beos_sources = $(am__append_11)
+libcairo_beos_sources = $(am__append_12)
 @CAIRO_HAS_BEOS_SURFACE_TRUE@libcairo_beos_headers = cairo-beos.h
 @CAIRO_HAS_BEOS_SURFACE_TRUE@noinst_LTLIBRARIES = libcairo_beos.la
 @CAIRO_HAS_BEOS_SURFACE_TRUE@libcairo_beos_la_SOURCES = $(libcairo_beos_sources)
@@ -487,7 +470,9 @@ libcairo_beos_sources = $(am__append_11)
 
 # Headers that declare the functions in the cairo DLL API on Windows
 cairo_win32_api_headers = $(srcdir)/cairo.h $(srcdir)/cairo-win32.h \
-	$(am__append_17) $(am__append_18)
+	$(am__append_18) $(am__append_19)
+XRENDER_LIBS = @XRENDER_LIBS@
+BUILT_SOURCES = cairo-features.h
 cairoincludedir = $(includedir)/cairo
 cairoinclude_HEADERS = \
 	cairo.h				\
@@ -503,6 +488,7 @@ cairoinclude_HEADERS = \
 	$(libcairo_beos_headers)	\
 	$(libcairo_xcb_headers)		\
 	$(libcairo_xlib_headers)	\
+	$(libcairo_xlib_xrender_headers)	\
 	$(libcairo_directfb_headers)
 
 lib_LTLIBRARIES = libcairo.la
@@ -544,6 +530,7 @@ libcairo_la_SOURCES = \
 	cairo-rectangle.c			\
 	cairo-region.c				\
 	cairo-scaled-font.c			\
+	cairo-scaled-font-test.h		\
 	cairo-slope.c				\
 	cairo-spline.c				\
 	cairo-stroke-style.c			\
@@ -587,8 +574,9 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = cairo.pc $(backend_pkgconfigs)
 DISTCLEANFILES = $(backend_pkgconfigs)
 EXTRA_DIST = cairo-backend.pc.in
-CLEANFILES = cairo.def
-all: all-am
+CLEANFILES = cairo.def cairo-features.h
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
@@ -621,8 +609,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-cairo-features.h: $(top_builddir)/config.status $(srcdir)/cairo-features.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 cairo.pc: $(top_builddir)/config.status $(srcdir)/cairo.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@@ -904,13 +890,15 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(cairoincludedir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -936,6 +924,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
@@ -1005,6 +994,14 @@ uninstall-am: uninstall-cairoincludeHEADERS uninstall-info-am \
 	uninstall-info-am uninstall-libLTLIBRARIES \
 	uninstall-pkgconfigDATA
 
+$(backend_pkgconfigs): $(top_srcdir)/configure
+	$(top_builddir)/config.status --recheck
+
+$(top_builddir)/config.h: $(top_srcdir)/config.h.in
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h
+
+cairo-features.h:
+	cd $(top_builddir) && ./config.status src/cairo-features.h
 
 cairo.def: $(cairo_win32_api_headers)
 	(echo EXPORTS; \