Tue Apr 21 02:45:06 UTC 202020200421024506

d/python-2.7.17-x86_64-2.txz:  Removed.
d/python2-2.7.18-x86_64-1.txz:  Added.
  OK, I know a few people got excited seeing python-2 removed in the previous
  entry, but it's just being renamed to python2 for consistency with the
  python3 package. It's DOA though, and is the final release of the already EOL
  python 2 branch (a "commemorative" release as they say in the announcement).
l/M2Crypto-0.35.2-x86_64-3.txz:  Rebuilt.
  Added python3 modules. Thanks to sombragris and ponce.
l/harfbuzz-2.6.5-x86_64-1.txz:  Upgraded.
l/imagemagick-7.0.10_7-x86_64-1.txz:  Upgraded.
l/libuv-1.37.0-x86_64-1.txz:  Upgraded.
l/libyaml-0.2.4-x86_64-1.txz:  Upgraded.
l/oniguruma-6.9.5-x86_64-1.txz:  Upgraded.
x/pixman-0.40.0-x86_64-1.txz:  Upgraded.

1 files changed, 482 insertions, 165 deletions

diff --git a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
index 86d01e89..99017b16 100644
--- a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
+++ b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
@@ -1,6 +1,11 @@
---- ./test/Makefile.in.orig	2019-04-07 15:31:45.000000000 -0500
-+++ ./test/Makefile.in	2019-04-08 15:06:58.331894784 -0500
-@@ -106,19 +106,17 @@
+--- ./test/Makefile.in.orig	2020-04-19 16:53:21.000000000 -0500
++++ ./test/Makefile.in	2020-04-20 15:08:52.348545235 -0500
+@@ -102,24 +102,15 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ am__EXEEXT_1 = oob-test$(EXEEXT) infinite-loop$(EXEEXT) \
+-	trap-crasher$(EXEEXT) fence-image-self-test$(EXEEXT) \
++	trap-crasher$(EXEEXT) \
  	region-translate-test$(EXEEXT) fetch-test$(EXEEXT) \
  	a1-trap-test$(EXEEXT) prng-test$(EXEEXT) \
  	radial-invalid$(EXEEXT) pdf-op-test$(EXEEXT) \
@@ -8,30 +13,34 @@
 -	scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \
 -	scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \
 -	rotate-test$(EXEEXT) alphamap$(EXEEXT) \
-+	combiner-test$(EXEEXT) \
-+	scaling-crash-test$(EXEEXT) \
-+	thread-test$(EXEEXT) \
- 	gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \
+-	gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \
 -	matrix-test$(EXEEXT) filter-reduction-test$(EXEEXT) \
 -	composite-traps-test$(EXEEXT) region-contains-test$(EXEEXT) \
-+	filter-reduction-test$(EXEEXT) \
-+	composite-traps-test$(EXEEXT) \
- 	glyph-test$(EXEEXT) solid-test$(EXEEXT) stress-test$(EXEEXT) \
+-	glyph-test$(EXEEXT) solid-test$(EXEEXT) stress-test$(EXEEXT) \
 -	cover-test$(EXEEXT) blitters-test$(EXEEXT) \
 -	affine-test$(EXEEXT) scaling-test$(EXEEXT) composite$(EXEEXT) \
 -	tolerance-test$(EXEEXT)
-+	cover-test$(EXEEXT) \
-+	scaling-test$(EXEEXT)
- am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \
+-am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \
 -	check-formats$(EXEEXT) scaling-bench$(EXEEXT) \
-+	check-formats$(EXEEXT) \
- 	affine-bench$(EXEEXT)
+-	affine-bench$(EXEEXT)
++	combiner-test$(EXEEXT) \
++	scaling-crash-test$(EXEEXT) \
++	thread-test$(EXEEXT) \
++	pixel-test$(EXEEXT)
++am__EXEEXT_2 = 
  PROGRAMS = $(noinst_PROGRAMS)
  LTLIBRARIES = $(noinst_LTLIBRARIES)
-@@ -144,30 +142,6 @@
- affine_bench_DEPENDENCIES = libutils.la \
+ libutils_la_LIBADD =
+@@ -138,114 +129,24 @@
+ a1_trap_test_DEPENDENCIES = libutils.la \
  	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
+-affine_bench_SOURCES = affine-bench.c
+-affine_bench_OBJECTS = affine-bench.$(OBJEXT)
+-affine_bench_LDADD = $(LDADD)
+-affine_bench_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
 -affine_test_SOURCES = affine-test.c
 -affine_test_OBJECTS = affine-test.$(OBJEXT)
 -affine_test_LDADD = $(LDADD)
@@ -56,10 +65,15 @@
 -blitters_test_DEPENDENCIES = libutils.la \
 -	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
 -	$(am__DEPENDENCIES_1)
- check_formats_SOURCES = check-formats.c
- check_formats_OBJECTS = check-formats.$(OBJEXT)
- check_formats_LDADD = $(LDADD)
-@@ -180,12 +154,6 @@
+-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) \
+-	$(am__DEPENDENCIES_1)
+ combiner_test_SOURCES = combiner-test.c
+ combiner_test_OBJECTS = combiner-test.$(OBJEXT)
+ combiner_test_LDADD = $(LDADD)
  combiner_test_DEPENDENCIES = libutils.la \
  	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
@@ -69,13 +83,60 @@
 -composite_DEPENDENCIES = libutils.la \
 -	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
 -	$(am__DEPENDENCIES_1)
