Update to pixman 0.30.0. Tested by several people during t2k13. Thanks.

1 files changed, 87 insertions, 28 deletions

diff --git a/lib/pixman/test/Makefile.in b/lib/pixman/test/Makefile.in
index 21477cc68..48974546f 100644
--- a/lib/pixman/test/Makefile.in
+++ b/lib/pixman/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -66,7 +66,7 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libutils_la_LIBADD =
-am__objects_1 = utils.lo
+am__objects_1 = utils.lo utils-prng.lo
 am__objects_2 =
 am_libutils_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libutils_la_OBJECTS = $(am_libutils_la_OBJECTS)
@@ -74,18 +74,20 @@ AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-am__EXEEXT_1 = a1-trap-test$(EXEEXT) pdf-op-test$(EXEEXT) \
-	region-test$(EXEEXT) region-translate-test$(EXEEXT) \
-	combiner-test$(EXEEXT) fetch-test$(EXEEXT) \
-	rotate-test$(EXEEXT) oob-test$(EXEEXT) infinite-loop$(EXEEXT) \
-	trap-crasher$(EXEEXT) alpha-loop$(EXEEXT) \
-	scaling-crash-test$(EXEEXT) scaling-helpers-test$(EXEEXT) \
-	gradient-crash-test$(EXEEXT) region-contains-test$(EXEEXT) \
-	alphamap$(EXEEXT) stress-test$(EXEEXT) \
+am__EXEEXT_1 = prng-test$(EXEEXT) a1-trap-test$(EXEEXT) \
+	pdf-op-test$(EXEEXT) region-test$(EXEEXT) \
+	region-translate-test$(EXEEXT) combiner-test$(EXEEXT) \
+	pixel-test$(EXEEXT) fetch-test$(EXEEXT) rotate-test$(EXEEXT) \
+	oob-test$(EXEEXT) infinite-loop$(EXEEXT) trap-crasher$(EXEEXT) \
+	alpha-loop$(EXEEXT) scaling-crash-test$(EXEEXT) \
+	scaling-helpers-test$(EXEEXT) gradient-crash-test$(EXEEXT) \
+	region-contains-test$(EXEEXT) alphamap$(EXEEXT) \
+	matrix-test$(EXEEXT) stress-test$(EXEEXT) \
 	composite-traps-test$(EXEEXT) blitters-test$(EXEEXT) \
 	glyph-test$(EXEEXT) scaling-test$(EXEEXT) affine-test$(EXEEXT) \
 	composite$(EXEEXT)
-am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT)
+am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \
+	check-formats$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 a1_trap_test_SOURCES = a1-trap-test.c
 a1_trap_test_OBJECTS = a1-trap-test.$(OBJEXT)
@@ -113,6 +115,11 @@ blitters_test_OBJECTS = blitters-test.$(OBJEXT)
 blitters_test_LDADD = $(LDADD)
 blitters_test_DEPENDENCIES = libutils.la \
 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1)
+check_formats_SOURCES = check-formats.c
+check_formats_OBJECTS = check-formats.$(OBJEXT)
+check_formats_LDADD = $(LDADD)
+check_formats_DEPENDENCIES = libutils.la \
+	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1)
 combiner_test_SOURCES = combiner-test.c
 combiner_test_OBJECTS = combiner-test.$(OBJEXT)
 combiner_test_LDADD = $(LDADD)
@@ -153,6 +160,11 @@ lowlevel_blt_bench_OBJECTS = lowlevel-blt-bench.$(OBJEXT)
 lowlevel_blt_bench_LDADD = $(LDADD)
 lowlevel_blt_bench_DEPENDENCIES = libutils.la \
 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1)
+matrix_test_SOURCES = matrix-test.c
+matrix_test_OBJECTS = matrix-test.$(OBJEXT)
+matrix_test_LDADD = $(LDADD)
+matrix_test_DEPENDENCIES = libutils.la \
+	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1)
 oob_test_SOURCES = oob-test.c
 oob_test_OBJECTS = oob-test.$(OBJEXT)
 oob_test_LDADD = $(LDADD)
@@ -163,6 +175,21 @@ pdf_op_test_OBJECTS = pdf-op-test.$(OBJEXT)
 pdf_op_test_LDADD = $(LDADD)
 pdf_op_test_DEPENDENCIES = libutils.la \
 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1)
