diff options
Diffstat (limited to 'source/x/x11/patch')
12 files changed, 3 insertions, 1396 deletions
diff --git a/source/x/x11/patch/pixman.patch b/source/x/x11/patch/pixman.patch deleted file mode 100644 index 947341105..000000000 --- a/source/x/x11/patch/pixman.patch +++ /dev/null @@ -1 +0,0 @@ -zcat $CWD/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff.gz | patch -p1 --backup --suffix=.orig || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } 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 deleted file mode 100644 index 99017b166..000000000 --- a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff +++ /dev/null @@ -1,919 +0,0 @@ ---- ./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) \ -- region-test$(EXEEXT) combiner-test$(EXEEXT) \ -- scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \ -- scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \ -- rotate-test$(EXEEXT) alphamap$(EXEEXT) \ -- gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \ -- matrix-test$(EXEEXT) filter-reduction-test$(EXEEXT) \ -- composite-traps-test$(EXEEXT) region-contains-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) --am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \ -- check-formats$(EXEEXT) scaling-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) - 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) --affine_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --alpha_loop_SOURCES = alpha-loop.c --alpha_loop_OBJECTS = alpha-loop.$(OBJEXT) --alpha_loop_LDADD = $(LDADD) --alpha_loop_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --alphamap_SOURCES = alphamap.c --alphamap_OBJECTS = alphamap.$(OBJEXT) --alphamap_LDADD = $(LDADD) --alphamap_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --blitters_test_SOURCES = blitters-test.c --blitters_test_OBJECTS = blitters-test.$(OBJEXT) --blitters_test_LDADD = $(LDADD) --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) --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) --composite_SOURCES = composite.c --composite_OBJECTS = composite.$(OBJEXT) --composite_LDADD = $(LDADD) --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) --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) --matrix_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - oob_test_SOURCES = oob-test.c - oob_test_OBJECTS = oob-test.$(OBJEXT) - oob_test_LDADD = $(LDADD) -@@ -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) --region_contains_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --region_test_SOURCES = region-test.c --region_test_OBJECTS = region-test.$(OBJEXT) --region_test_LDADD = $(LDADD) --region_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - region_translate_test_SOURCES = region-translate-test.c - region_translate_test_OBJECTS = region-translate-test.$(OBJEXT) - region_translate_test_LDADD = $(LDADD) - region_translate_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --rotate_test_SOURCES = rotate-test.c --rotate_test_OBJECTS = rotate-test.$(OBJEXT) --rotate_test_LDADD = $(LDADD) --rotate_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --scaling_bench_SOURCES = scaling-bench.c --scaling_bench_OBJECTS = scaling-bench.$(OBJEXT) --scaling_bench_LDADD = $(LDADD) --scaling_bench_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - scaling_crash_test_SOURCES = scaling-crash-test.c - scaling_crash_test_OBJECTS = scaling-crash-test.$(OBJEXT) - scaling_crash_test_LDADD = $(LDADD) - scaling_crash_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --scaling_helpers_test_SOURCES = scaling-helpers-test.c --scaling_helpers_test_OBJECTS = scaling-helpers-test.$(OBJEXT) --scaling_helpers_test_LDADD = $(LDADD) --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) --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) --tolerance_test_SOURCES = tolerance-test.c --tolerance_test_OBJECTS = tolerance-test.$(OBJEXT) --tolerance_test_LDADD = $(LDADD) --tolerance_test_DEPENDENCIES = libutils.la \ -- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) - trap_crasher_SOURCES = trap-crasher.c - trap_crasher_OBJECTS = trap-crasher.$(OBJEXT) - trap_crasher_LDADD = $(LDADD) -@@ -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)/combiner-test.Po \ -- ./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.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)/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)/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) \ -@@ -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 \ -- affine-test.c alpha-loop.c alphamap.c blitters-test.c \ -- check-formats.c combiner-test.c composite.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 \ -- 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 --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 \ -- 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 \ -- 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 \ -+ 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;; \ -@@ -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 \ -- region-test \ - combiner-test \ - scaling-crash-test \ -- alpha-loop \ -- scaling-helpers-test \ - thread-test \ -- rotate-test \ -- alphamap \ -- gradient-crash-test \ - pixel-test \ -- matrix-test \ -- filter-reduction-test \ -- composite-traps-test \ -- region-contains-test \ -- glyph-test \ -- solid-test \ -- stress-test \ -- cover-test \ -- blitters-test \ -- affine-test \ -- scaling-test \ -- composite \ -- tolerance-test \ - $(NULL) - - - # Other programs - OTHERPROGRAMS = \ -- lowlevel-blt-bench \ -- radial-perf-test \ -- check-formats \ -- scaling-bench \ -- affine-bench \ - $(NULL) - - -@@ -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) -- --alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) $(EXTRA_alpha_loop_DEPENDENCIES) -- @rm -f alpha-loop$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS) -- --alphamap$(EXEEXT): $(alphamap_OBJECTS) $(alphamap_DEPENDENCIES) $(EXTRA_alphamap_DEPENDENCIES) -- @rm -f alphamap$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS) -- --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) - --composite$(EXEEXT): $(composite_OBJECTS) $(composite_DEPENDENCIES) $(EXTRA_composite_DEPENDENCIES) -- @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) -- --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) -- - 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) -@@ -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) -- --region-test$(EXEEXT): $(region_test_OBJECTS) $(region_test_DEPENDENCIES) $(EXTRA_region_test_DEPENDENCIES) -- @rm -f region-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(region_test_OBJECTS) $(region_test_LDADD) $(LIBS) -- - region-translate-test$(EXEEXT): $(region_translate_test_OBJECTS) $(region_translate_test_DEPENDENCIES) $(EXTRA_region_translate_test_DEPENDENCIES) - @rm -f region-translate-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(region_translate_test_OBJECTS) $(region_translate_test_LDADD) $(LIBS) - --rotate-test$(EXEEXT): $(rotate_test_OBJECTS) $(rotate_test_DEPENDENCIES) $(EXTRA_rotate_test_DEPENDENCIES) -- @rm -f rotate-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(rotate_test_OBJECTS) $(rotate_test_LDADD) $(LIBS) -- --scaling-bench$(EXEEXT): $(scaling_bench_OBJECTS) $(scaling_bench_DEPENDENCIES) $(EXTRA_scaling_bench_DEPENDENCIES) -- @rm -f scaling-bench$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(scaling_bench_OBJECTS) $(scaling_bench_LDADD) $(LIBS) -- - scaling-crash-test$(EXEEXT): $(scaling_crash_test_OBJECTS) $(scaling_crash_test_DEPENDENCIES) $(EXTRA_scaling_crash_test_DEPENDENCIES) - @rm -f scaling-crash-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(scaling_crash_test_OBJECTS) $(scaling_crash_test_LDADD) $(LIBS) - --scaling-helpers-test$(EXEEXT): $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_DEPENDENCIES) $(EXTRA_scaling_helpers_test_DEPENDENCIES) -- @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) -- --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) - --tolerance-test$(EXEEXT): $(tolerance_test_OBJECTS) $(tolerance_test_DEPENDENCIES) $(EXTRA_tolerance_test_DEPENDENCIES) -- @rm -f tolerance-test$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(tolerance_test_OBJECTS) $(tolerance_test_LDADD) $(LIBS) -- - 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) -@@ -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-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)/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.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 --@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)/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)/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 --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotate-test.Po@am__quote@ # am--include-marker --@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)/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 -@@ -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) --region-test.log: region-test$(EXEEXT) -- @p='region-test$(EXEEXT)'; \ -- b='region-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) - combiner-test.log: combiner-test$(EXEEXT) - @p='combiner-test$(EXEEXT)'; \ - b='combiner-test'; \ -@@ -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) --alpha-loop.log: alpha-loop$(EXEEXT) -- @p='alpha-loop$(EXEEXT)'; \ -- b='alpha-loop'; \ -- $(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) --scaling-helpers-test.log: scaling-helpers-test$(EXEEXT) -- @p='scaling-helpers-test$(EXEEXT)'; \ -- b='scaling-helpers-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) - thread-test.log: thread-test$(EXEEXT) - @p='thread-test$(EXEEXT)'; \ - b='thread-test'; \ -@@ -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) --rotate-test.log: rotate-test$(EXEEXT) -- @p='rotate-test$(EXEEXT)'; \ -- b='rotate-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) --alphamap.log: alphamap$(EXEEXT) -- @p='alphamap$(EXEEXT)'; \ -- b='alphamap'; \ -- $(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) --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) --matrix-test.log: matrix-test$(EXEEXT) -- @p='matrix-test$(EXEEXT)'; \ -- b='matrix-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) --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'; \ -- $(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) --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'; \ -- $(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) --affine-test.log: affine-test$(EXEEXT) -- @p='affine-test$(EXEEXT)'; \ -- b='affine-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) --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'; \ -- $(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) --tolerance-test.log: tolerance-test$(EXEEXT) -- @p='tolerance-test$(EXEEXT)'; \ -- b='tolerance-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) - .test.log: - @p='$<'; \ - $(am__set_b); \ -@@ -1697,42 +1231,17 @@ - - distclean: distclean-am - -rm -f ./$(DEPDIR)/a1-trap-test.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)/combiner-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)/fetch-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)/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)/region-contains-test.Po -- -rm -f ./$(DEPDIR)/region-test.Po - -rm -f ./$(DEPDIR)/region-translate-test.Po -- -rm -f ./$(DEPDIR)/rotate-test.Po -- -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)/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 -@@ -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-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)/combiner-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)/fetch-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)/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)/region-contains-test.Po -- -rm -f ./$(DEPDIR)/region-test.Po - -rm -f ./$(DEPDIR)/region-translate-test.Po -- -rm -f ./$(DEPDIR)/rotate-test.Po -- -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)/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 diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch deleted file mode 100644 index 936bf1ca4..000000000 --- a/source/x/x11/patch/xdm.patch +++ /dev/null @@ -1,6 +0,0 @@ -zcat $CWD/patch/xdm/xdm.glibc.crypt.diff.gz | patch -p1 --verbose || \ - { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/xdm/xdm-1.1.11-arc4random-include.patch.gz | patch -p1 --verbose || \ - { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/xdm/xdm-1.1.11-setproctitle-include.patch.gz | patch -p1 --verbose || \ - { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch b/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch deleted file mode 100644 index db948094b..000000000 --- a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur a/xdm/genauth.c b/xdm/genauth.c ---- a/xdm/genauth.c 2011-09-25 09:35:47.000000000 +0200 -+++ b/xdm/genauth.c 2014-01-06 16:28:09.664060603 +0100 -@@ -40,6 +40,14 @@ - - #include <errno.h> - -+#ifdef HAVE_ARC4RANDOM -+# ifdef __linux__ -+# include <bsd/stdlib.h> -+# else -+# include <stdlib.h> -+# endif -+#endif -+ - #include <time.h> - #define Time_t time_t - diff --git a/source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch b/source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch deleted file mode 100644 index 0a3f32bbe..000000000 --- a/source/x/x11/patch/xdm/xdm-1.1.11-setproctitle-include.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ur a/xdm/choose.c b/xdm/choose.c ---- a/xdm/choose.c 2011-09-25 09:35:47.000000000 +0200 -+++ b/xdm/choose.c 2014-01-06 16:33:09.628065364 +0100 -@@ -54,6 +54,14 @@ - # include <tiuser.h> - # endif - -+# ifdef HAVE_SETPROCTITLE -+# ifdef __linux__ -+# include <bsd/unistd.h> -+# else -+# include <unistd.h> -+# endif -+# endif -+ - # include <time.h> - # define Time_t time_t - -diff -ur a/xdm/session.c b/xdm/session.c ---- a/xdm/session.c 2011-09-25 09:35:47.000000000 +0200 -+++ b/xdm/session.c 2014-01-06 16:40:57.508072789 +0100 -@@ -54,6 +54,15 @@ - # include <usersec.h> - #endif - -+# ifdef HAVE_SETPROCTITLE -+# include <sys/types.h> -+# ifdef __linux__ -+# include <bsd/unistd.h> -+# else -+# include <unistd.h> -+# endif -+# endif -+ - #ifndef USE_PAM /* PAM modules should handle these */ - # ifdef SECURE_RPC - # include <rpc/rpc.h> diff --git a/source/x/x11/patch/xdm/xdm.glibc.crypt.diff b/source/x/x11/patch/xdm/xdm.glibc.crypt.diff deleted file mode 100644 index 076df37dc..000000000 --- a/source/x/x11/patch/xdm/xdm.glibc.crypt.diff +++ /dev/null @@ -1,42 +0,0 @@ -From 8d1eb5c74413e4c9a21f689fc106949b121c0117 Mon Sep 17 00:00:00 2001 -From: mancha <mancha1@hush.com> -Date: Wed, 22 May 2013 14:20:26 +0000 -Subject: Handle NULL returns from glibc 2.17+ crypt(). - -Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL -(w/ NULL return) if the salt violates specifications. Additionally, -on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords -passed to crypt() fail with EPERM (w/ NULL return). - -If using glibc's crypt(), check return value to avoid a possible -NULL pointer dereference. - -Reviewed-by: Matthieu Herrb <matthieu@herrb.eu> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/greeter/verify.c b/greeter/verify.c -index db3cb7d..b009e2b 100644 ---- a/greeter/verify.c -+++ b/greeter/verify.c -@@ -329,6 +329,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) - struct spwd *sp; - # endif - char *user_pass = NULL; -+ char *crypted_pass = NULL; - # endif - # ifdef __OpenBSD__ - char *s; -@@ -464,7 +465,9 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) - # if defined(ultrix) || defined(__ultrix__) - if (authenticate_user(p, greet->password, NULL) < 0) - # else -- if (strcmp (crypt (greet->password, user_pass), user_pass)) -+ crypted_pass = crypt (greet->password, user_pass); -+ if ((crypted_pass == NULL) -+ || (strcmp (crypted_pass, user_pass))) - # endif - { - if(!greet->allow_null_passwd || strlen(p->pw_passwd) > 0) { --- -cgit v0.9.0.2-2-gbebe - diff --git a/source/x/x11/patch/xf86-video-s3virge.patch b/source/x/x11/patch/xf86-video-s3virge.patch deleted file mode 100644 index 5e65d8563..000000000 --- a/source/x/x11/patch/xf86-video-s3virge.patch +++ /dev/null @@ -1,2 +0,0 @@ -# Patch for xorg-server-1.20.x: -zcat $CWD/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff b/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff deleted file mode 100644 index 685282dfa..000000000 --- a/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -aurN xf86-video-s3virge-1.10.7/src/s3v_driver.c xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c ---- xf86-video-s3virge-1.10.7/src/s3v_driver.c 2015-09-26 18:28:11.000000000 +0200 -+++ xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c 2018-07-14 12:43:11.986789561 +0200 -@@ -1203,6 +1203,7 @@ - vga256InfoRec.directMode = XF86DGADirectPresent; - #endif - -+#if 0 - /* - * xf86ValidateModes will check that the mode HTotal and VTotal values - * don't exceed the chipset's limit if pScrn->maxHValue and -@@ -1214,6 +1215,7 @@ - /* true for all ViRGE? */ - pScrn->maxHValue = 2048; - pScrn->maxVValue = 2048; -+#endif - - /* Lower depths default to config file */ - pScrn->virtualX = pScrn->display->virtualX; diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch index e1e5d20f6..b75c4cf40 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -9,13 +9,8 @@ zcat $CWD/patch/xorg-server/xorg-server.combo.mouse.keyboard.layout.patch.gz | p # the next xorg-server and will no longer apply then. zcat $CWD/patch/xorg-server/fix-nouveau-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -# From Fedora Rawhide 2018/7 (possibly useful, doesn't seem like it will hurt anything): -zcat $CWD/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - -# From Fedora Rawhide 2018/7, looks like many other distributions have added -# this patch for a long time. Keep an eye out for newer versions though, and -# revisit this if any DE begin to manage secondary GPUs (although none do yet): -zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +## From Fedora Rawhide 2018/7 (possibly useful, doesn't seem like it will hurt anything): +#zcat $CWD/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # The upstream nouveau developers recommend this. On newer nvidia cards it works # better to use the generic modesetting ddx rather than nouveau. @@ -23,8 +18,6 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p # Added here 2018/7. zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -# Fix a PCI related segfault: -zcat $CWD/patch/xorg-server/fix-pci-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - # Only use Intel DDX with pre-gen4 hardware. Newer hardware will the the modesetting driver by default: zcat $CWD/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch b/source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch deleted file mode 100644 index c613eb8f9..000000000 --- a/source/x/x11/patch/xorg-server/0001-Always-install-vbe-and-int10-sdk-headers.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e96a83d9b1b5a52a41213c7a4840dc96b4f5b06f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 15 Aug 2012 12:35:21 -0400 -Subject: [PATCH] Always install vbe and int10 sdk headers - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- - hw/xfree86/Makefile.am | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am -index b876b79..a170b58 100644 ---- a/hw/xfree86/Makefile.am -+++ b/hw/xfree86/Makefile.am -@@ -26,17 +26,9 @@ if VGAHW - VGAHW_SUBDIR = vgahw - endif - --if VBE --VBE_SUBDIR = vbe --endif -- --if INT10MODULE --INT10_SUBDIR = int10 --endif -- --SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ -+SUBDIRS = common ddc x86emu int10 os-support parser \ - ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ -- $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \ -+ $(DRI2_SUBDIR) . vbe i2c dixmods xkb \ - fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \ - $(GLAMOR_EGL_SUBDIR) drivers - --- -2.13.6 - diff --git a/source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch b/source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch deleted file mode 100644 index 86b96a23e..000000000 --- a/source/x/x11/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch +++ /dev/null @@ -1,293 +0,0 @@ -From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Mon, 2 Apr 2018 16:49:02 -0400 -Subject: [PATCH] autobind GPUs to the screen - -This is a modified version of a patch we've been carry-ing in Fedora and -RHEL for years now. This patch automatically adds secondary GPUs to the -master as output sink / offload source making e.g. the use of -slave-outputs just work, with requiring the user to manually run -"xrandr --setprovideroutputsource" before he can hookup an external -monitor to his hybrid graphics laptop. - -There is one problem with this patch, which is why it was not upstreamed -before. What to do when a secondary GPU gets detected really is a policy -decission (e.g. one may want to autobind PCI GPUs but not USB ones) and -as such should be under control of the Desktop Environment. - -Unconditionally adding autobinding support to the xserver will result -in races between the DE dealing with the hotplug of a secondary GPU -and the server itself dealing with it. - -However we've waited for years for any Desktop Environments to actually -start doing some sort of autoconfiguration of secondary GPUs and there -is still not a single DE dealing with this, so I believe that it is -time to upstream this now. - -To avoid potential future problems if any DEs get support for doing -secondary GPU configuration themselves, the new autobind functionality -is made optional. Since no DEs currently support doing this themselves it -is enabled by default. When DEs grow support for doing this themselves -they can disable the servers autobinding through the servers cmdline or a -xorg.conf snippet. - -Signed-off-by: Dave Airlie <airlied@gmail.com> -[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream] -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86Config.c | 19 +++++++++++++++++++ - hw/xfree86/common/xf86Globals.c | 2 ++ - hw/xfree86/common/xf86Init.c | 20 ++++++++++++++++++++ - hw/xfree86/common/xf86Priv.h | 1 + - hw/xfree86/common/xf86Privstr.h | 1 + - hw/xfree86/common/xf86platformBus.c | 4 ++++ - hw/xfree86/man/Xorg.man | 7 +++++++ - hw/xfree86/man/xorg.conf.man | 6 ++++++ - randr/randrstr.h | 3 +++ - randr/rrprovider.c | 22 ++++++++++++++++++++++ - 10 files changed, 85 insertions(+) - -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 2c1d335..d7d7c2e 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -643,6 +643,7 @@ typedef enum { - FLAG_DRI2, - FLAG_USE_SIGIO, - FLAG_AUTO_ADD_GPU, -+ FLAG_AUTO_BIND_GPU, - FLAG_MAX_CLIENTS, - FLAG_IGLX, - FLAG_DEBUG, -@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = { - {0}, FALSE}, - {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN, - {0}, FALSE}, -+ {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN, -+ {0}, FALSE}, - {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER, - {0}, FALSE }, - {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN, -@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) - } - xf86Msg(from, "%sutomatically adding GPU devices\n", - xf86Info.autoAddGPU ? "A" : "Not a"); -+ -+ if (xf86AutoBindGPUDisabled) { -+ xf86Info.autoBindGPU = FALSE; -+ from = X_CMDLINE; -+ } -+ else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) { -+ xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU, -+ &xf86Info.autoBindGPU); -+ from = X_CONFIG; -+ } -+ else { -+ from = X_DEFAULT; -+ } -+ xf86Msg(from, "%sutomatically binding GPU devices\n", -+ xf86Info.autoBindGPU ? "A" : "Not a"); -+ - /* - * Set things up based on the config file information. Some of these - * settings may be overridden later when the command line options are -diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c -index e890f05..7b27b4c 100644 ---- a/hw/xfree86/common/xf86Globals.c -+++ b/hw/xfree86/common/xf86Globals.c -@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = { - #else - .autoAddGPU = FALSE, - #endif -+ .autoBindGPU = TRUE, - }; - - const char *xf86ConfigFile = NULL; -@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE; - Gamma xf86Gamma = { 0.0, 0.0, 0.0 }; - - Bool xf86AllowMouseOpenFail = FALSE; -+Bool xf86AutoBindGPUDisabled = FALSE; - - #ifdef XF86VIDMODE - Bool xf86VidModeDisabled = FALSE; -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index ea42ec9..ec255b6 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -76,6 +76,7 @@ - #include "xf86DDC.h" - #include "xf86Xinput.h" - #include "xf86InPriv.h" -+#include "xf86Crtc.h" - #include "picturestr.h" - #include "randrstr.h" - #include "glxvndabi.h" -@@ -237,6 +238,19 @@ xf86PrivsElevated(void) - return PrivsElevated(); - } - -+static void -+xf86AutoConfigOutputDevices(void) -+{ -+ int i; -+ -+ if (!xf86Info.autoBindGPU) -+ return; -+ -+ for (i = 0; i < xf86NumGPUScreens; i++) -+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), -+ xf86ScrnToScreen(xf86Screens[0])); -+} -+ - static void - TrapSignals(void) - { -@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) - for (i = 0; i < xf86NumGPUScreens; i++) - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); - -+ xf86AutoConfigOutputDevices(); -+ - xf86VGAarbiterWrapFunctions(); - if (sigio_blocked) - input_unlock(); -@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i) - xf86Info.iglxFrom = X_CMDLINE; - return 0; - } -+ if (!strcmp(argv[i], "-noautoBindGPU")) { -+ xf86AutoBindGPUDisabled = TRUE; -+ return 1; -+ } - - /* OS-specific processing */ - return xf86ProcessArgument(argc, argv, i); -diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h -index 4fe2b5f..6566622 100644 ---- a/hw/xfree86/common/xf86Priv.h -+++ b/hw/xfree86/common/xf86Priv.h -@@ -46,6 +46,7 @@ - extern _X_EXPORT const char *xf86ConfigFile; - extern _X_EXPORT const char *xf86ConfigDir; - extern _X_EXPORT Bool xf86AllowMouseOpenFail; -+extern _X_EXPORT Bool xf86AutoBindGPUDisabled; - - #ifdef XF86VIDMODE - extern _X_EXPORT Bool xf86VidModeDisabled; -diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h -index 21c2e1f..6c71863 100644 ---- a/hw/xfree86/common/xf86Privstr.h -+++ b/hw/xfree86/common/xf86Privstr.h -@@ -98,6 +98,7 @@ typedef struct { - - Bool autoAddGPU; - const char *debug; -+ Bool autoBindGPU; - } xf86InfoRec, *xf86InfoPtr; - - /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */ -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index cef47da..913a324 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -49,6 +49,7 @@ - #include "Pci.h" - #include "xf86platformBus.h" - #include "xf86Config.h" -+#include "xf86Crtc.h" - - #include "randrstr.h" - int platformSlotClaimed; -@@ -665,6 +666,9 @@ xf86platformAddDevice(int index) - } - /* attach unbound to 0 protocol screen */ - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); -+ if (xf86Info.autoBindGPU) -+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), -+ xf86ScrnToScreen(xf86Screens[0])); - - RRResourcesChanged(xf86Screens[0]->pScreen); - RRTellChanged(xf86Screens[0]->pScreen); -diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man -index 13a9dc3..745f986 100644 ---- a/hw/xfree86/man/Xorg.man -+++ b/hw/xfree86/man/Xorg.man -@@ -283,6 +283,13 @@ is a comma separated list of directories to search for - server modules. This option is only available when the server is run - as root (i.e, with real-uid 0). - .TP 8 -+.B \-noautoBindGPU -+Disable automatically setting secondary GPUs up as output sinks and offload -+sources. This is equivalent to setting the -+.B AutoBindGPU -+xorg.conf(__filemansuffix__) file option. To -+.B false. -+.TP 8 - .B \-nosilk - Disable Silken Mouse support. - .TP 8 -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 9589262..8d51e06 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -672,6 +672,12 @@ Enabled by default. - If this option is disabled, then no GPU devices will be added from the udev - backend. Enabled by default. (May need to be disabled to setup Xinerama). - .TP 7 -+.BI "Option \*qAutoBindGPU\*q \*q" boolean \*q -+If enabled then secondary GPUs will be automatically set up as output-sinks and -+offload-sources. Making e.g. laptop outputs connected only to the secondary -+GPU directly available for use without needing to run -+"xrandr --setprovideroutputsource". Enabled by default. -+.TP 7 - .BI "Option \*qLog\*q \*q" string \*q - This option controls whether the log is flushed and/or synced to disk after - each message. -diff --git a/randr/randrstr.h b/randr/randrstr.h -index f94174b..092d726 100644 ---- a/randr/randrstr.h -+++ b/randr/randrstr.h -@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p); - extern _X_EXPORT void - RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider); - -+extern _X_EXPORT void -+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen); -+ - /* rrproviderproperty.c */ - - extern _X_EXPORT void -diff --git a/randr/rrprovider.c b/randr/rrprovider.c -index e4bc2bf..e04c18f 100644 ---- a/randr/rrprovider.c -+++ b/randr/rrprovider.c -@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider) - - WriteEventsToClient(client, 1, (xEvent *) &pe); - } -+ -+void -+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen) -+{ -+ rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); -+ rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen); -+ RRProviderPtr provider = pScrPriv->provider; -+ RRProviderPtr master_provider = masterPriv->provider; -+ -+ if (!provider || !master_provider) -+ return; -+ -+ if ((provider->capabilities & RR_Capability_SinkOutput) && -+ (master_provider->capabilities & RR_Capability_SourceOutput)) { -+ pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider); -+ RRInitPrimeSyncProps(pScreen); -+ } -+ -+ if ((provider->capabilities & RR_Capability_SourceOffload) && -+ (master_provider->capabilities & RR_Capability_SinkOffload)) -+ pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider); -+} --- -2.16.2 - diff --git a/source/x/x11/patch/xorg-server/fix-pci-segfault.diff b/source/x/x11/patch/xorg-server/fix-pci-segfault.diff deleted file mode 100644 index 400376287..000000000 --- a/source/x/x11/patch/xorg-server/fix-pci-segfault.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index cef47da03d0e91e6a56a5e3cb14a51d931633eff..dadbac6c8f0ae6f3d636fdfe245e61bc0c98581d 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -289,7 +289,7 @@ xf86platformProbe(void) - for (i = 0; i < xf86_num_platform_devices; i++) { - char *busid = xf86_platform_odev_attributes(i)->busid; - -- if (pci && (strncmp(busid, "pci:", 4) == 0)) { -+ if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) { - platform_find_pci_info(&xf86_platform_devices[i], busid); - } |