- composite_traps_test_SOURCES = composite-traps-test.c
- composite_traps_test_OBJECTS = composite-traps-test.$(OBJEXT)
- composite_traps_test_LDADD = $(LDADD)
-@@ -240,12 +208,6 @@
- lowlevel_blt_bench_DEPENDENCIES = libutils.la \
+-composite_traps_test_SOURCES = composite-traps-test.c
+-composite_traps_test_OBJECTS = composite-traps-test.$(OBJEXT)
+-composite_traps_test_LDADD = $(LDADD)
+-composite_traps_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-cover_test_SOURCES = cover-test.c
+-cover_test_OBJECTS = cover-test.$(OBJEXT)
+-cover_test_LDADD = $(LDADD)
+-cover_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-fence_image_self_test_SOURCES = fence-image-self-test.c
+-fence_image_self_test_OBJECTS = fence-image-self-test.$(OBJEXT)
+-fence_image_self_test_LDADD = $(LDADD)
+-fence_image_self_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ fetch_test_SOURCES = fetch-test.c
+ fetch_test_OBJECTS = fetch-test.$(OBJEXT)
+ fetch_test_LDADD = $(LDADD)
+ fetch_test_DEPENDENCIES = libutils.la \
+ 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-filter_reduction_test_SOURCES = filter-reduction-test.c
+-filter_reduction_test_OBJECTS = filter-reduction-test.$(OBJEXT)
+-filter_reduction_test_LDADD = $(LDADD)
+-filter_reduction_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-glyph_test_SOURCES = glyph-test.c
+-glyph_test_OBJECTS = glyph-test.$(OBJEXT)
+-glyph_test_LDADD = $(LDADD)
+-glyph_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-gradient_crash_test_SOURCES = gradient-crash-test.c
+-gradient_crash_test_OBJECTS = gradient-crash-test.$(OBJEXT)
+-gradient_crash_test_LDADD = $(LDADD)
+-gradient_crash_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ infinite_loop_SOURCES = infinite-loop.c
+ infinite_loop_OBJECTS = infinite-loop.$(OBJEXT)
+ infinite_loop_LDADD = $(LDADD)
+ infinite_loop_DEPENDENCIES = libutils.la \
  	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
+-lowlevel_blt_bench_SOURCES = lowlevel-blt-bench.c
+-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) \
+-	$(am__DEPENDENCIES_1)
 -matrix_test_SOURCES = matrix-test.c
 -matrix_test_OBJECTS = matrix-test.$(OBJEXT)
 -matrix_test_LDADD = $(LDADD)
@@ -85,10 +146,16 @@
  oob_test_SOURCES = oob-test.c
  oob_test_OBJECTS = oob-test.$(OBJEXT)
  oob_test_LDADD = $(LDADD)
-@@ -282,48 +244,18 @@
- radial_perf_test_DEPENDENCIES = libutils.la \
+@@ -276,84 +177,24 @@
+ radial_invalid_DEPENDENCIES = libutils.la \
  	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
  	$(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) \
+-	$(am__DEPENDENCIES_1)
 -region_contains_test_SOURCES = region-contains-test.c
 -region_contains_test_OBJECTS = region-contains-test.$(OBJEXT)
 -region_contains_test_LDADD = $(LDADD)
@@ -131,10 +198,27 @@
 -scaling_helpers_test_DEPENDENCIES = libutils.la \
 -	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
 -	$(am__DEPENDENCIES_1)
- scaling_test_SOURCES = scaling-test.c
- scaling_test_OBJECTS = scaling-test.$(OBJEXT)
- scaling_test_LDADD = $(LDADD)
-@@ -348,12 +280,6 @@
+-scaling_test_SOURCES = scaling-test.c
+-scaling_test_OBJECTS = scaling-test.$(OBJEXT)
+-scaling_test_LDADD = $(LDADD)
+-scaling_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-solid_test_SOURCES = solid-test.c
+-solid_test_OBJECTS = solid-test.$(OBJEXT)
+-solid_test_LDADD = $(LDADD)
+-solid_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-stress_test_SOURCES = stress-test.c
+-stress_test_OBJECTS = stress-test.$(OBJEXT)
+-stress_test_LDADD = $(LDADD)
+-stress_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ thread_test_SOURCES = thread-test.c
+ thread_test_OBJECTS = thread-test.$(OBJEXT)
+ thread_test_LDADD = $(LDADD)
  thread_test_DEPENDENCIES = libutils.la \
  	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
@@ -147,82 +231,96 @@
  trap_crasher_SOURCES = trap-crasher.c
  trap_crasher_OBJECTS = trap-crasher.$(OBJEXT)
  trap_crasher_LDADD = $(LDADD)
-@@ -376,27 +302,23 @@
+@@ -376,27 +217,16 @@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__maybe_remake_depfiles = depfiles
  am__depfiles_remade = ./$(DEPDIR)/a1-trap-test.Po \
 -	./$(DEPDIR)/affine-bench.Po ./$(DEPDIR)/affine-test.Po \
 -	./$(DEPDIR)/alpha-loop.Po ./$(DEPDIR)/alphamap.Po \
 -	./$(DEPDIR)/blitters-test.Po ./$(DEPDIR)/check-formats.Po \
-+	./$(DEPDIR)/affine-bench.Po \
-+	./$(DEPDIR)/check-formats.Po \
  	./$(DEPDIR)/combiner-test.Po \
 -	./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.Po \
-+	./$(DEPDIR)/composite-traps-test.Po \
- 	./$(DEPDIR)/cover-test.Po ./$(DEPDIR)/fence-image-self-test.Po \
- 	./$(DEPDIR)/fetch-test.Po ./$(DEPDIR)/filter-reduction-test.Po \
- 	./$(DEPDIR)/glyph-test.Po ./$(DEPDIR)/gradient-crash-test.Po \
- 	./$(DEPDIR)/infinite-loop.Po ./$(DEPDIR)/lowlevel-blt-bench.Po \
+-	./$(DEPDIR)/cover-test.Po ./$(DEPDIR)/fence-image-self-test.Po \
+-	./$(DEPDIR)/fetch-test.Po ./$(DEPDIR)/filter-reduction-test.Po \
+-	./$(DEPDIR)/glyph-test.Po ./$(DEPDIR)/gradient-crash-test.Po \
+-	./$(DEPDIR)/infinite-loop.Po ./$(DEPDIR)/lowlevel-blt-bench.Po \
 -	./$(DEPDIR)/matrix-test.Po ./$(DEPDIR)/oob-test.Po \
++	./$(DEPDIR)/fetch-test.Po \
++	./$(DEPDIR)/infinite-loop.Po \
 +	./$(DEPDIR)/oob-test.Po \
  	./$(DEPDIR)/pdf-op-test.Po ./$(DEPDIR)/pixel-test.Po \
  	./$(DEPDIR)/prng-test.Po ./$(DEPDIR)/radial-invalid.Po \
- 	./$(DEPDIR)/radial-perf-test.Po \
+-	./$(DEPDIR)/radial-perf-test.Po \
 -	./$(DEPDIR)/region-contains-test.Po ./$(DEPDIR)/region-test.Po \
  	./$(DEPDIR)/region-translate-test.Po \
 -	./$(DEPDIR)/rotate-test.Po ./$(DEPDIR)/scaling-bench.Po \
  	./$(DEPDIR)/scaling-crash-test.Po \
 -	./$(DEPDIR)/scaling-helpers-test.Po \
- 	./$(DEPDIR)/scaling-test.Po ./$(DEPDIR)/solid-test.Po \
- 	./$(DEPDIR)/stress-test.Po ./$(DEPDIR)/thread-test.Po \
+-	./$(DEPDIR)/scaling-test.Po ./$(DEPDIR)/solid-test.Po \
+-	./$(DEPDIR)/stress-test.Po ./$(DEPDIR)/thread-test.Po \
 -	./$(DEPDIR)/tolerance-test.Po ./$(DEPDIR)/trap-crasher.Po \
++	./$(DEPDIR)/thread-test.Po \
 +	./$(DEPDIR)/trap-crasher.Po \
  	./$(DEPDIR)/utils-prng.Plo ./$(DEPDIR)/utils.Plo
  am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -418,29 +340,27 @@
+@@ -417,30 +247,24 @@
+ 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-bench.c \
+-SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
 -	affine-test.c alpha-loop.c alphamap.c blitters-test.c \
 -	check-formats.c combiner-test.c composite.c \
-+	check-formats.c combiner-test.c \
- 	composite-traps-test.c cover-test.c fence-image-self-test.c \
- 	fetch-test.c filter-reduction-test.c glyph-test.c \
- 	gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
+-	composite-traps-test.c cover-test.c fence-image-self-test.c \
+-	fetch-test.c filter-reduction-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 \
-+	oob-test.c pdf-op-test.c pixel-test.c \
- 	prng-test.c radial-invalid.c radial-perf-test.c \
+-	prng-test.c radial-invalid.c radial-perf-test.c \
 -	region-contains-test.c region-test.c region-translate-test.c \
 -	rotate-test.c scaling-bench.c scaling-crash-test.c \
 -	scaling-helpers-test.c scaling-test.c solid-test.c \
 -	stress-test.c thread-test.c tolerance-test.c trap-crasher.c
-+	region-translate-test.c \
-+	scaling-crash-test.c \
-+	scaling-test.c solid-test.c \
-+	stress-test.c thread-test.c trap-crasher.c
- DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
+-DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
 -	affine-test.c alpha-loop.c alphamap.c blitters-test.c \
 -	check-formats.c combiner-test.c composite.c \
-+	check-formats.c combiner-test.c \
- 	composite-traps-test.c cover-test.c fence-image-self-test.c \
- 	fetch-test.c filter-reduction-test.c glyph-test.c \
- 	gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
+-	composite-traps-test.c cover-test.c fence-image-self-test.c \
+-	fetch-test.c filter-reduction-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 \
-+	oob-test.c pdf-op-test.c pixel-test.c \
- 	prng-test.c radial-invalid.c radial-perf-test.c \
+-	prng-test.c radial-invalid.c radial-perf-test.c \
 -	region-contains-test.c region-test.c region-translate-test.c \
 -	rotate-test.c scaling-bench.c scaling-crash-test.c \
 -	scaling-helpers-test.c scaling-test.c solid-test.c \
 -	stress-test.c thread-test.c tolerance-test.c trap-crasher.c
++SOURCES = $(libutils_la_SOURCES) a1-trap-test.c \
++	combiner-test.c \
++	fetch-test.c \
++	infinite-loop.c \
++	oob-test.c pdf-op-test.c pixel-test.c \
++	prng-test.c radial-invalid.c \
 +	region-translate-test.c \
 +	scaling-crash-test.c \
-+	scaling-test.c solid-test.c \
-+	stress-test.c thread-test.c trap-crasher.c
++	thread-test.c trap-crasher.c
++DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c \
++	combiner-test.c \
++	fetch-test.c \
++	infinite-loop.c \
++	oob-test.c pdf-op-test.c pixel-test.c \
++	prng-test.c radial-invalid.c \
++	region-translate-test.c \
++	scaling-crash-test.c \
++	thread-test.c trap-crasher.c
  am__can_run_installinfo = \
    case $$AM_UPDATE_INFO_DIR in \
      n|no|NO) false;; \
-@@ -833,29 +753,18 @@
+@@ -826,46 +650,21 @@
+ 	oob-test		      \
+ 	infinite-loop		      \
+ 	trap-crasher		      \
+-	fence-image-self-test	      \
+ 	region-translate-test	      \
+ 	fetch-test		      \
+ 	a1-trap-test		      \
  	prng-test		      \
  	radial-invalid		      \
  	pdf-op-test		      \
@@ -234,36 +332,42 @@
  	thread-test		      \
 -	rotate-test		      \
 -	alphamap		      \
- 	gradient-crash-test	      \
+-	gradient-crash-test	      \
  	pixel-test		      \
 -	matrix-test		      \
- 	filter-reduction-test         \
- 	composite-traps-test	      \
+-	filter-reduction-test         \
+-	composite-traps-test	      \
 -	region-contains-test	      \
- 	glyph-test		      \
- 	solid-test		      \
- 	stress-test		      \
- 	cover-test		      \
+-	glyph-test		      \
+-	solid-test		      \
+-	stress-test		      \
+-	cover-test		      \
 -	blitters-test		      \
 -	affine-test		      \
- 	scaling-test		      \
+-	scaling-test		      \
 -	composite		      \
 -	tolerance-test		      \
  	$(NULL)
  
  
-@@ -864,7 +773,6 @@
- 	lowlevel-blt-bench	\
- 	radial-perf-test	\
-         check-formats           \
+ # Other programs
+ OTHERPROGRAMS = \
+-	lowlevel-blt-bench	\
+-	radial-perf-test	\
+-        check-formats           \
 -	scaling-bench		\
- 	affine-bench            \
+-	affine-bench            \
  	$(NULL)
  
-@@ -956,22 +864,6 @@
- 	@rm -f affine-bench$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS)
  
+@@ -952,78 +751,18 @@
+ 	@rm -f a1-trap-test$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(a1_trap_test_OBJECTS) $(a1_trap_test_LDADD) $(LIBS)
+ 
+-affine-bench$(EXEEXT): $(affine_bench_OBJECTS) $(affine_bench_DEPENDENCIES) $(EXTRA_affine_bench_DEPENDENCIES) 
+-	@rm -f affine-bench$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS)
+-
 -affine-test$(EXEEXT): $(affine_test_OBJECTS) $(affine_test_DEPENDENCIES) $(EXTRA_affine_test_DEPENDENCIES) 
 -	@rm -f affine-test$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(affine_test_OBJECTS) $(affine_test_LDADD) $(LIBS)
@@ -280,10 +384,11 @@
 -	@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)
-@@ -980,10 +872,6 @@
+-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)
  
@@ -291,13 +396,42 @@
 -	@rm -f composite$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(composite_OBJECTS) $(composite_LDADD) $(LIBS)
 -
- composite-traps-test$(EXEEXT): $(composite_traps_test_OBJECTS) $(composite_traps_test_DEPENDENCIES) $(EXTRA_composite_traps_test_DEPENDENCIES) 
- 	@rm -f composite-traps-test$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(composite_traps_test_OBJECTS) $(composite_traps_test_LDADD) $(LIBS)
-@@ -1020,10 +908,6 @@
- 	@rm -f lowlevel-blt-bench$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS)
+-composite-traps-test$(EXEEXT): $(composite_traps_test_OBJECTS) $(composite_traps_test_DEPENDENCIES) $(EXTRA_composite_traps_test_DEPENDENCIES) 
+-	@rm -f composite-traps-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(composite_traps_test_OBJECTS) $(composite_traps_test_LDADD) $(LIBS)
+-
+-cover-test$(EXEEXT): $(cover_test_OBJECTS) $(cover_test_DEPENDENCIES) $(EXTRA_cover_test_DEPENDENCIES) 
+-	@rm -f cover-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(cover_test_OBJECTS) $(cover_test_LDADD) $(LIBS)
+-
+-fence-image-self-test$(EXEEXT): $(fence_image_self_test_OBJECTS) $(fence_image_self_test_DEPENDENCIES) $(EXTRA_fence_image_self_test_DEPENDENCIES) 
+-	@rm -f fence-image-self-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(fence_image_self_test_OBJECTS) $(fence_image_self_test_LDADD) $(LIBS)
+-
+ fetch-test$(EXEEXT): $(fetch_test_OBJECTS) $(fetch_test_DEPENDENCIES) $(EXTRA_fetch_test_DEPENDENCIES) 
+ 	@rm -f fetch-test$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(fetch_test_OBJECTS) $(fetch_test_LDADD) $(LIBS)
+ 
+-filter-reduction-test$(EXEEXT): $(filter_reduction_test_OBJECTS) $(filter_reduction_test_DEPENDENCIES) $(EXTRA_filter_reduction_test_DEPENDENCIES) 
+-	@rm -f filter-reduction-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(filter_reduction_test_OBJECTS) $(filter_reduction_test_LDADD) $(LIBS)
+-
+-glyph-test$(EXEEXT): $(glyph_test_OBJECTS) $(glyph_test_DEPENDENCIES) $(EXTRA_glyph_test_DEPENDENCIES) 
+-	@rm -f glyph-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(glyph_test_OBJECTS) $(glyph_test_LDADD) $(LIBS)
+-
+-gradient-crash-test$(EXEEXT): $(gradient_crash_test_OBJECTS) $(gradient_crash_test_DEPENDENCIES) $(EXTRA_gradient_crash_test_DEPENDENCIES) 
+-	@rm -f gradient-crash-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(gradient_crash_test_OBJECTS) $(gradient_crash_test_LDADD) $(LIBS)
+-
+ infinite-loop$(EXEEXT): $(infinite_loop_OBJECTS) $(infinite_loop_DEPENDENCIES) $(EXTRA_infinite_loop_DEPENDENCIES) 
+ 	@rm -f infinite-loop$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(infinite_loop_OBJECTS) $(infinite_loop_LDADD) $(LIBS)
  
+-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)
@@ -305,10 +439,14 @@
  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)
-@@ -1048,34 +932,14 @@
- 	@rm -f radial-perf-test$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS)
+@@ -1044,58 +783,18 @@
+ 	@rm -f radial-invalid$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(radial_invalid_OBJECTS) $(radial_invalid_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)
@@ -337,10 +475,19 @@
 -	@rm -f scaling-helpers-test$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_LDADD) $(LIBS)
 -
- scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) $(EXTRA_scaling_test_DEPENDENCIES) 
- 	@rm -f scaling-test$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS)
-@@ -1092,10 +956,6 @@
+-scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) $(EXTRA_scaling_test_DEPENDENCIES) 
+-	@rm -f scaling-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS)
+-
+-solid-test$(EXEEXT): $(solid_test_OBJECTS) $(solid_test_DEPENDENCIES) $(EXTRA_solid_test_DEPENDENCIES) 
+-	@rm -f solid-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(solid_test_OBJECTS) $(solid_test_LDADD) $(LIBS)
+-
+-stress-test$(EXEEXT): $(stress_test_OBJECTS) $(stress_test_DEPENDENCIES) $(EXTRA_stress_test_DEPENDENCIES) 
+-	@rm -f stress-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(stress_test_OBJECTS) $(stress_test_LDADD) $(LIBS)
+-
+ thread-test$(EXEEXT): $(thread_test_OBJECTS) $(thread_test_DEPENDENCIES) $(EXTRA_thread_test_DEPENDENCIES) 
  	@rm -f thread-test$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS)
  
@@ -351,32 +498,34 @@
  trap-crasher$(EXEEXT): $(trap_crasher_OBJECTS) $(trap_crasher_DEPENDENCIES) $(EXTRA_trap_crasher_DEPENDENCIES) 
  	@rm -f trap-crasher$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(trap_crasher_OBJECTS) $(trap_crasher_LDADD) $(LIBS)
-@@ -1108,14 +968,9 @@
+@@ -1107,42 +806,17 @@
+ 	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a1-trap-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-test.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blitters-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combiner-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fetch-test.Po@am__quote@ # am--include-marker
-@@ -1124,25 +979,18 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter-reduction-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glyph-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oob-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf-op-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prng-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-invalid.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-perf-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-perf-test.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-contains-test.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-translate-test.Po@am__quote@ # am--include-marker
@@ -384,15 +533,29 @@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-bench.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-crash-test.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-helpers-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-test.Po@am__quote@ # am--include-marker
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tolerance-test.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils-prng.Plo@am__quote@ # am--include-marker
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ # am--include-marker
-@@ -1443,13 +1291,6 @@
+@@ -1394,13 +1068,6 @@
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-fence-image-self-test.log: fence-image-self-test$(EXEEXT)
+-	@p='fence-image-self-test$(EXEEXT)'; \
+-	b='fence-image-self-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ region-translate-test.log: region-translate-test$(EXEEXT)
+ 	@p='region-translate-test$(EXEEXT)'; \
+ 	b='region-translate-test'; \
+@@ -1443,13 +1110,6 @@
  	--log-file $$b.log --trs-file $$b.trs \
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -406,7 +569,7 @@
  combiner-test.log: combiner-test$(EXEEXT)
  	@p='combiner-test$(EXEEXT)'; \
  	b='combiner-test'; \
-@@ -1464,20 +1305,6 @@
+@@ -1464,20 +1124,6 @@
  	--log-file $$b.log --trs-file $$b.trs \
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -427,7 +590,7 @@
  thread-test.log: thread-test$(EXEEXT)
  	@p='thread-test$(EXEEXT)'; \
  	b='thread-test'; \
-@@ -1485,20 +1312,6 @@
+@@ -1485,27 +1131,6 @@
  	--log-file $$b.log --trs-file $$b.trs \
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -445,10 +608,17 @@
 -	--log-file $$b.log --trs-file $$b.trs \
 -	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 -	"$$tst" $(AM_TESTS_FD_REDIRECT)
- gradient-crash-test.log: gradient-crash-test$(EXEEXT)
- 	@p='gradient-crash-test$(EXEEXT)'; \
- 	b='gradient-crash-test'; \
-@@ -1513,13 +1326,6 @@
+-gradient-crash-test.log: gradient-crash-test$(EXEEXT)
+-	@p='gradient-crash-test$(EXEEXT)'; \
+-	b='gradient-crash-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ pixel-test.log: pixel-test$(EXEEXT)
+ 	@p='pixel-test$(EXEEXT)'; \
+ 	b='pixel-test'; \
+@@ -1513,97 +1138,6 @@
  	--log-file $$b.log --trs-file $$b.trs \
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -459,13 +629,20 @@
 -	--log-file $$b.log --trs-file $$b.trs \
 -	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 -	"$$tst" $(AM_TESTS_FD_REDIRECT)
- filter-reduction-test.log: filter-reduction-test$(EXEEXT)
- 	@p='filter-reduction-test$(EXEEXT)'; \
- 	b='filter-reduction-test'; \
-@@ -1534,13 +1340,6 @@
- 	--log-file $$b.log --trs-file $$b.trs \
- 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-filter-reduction-test.log: filter-reduction-test$(EXEEXT)
+-	@p='filter-reduction-test$(EXEEXT)'; \
+-	b='filter-reduction-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-composite-traps-test.log: composite-traps-test$(EXEEXT)
+-	@p='composite-traps-test$(EXEEXT)'; \
+-	b='composite-traps-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 -region-contains-test.log: region-contains-test$(EXEEXT)
 -	@p='region-contains-test$(EXEEXT)'; \
 -	b='region-contains-test'; \
@@ -473,13 +650,34 @@
 -	--log-file $$b.log --trs-file $$b.trs \
 -	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 -	"$$tst" $(AM_TESTS_FD_REDIRECT)
- glyph-test.log: glyph-test$(EXEEXT)
- 	@p='glyph-test$(EXEEXT)'; \
- 	b='glyph-test'; \
-@@ -1569,20 +1368,6 @@
- 	--log-file $$b.log --trs-file $$b.trs \
- 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-glyph-test.log: glyph-test$(EXEEXT)
+-	@p='glyph-test$(EXEEXT)'; \
+-	b='glyph-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-solid-test.log: solid-test$(EXEEXT)
+-	@p='solid-test$(EXEEXT)'; \
+-	b='solid-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-stress-test.log: stress-test$(EXEEXT)
+-	@p='stress-test$(EXEEXT)'; \
+-	b='stress-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-cover-test.log: cover-test$(EXEEXT)
+-	@p='cover-test$(EXEEXT)'; \
+-	b='cover-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 -blitters-test.log: blitters-test$(EXEEXT)
 -	@p='blitters-test$(EXEEXT)'; \
 -	b='blitters-test'; \
@@ -494,13 +692,13 @@
 -	--log-file $$b.log --trs-file $$b.trs \
 -	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 -	"$$tst" $(AM_TESTS_FD_REDIRECT)
- scaling-test.log: scaling-test$(EXEEXT)
- 	@p='scaling-test$(EXEEXT)'; \
- 	b='scaling-test'; \
-@@ -1590,20 +1375,6 @@
- 	--log-file $$b.log --trs-file $$b.trs \
- 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-scaling-test.log: scaling-test$(EXEEXT)
+-	@p='scaling-test$(EXEEXT)'; \
+-	b='scaling-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 -composite.log: composite$(EXEEXT)
 -	@p='composite$(EXEEXT)'; \
 -	b='composite'; \
@@ -518,32 +716,34 @@
  .test.log:
  	@p='$<'; \
  	$(am__set_b); \
-@@ -1698,14 +1469,9 @@
+@@ -1697,42 +1231,17 @@
+ 
  distclean: distclean-am
  		-rm -f ./$(DEPDIR)/a1-trap-test.Po
- 	-rm -f ./$(DEPDIR)/affine-bench.Po
+-	-rm -f ./$(DEPDIR)/affine-bench.Po
 -	-rm -f ./$(DEPDIR)/affine-test.Po
 -	-rm -f ./$(DEPDIR)/alpha-loop.Po
 -	-rm -f ./$(DEPDIR)/alphamap.Po
 -	-rm -f ./$(DEPDIR)/blitters-test.Po
- 	-rm -f ./$(DEPDIR)/check-formats.Po
+-	-rm -f ./$(DEPDIR)/check-formats.Po
  	-rm -f ./$(DEPDIR)/combiner-test.Po
- 	-rm -f ./$(DEPDIR)/composite-traps-test.Po
+-	-rm -f ./$(DEPDIR)/composite-traps-test.Po
 -	-rm -f ./$(DEPDIR)/composite.Po
- 	-rm -f ./$(DEPDIR)/cover-test.Po
- 	-rm -f ./$(DEPDIR)/fence-image-self-test.Po
+-	-rm -f ./$(DEPDIR)/cover-test.Po
+-	-rm -f ./$(DEPDIR)/fence-image-self-test.Po
  	-rm -f ./$(DEPDIR)/fetch-test.Po
-@@ -1714,25 +1480,18 @@
- 	-rm -f ./$(DEPDIR)/gradient-crash-test.Po
+-	-rm -f ./$(DEPDIR)/filter-reduction-test.Po
+-	-rm -f ./$(DEPDIR)/glyph-test.Po
+-	-rm -f ./$(DEPDIR)/gradient-crash-test.Po
  	-rm -f ./$(DEPDIR)/infinite-loop.Po
- 	-rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
+-	-rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
 -	-rm -f ./$(DEPDIR)/matrix-test.Po
  	-rm -f ./$(DEPDIR)/oob-test.Po
  	-rm -f ./$(DEPDIR)/pdf-op-test.Po
  	-rm -f ./$(DEPDIR)/pixel-test.Po
  	-rm -f ./$(DEPDIR)/prng-test.Po
  	-rm -f ./$(DEPDIR)/radial-invalid.Po
- 	-rm -f ./$(DEPDIR)/radial-perf-test.Po
+-	-rm -f ./$(DEPDIR)/radial-perf-test.Po
 -	-rm -f ./$(DEPDIR)/region-contains-test.Po
 -	-rm -f ./$(DEPDIR)/region-test.Po
  	-rm -f ./$(DEPDIR)/region-translate-test.Po
@@ -551,40 +751,42 @@
 -	-rm -f ./$(DEPDIR)/scaling-bench.Po
  	-rm -f ./$(DEPDIR)/scaling-crash-test.Po
 -	-rm -f ./$(DEPDIR)/scaling-helpers-test.Po
- 	-rm -f ./$(DEPDIR)/scaling-test.Po
- 	-rm -f ./$(DEPDIR)/solid-test.Po
- 	-rm -f ./$(DEPDIR)/stress-test.Po
+-	-rm -f ./$(DEPDIR)/scaling-test.Po
+-	-rm -f ./$(DEPDIR)/solid-test.Po
+-	-rm -f ./$(DEPDIR)/stress-test.Po
  	-rm -f ./$(DEPDIR)/thread-test.Po
 -	-rm -f ./$(DEPDIR)/tolerance-test.Po
  	-rm -f ./$(DEPDIR)/trap-crasher.Po
  	-rm -f ./$(DEPDIR)/utils-prng.Plo
  	-rm -f ./$(DEPDIR)/utils.Plo
-@@ -1783,14 +1542,9 @@
+@@ -1782,42 +1291,17 @@
+ 
  maintainer-clean: maintainer-clean-am
  		-rm -f ./$(DEPDIR)/a1-trap-test.Po
- 	-rm -f ./$(DEPDIR)/affine-bench.Po
+-	-rm -f ./$(DEPDIR)/affine-bench.Po
 -	-rm -f ./$(DEPDIR)/affine-test.Po
 -	-rm -f ./$(DEPDIR)/alpha-loop.Po
 -	-rm -f ./$(DEPDIR)/alphamap.Po
 -	-rm -f ./$(DEPDIR)/blitters-test.Po
- 	-rm -f ./$(DEPDIR)/check-formats.Po
+-	-rm -f ./$(DEPDIR)/check-formats.Po
  	-rm -f ./$(DEPDIR)/combiner-test.Po
- 	-rm -f ./$(DEPDIR)/composite-traps-test.Po
+-	-rm -f ./$(DEPDIR)/composite-traps-test.Po
 -	-rm -f ./$(DEPDIR)/composite.Po
- 	-rm -f ./$(DEPDIR)/cover-test.Po
- 	-rm -f ./$(DEPDIR)/fence-image-self-test.Po
+-	-rm -f ./$(DEPDIR)/cover-test.Po
+-	-rm -f ./$(DEPDIR)/fence-image-self-test.Po
  	-rm -f ./$(DEPDIR)/fetch-test.Po
-@@ -1799,25 +1553,18 @@
- 	-rm -f ./$(DEPDIR)/gradient-crash-test.Po
+-	-rm -f ./$(DEPDIR)/filter-reduction-test.Po
+-	-rm -f ./$(DEPDIR)/glyph-test.Po
+-	-rm -f ./$(DEPDIR)/gradient-crash-test.Po
  	-rm -f ./$(DEPDIR)/infinite-loop.Po
- 	-rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
+-	-rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
 -	-rm -f ./$(DEPDIR)/matrix-test.Po
  	-rm -f ./$(DEPDIR)/oob-test.Po
  	-rm -f ./$(DEPDIR)/pdf-op-test.Po
  	-rm -f ./$(DEPDIR)/pixel-test.Po
  	-rm -f ./$(DEPDIR)/prng-test.Po
  	-rm -f ./$(DEPDIR)/radial-invalid.Po
- 	-rm -f ./$(DEPDIR)/radial-perf-test.Po
+-	-rm -f ./$(DEPDIR)/radial-perf-test.Po
 -	-rm -f ./$(DEPDIR)/region-contains-test.Po
 -	-rm -f ./$(DEPDIR)/region-test.Po
  	-rm -f ./$(DEPDIR)/region-translate-test.Po
@@ -592,11 +794,126 @@
 -	-rm -f ./$(DEPDIR)/scaling-bench.Po
  	-rm -f ./$(DEPDIR)/scaling-crash-test.Po
 -	-rm -f ./$(DEPDIR)/scaling-helpers-test.Po
- 	-rm -f ./$(DEPDIR)/scaling-test.Po
- 	-rm -f ./$(DEPDIR)/solid-test.Po
- 	-rm -f ./$(DEPDIR)/stress-test.Po
+-	-rm -f ./$(DEPDIR)/scaling-test.Po
+-	-rm -f ./$(DEPDIR)/solid-test.Po
+-	-rm -f ./$(DEPDIR)/stress-test.Po
  	-rm -f ./$(DEPDIR)/thread-test.Po
 -	-rm -f ./$(DEPDIR)/tolerance-test.Po
  	-rm -f ./$(DEPDIR)/trap-crasher.Po
  	-rm -f ./$(DEPDIR)/utils-prng.Plo
  	-rm -f ./$(DEPDIR)/utils.Plo