+pixel_test_SOURCES = pixel-test.c
+pixel_test_OBJECTS = pixel-test.$(OBJEXT)
+pixel_test_LDADD = $(LDADD)
+pixel_test_DEPENDENCIES = libutils.la \
+	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1)
+prng_test_SOURCES = prng-test.c
+prng_test_OBJECTS = prng-test.$(OBJEXT)
+prng_test_LDADD = $(LDADD)
+prng_test_DEPENDENCIES = libutils.la \
+	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1)
+radial_perf_test_SOURCES = radial-perf-test.c
+radial_perf_test_OBJECTS = radial-perf-test.$(OBJEXT)
+radial_perf_test_LDADD = $(LDADD)
+radial_perf_test_DEPENDENCIES = libutils.la \
+	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1)
 region_contains_test_SOURCES = region-contains-test.c
 region_contains_test_OBJECTS = region-contains-test.$(OBJEXT)
 region_contains_test_LDADD = $(LDADD)
@@ -243,21 +270,23 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-test.c \
-	alpha-loop.c alphamap.c blitters-test.c combiner-test.c \
-	composite.c composite-traps-test.c fetch-test.c glyph-test.c \
-	gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
-	oob-test.c pdf-op-test.c region-contains-test.c region-test.c \
-	region-translate-test.c rotate-test.c scaling-crash-test.c \
-	scaling-helpers-test.c scaling-test.c stress-test.c \
-	trap-crasher.c
+	alpha-loop.c alphamap.c blitters-test.c check-formats.c \
+	combiner-test.c composite.c composite-traps-test.c \
+	fetch-test.c glyph-test.c gradient-crash-test.c \
+	infinite-loop.c lowlevel-blt-bench.c matrix-test.c oob-test.c \
+	pdf-op-test.c pixel-test.c prng-test.c radial-perf-test.c \
+	region-contains-test.c region-test.c region-translate-test.c \
+	rotate-test.c scaling-crash-test.c scaling-helpers-test.c \
+	scaling-test.c stress-test.c trap-crasher.c
 DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-test.c \
-	alpha-loop.c alphamap.c blitters-test.c combiner-test.c \
-	composite.c composite-traps-test.c fetch-test.c glyph-test.c \
-	gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
-	oob-test.c pdf-op-test.c region-contains-test.c region-test.c \
-	region-translate-test.c rotate-test.c scaling-crash-test.c \
-	scaling-helpers-test.c scaling-test.c stress-test.c \
-	trap-crasher.c
+	alpha-loop.c alphamap.c blitters-test.c check-formats.c \
+	combiner-test.c composite.c composite-traps-test.c \
+	fetch-test.c glyph-test.c gradient-crash-test.c \
+	infinite-loop.c lowlevel-blt-bench.c matrix-test.c oob-test.c \
+	pdf-op-test.c pixel-test.c prng-test.c radial-perf-test.c \
+	region-contains-test.c region-test.c region-translate-test.c \
+	rotate-test.c scaling-crash-test.c scaling-helpers-test.c \
+	scaling-test.c stress-test.c trap-crasher.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -344,6 +373,8 @@ PIXMAN_VERSION_MAJOR = @PIXMAN_VERSION_MAJOR@
 PIXMAN_VERSION_MICRO = @PIXMAN_VERSION_MICRO@
 PIXMAN_VERSION_MINOR = @PIXMAN_VERSION_MINOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_CFLAGS = @PNG_CFLAGS@
 PNG_LIBS = @PNG_LIBS@
 PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
@@ -415,11 +446,13 @@ top_srcdir = @top_srcdir@
 
 # Tests (sorted by expected completion time)
 TESTPROGRAMS = \
+	prng-test		\
 	a1-trap-test		\
 	pdf-op-test		\
 	region-test		\
 	region-translate-test	\
 	combiner-test		\
+	pixel-test		\
 	fetch-test		\
 	rotate-test		\
 	oob-test		\
@@ -431,6 +464,7 @@ TESTPROGRAMS = \
 	gradient-crash-test	\
 	region-contains-test	\
 	alphamap		\
+	matrix-test		\
 	stress-test		\
 	composite-traps-test	\
 	blitters-test		\
@@ -441,25 +475,29 @@ TESTPROGRAMS = \
 	$(NULL)
 
 
-# Benchmarks
-BENCHMARKS = \
+# Other programs
+OTHERPROGRAMS = \
 	lowlevel-blt-bench	\
+	radial-perf-test	\
+        check-formats           \
 	$(NULL)
 
 
 # Utility functions
 libutils_sources = \
 	utils.c			\
+	utils-prng.c		\
 	$(NULL)
 
 libutils_headers = \
 	utils.h			\