+--- ./demos/Makefile.in.orig	2020-04-19 16:53:21.000000000 -0500
++++ ./demos/Makefile.in	2020-04-20 14:54:20.827508022 -0500
+@@ -107,7 +107,7 @@
+ @HAVE_GTK_TRUE@	trap-test$(EXEEXT) tri-test$(EXEEXT) \
+ @HAVE_GTK_TRUE@	quad2quad$(EXEEXT) checkerboard$(EXEEXT) \
+ @HAVE_GTK_TRUE@	srgb-trap-test$(EXEEXT) srgb-test$(EXEEXT) \
+-@HAVE_GTK_TRUE@	scale$(EXEEXT) dither$(EXEEXT)
++@HAVE_GTK_TRUE@	scale$(EXEEXT)
+ PROGRAMS = $(noinst_PROGRAMS)
+ am__alpha_test_SOURCES_DIST = alpha-test.c gtk-utils.c gtk-utils.h \
+ 	../test/utils.c ../test/utils.h ../test/utils-prng.c \
+@@ -185,15 +185,6 @@
+ @HAVE_GTK_TRUE@convolution_test_DEPENDENCIES =  \
+ @HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
+ @HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am__dither_SOURCES_DIST = dither.c gtk-utils.c gtk-utils.h \
+-	../test/utils.c ../test/utils.h ../test/utils-prng.c \
+-	../test/utils-prng.h
+-@HAVE_GTK_TRUE@am_dither_OBJECTS = dither.$(OBJEXT) $(am__objects_1)
+-dither_OBJECTS = $(am_dither_OBJECTS)
+-dither_LDADD = $(LDADD)
+-@HAVE_GTK_TRUE@dither_DEPENDENCIES =  \
+-@HAVE_GTK_TRUE@	$(top_builddir)/pixman/libpixman-1.la \
+-@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__gradient_test_SOURCES_DIST = gradient-test.c gtk-utils.c \
+ 	gtk-utils.h ../test/utils.c ../test/utils.h \
+ 	../test/utils-prng.c ../test/utils-prng.h
+@@ -308,7 +299,7 @@
+ 	./$(DEPDIR)/checkerboard.Po ./$(DEPDIR)/clip-in.Po \
+ 	./$(DEPDIR)/clip-test.Po ./$(DEPDIR)/composite-test.Po \
+ 	./$(DEPDIR)/conical-test.Po ./$(DEPDIR)/convolution-test.Po \
+-	./$(DEPDIR)/dither.Po ./$(DEPDIR)/gradient-test.Po \
++	./$(DEPDIR)/gradient-test.Po \
+ 	./$(DEPDIR)/gtk-utils.Po ./$(DEPDIR)/linear-gradient.Po \
+ 	./$(DEPDIR)/quad2quad.Po ./$(DEPDIR)/radial-test.Po \
+ 	./$(DEPDIR)/scale.Po ./$(DEPDIR)/screen-test.Po \
+@@ -337,7 +328,7 @@
+ SOURCES = $(alpha_test_SOURCES) $(checkerboard_SOURCES) \
+ 	$(clip_in_SOURCES) $(clip_test_SOURCES) \
+ 	$(composite_test_SOURCES) $(conical_test_SOURCES) \
+-	$(convolution_test_SOURCES) $(dither_SOURCES) \
++	$(convolution_test_SOURCES) \
+ 	$(gradient_test_SOURCES) $(linear_gradient_SOURCES) \
+ 	quad2quad.c $(radial_test_SOURCES) $(scale_SOURCES) \
+ 	$(screen_test_SOURCES) $(srgb_test_SOURCES) \
+@@ -349,7 +340,7 @@
+ 	$(am__composite_test_SOURCES_DIST) \
+ 	$(am__conical_test_SOURCES_DIST) \
+ 	$(am__convolution_test_SOURCES_DIST) \
+-	$(am__dither_SOURCES_DIST) $(am__gradient_test_SOURCES_DIST) \
++	$(am__gradient_test_SOURCES_DIST) \
+ 	$(am__linear_gradient_SOURCES_DIST) quad2quad.c \
+ 	$(am__radial_test_SOURCES_DIST) $(am__scale_SOURCES_DIST) \
+ 	$(am__screen_test_SOURCES_DIST) $(am__srgb_test_SOURCES_DIST) \
+@@ -533,7 +524,6 @@
+      parrot.c		\
+      parrot.jpg		\
+      scale.ui		\
+-     dither.ui		\
+      meson.build	\
+      $(NULL)
+ 
+@@ -561,8 +551,7 @@
+ @HAVE_GTK_TRUE@	checkerboard		\
+ @HAVE_GTK_TRUE@	srgb-trap-test		\
+ @HAVE_GTK_TRUE@	srgb-test		\
+-@HAVE_GTK_TRUE@	scale			\
+-@HAVE_GTK_TRUE@	dither
++@HAVE_GTK_TRUE@	scale
+ 
+ @HAVE_GTK_TRUE@gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
+ @HAVE_GTK_TRUE@alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
+@@ -580,7 +569,6 @@
+ @HAVE_GTK_TRUE@srgb_test_SOURCES = srgb-test.c $(GTK_UTILS)
+ @HAVE_GTK_TRUE@srgb_trap_test_SOURCES = srgb-trap-test.c $(GTK_UTILS)
+ @HAVE_GTK_TRUE@scale_SOURCES = scale.c $(GTK_UTILS)
+-@HAVE_GTK_TRUE@dither_SOURCES = dither.c $(GTK_UTILS)
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -652,10 +640,6 @@
+ 	@rm -f convolution-test$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(convolution_test_OBJECTS) $(convolution_test_LDADD) $(LIBS)
+ 
+-dither$(EXEEXT): $(dither_OBJECTS) $(dither_DEPENDENCIES) $(EXTRA_dither_DEPENDENCIES) 
+-	@rm -f dither$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(dither_OBJECTS) $(dither_LDADD) $(LIBS)
+-
+ gradient-test$(EXEEXT): $(gradient_test_OBJECTS) $(gradient_test_DEPENDENCIES) $(EXTRA_gradient_test_DEPENDENCIES) 
+ 	@rm -f gradient-test$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(gradient_test_OBJECTS) $(gradient_test_LDADD) $(LIBS)
+@@ -709,7 +693,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conical-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convolution-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-utils.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linear-gradient.Po@am__quote@ # am--include-marker
+@@ -917,7 +900,6 @@
+ 	-rm -f ./$(DEPDIR)/composite-test.Po
+ 	-rm -f ./$(DEPDIR)/conical-test.Po
+ 	-rm -f ./$(DEPDIR)/convolution-test.Po
+-	-rm -f ./$(DEPDIR)/dither.Po
+ 	-rm -f ./$(DEPDIR)/gradient-test.Po
+ 	-rm -f ./$(DEPDIR)/gtk-utils.Po
+ 	-rm -f ./$(DEPDIR)/linear-gradient.Po
+@@ -983,7 +965,6 @@
+ 	-rm -f ./$(DEPDIR)/composite-test.Po
+ 	-rm -f ./$(DEPDIR)/conical-test.Po
+ 	-rm -f ./$(DEPDIR)/convolution-test.Po
+-	-rm -f ./$(DEPDIR)/dither.Po
+ 	-rm -f ./$(DEPDIR)/gradient-test.Po
+ 	-rm -f ./$(DEPDIR)/gtk-utils.Po
+ 	-rm -f ./$(DEPDIR)/linear-gradient.Po