+	utils-prng.h		\
 	$(NULL)
 
 AM_CFLAGS = $(OPENMP_CFLAGS)
 AM_LDFLAGS = $(OPENMP_CFLAGS) $(TESTPROGS_EXTRA_LDFLAGS)
 LDADD = libutils.la $(top_builddir)/pixman/libpixman-1.la -lm  $(PNG_LIBS)
-INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(PNG_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(PNG_CFLAGS)
 libutils_la_SOURCES = $(libutils_sources) $(libutils_headers)
 noinst_LTLIBRARIES = libutils.la
 all: all-am
@@ -534,6 +572,9 @@ alphamap$(EXEEXT): $(alphamap_OBJECTS) $(alphamap_DEPENDENCIES) $(EXTRA_alphamap
 blitters-test$(EXEEXT): $(blitters_test_OBJECTS) $(blitters_test_DEPENDENCIES) $(EXTRA_blitters_test_DEPENDENCIES) 
 	@rm -f blitters-test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(blitters_test_OBJECTS) $(blitters_test_LDADD) $(LIBS)
+check-formats$(EXEEXT): $(check_formats_OBJECTS) $(check_formats_DEPENDENCIES) $(EXTRA_check_formats_DEPENDENCIES) 
+	@rm -f check-formats$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(check_formats_OBJECTS) $(check_formats_LDADD) $(LIBS)
 combiner-test$(EXEEXT): $(combiner_test_OBJECTS) $(combiner_test_DEPENDENCIES) $(EXTRA_combiner_test_DEPENDENCIES) 
 	@rm -f combiner-test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(combiner_test_OBJECTS) $(combiner_test_LDADD) $(LIBS)
@@ -558,12 +599,24 @@ infinite-loop$(EXEEXT): $(infinite_loop_OBJECTS) $(infinite_loop_DEPENDENCIES) $
 lowlevel-blt-bench$(EXEEXT): $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_DEPENDENCIES) $(EXTRA_lowlevel_blt_bench_DEPENDENCIES) 
 	@rm -f lowlevel-blt-bench$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS)
+matrix-test$(EXEEXT): $(matrix_test_OBJECTS) $(matrix_test_DEPENDENCIES) $(EXTRA_matrix_test_DEPENDENCIES) 
+	@rm -f matrix-test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(matrix_test_OBJECTS) $(matrix_test_LDADD) $(LIBS)
 oob-test$(EXEEXT): $(oob_test_OBJECTS) $(oob_test_DEPENDENCIES) $(EXTRA_oob_test_DEPENDENCIES) 
 	@rm -f oob-test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(oob_test_OBJECTS) $(oob_test_LDADD) $(LIBS)
 pdf-op-test$(EXEEXT): $(pdf_op_test_OBJECTS) $(pdf_op_test_DEPENDENCIES) $(EXTRA_pdf_op_test_DEPENDENCIES) 
 	@rm -f pdf-op-test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(pdf_op_test_OBJECTS) $(pdf_op_test_LDADD) $(LIBS)
+pixel-test$(EXEEXT): $(pixel_test_OBJECTS) $(pixel_test_DEPENDENCIES) $(EXTRA_pixel_test_DEPENDENCIES) 
+	@rm -f pixel-test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(pixel_test_OBJECTS) $(pixel_test_LDADD) $(LIBS)
+prng-test$(EXEEXT): $(prng_test_OBJECTS) $(prng_test_DEPENDENCIES) $(EXTRA_prng_test_DEPENDENCIES) 
+	@rm -f prng-test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(prng_test_OBJECTS) $(prng_test_LDADD) $(LIBS)
+radial-perf-test$(EXEEXT): $(radial_perf_test_OBJECTS) $(radial_perf_test_DEPENDENCIES) $(EXTRA_radial_perf_test_DEPENDENCIES) 
+	@rm -f radial-perf-test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS)
 region-contains-test$(EXEEXT): $(region_contains_test_OBJECTS) $(region_contains_test_DEPENDENCIES) $(EXTRA_region_contains_test_DEPENDENCIES) 
 	@rm -f region-contains-test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(region_contains_test_OBJECTS) $(region_contains_test_LDADD) $(LIBS)
@@ -603,6 +656,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blitters-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combiner-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite.Po@am__quote@
@@ -611,8 +665,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oob-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf-op-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prng-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-perf-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-contains-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-translate-test.Po@am__quote@
@@ -622,6 +680,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils-prng.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
 
 .c.o: