From 72b3c9e90fc0aaa9889f6be69da37f506cabeba2 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 21 Apr 2020 02:45:06 +0000 Subject: Tue Apr 21 02:45:06 UTC 2020 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. --- source/d/python/python.SlackBuild | 183 ------ source/d/python/python.no-static-library.diff | 49 -- .../python/python.readline.set_pre_input_hook.diff | 12 - source/d/python/python.url | 1 - source/d/python/python.x86_64.diff | 174 ------ source/d/python/slack-desc | 19 - source/d/python2/python.no-static-library.diff | 49 ++ .../python.readline.set_pre_input_hook.diff | 12 + source/d/python2/python.url | 1 + source/d/python2/python.x86_64.diff | 174 ++++++ source/d/python2/python2.SlackBuild | 183 ++++++ source/d/python2/slack-desc | 19 + source/l/M2Crypto/M2Crypto.SlackBuild | 14 +- source/l/harfbuzz/harfbuzz.url | 1 + source/l/harfbuzz/slack-desc | 2 +- ....977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch | 484 --------------- source/l/libuv/libuv.SlackBuild | 5 +- source/l/oniguruma/oniguruma.SlackBuild | 8 +- .../pixman.remove.tests.that.fail.to.compile.diff | 647 +++++++++++++++------ 19 files changed, 937 insertions(+), 1100 deletions(-) delete mode 100755 source/d/python/python.SlackBuild delete mode 100644 source/d/python/python.no-static-library.diff delete mode 100644 source/d/python/python.readline.set_pre_input_hook.diff delete mode 100644 source/d/python/python.url delete mode 100644 source/d/python/python.x86_64.diff delete mode 100644 source/d/python/slack-desc create mode 100644 source/d/python2/python.no-static-library.diff create mode 100644 source/d/python2/python.readline.set_pre_input_hook.diff create mode 100644 source/d/python2/python.url create mode 100644 source/d/python2/python.x86_64.diff create mode 100755 source/d/python2/python2.SlackBuild create mode 100644 source/d/python2/slack-desc create mode 100644 source/l/harfbuzz/harfbuzz.url delete mode 100644 source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch (limited to 'source') diff --git a/source/d/python/python.SlackBuild b/source/d/python/python.SlackBuild deleted file mode 100755 index e4cee053..00000000 --- a/source/d/python/python.SlackBuild +++ /dev/null @@ -1,183 +0,0 @@ -#!/bin/bash - -# Copyright 2008, 2009, 2012, 2013, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=python -SRCNAM=Python -VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . ) -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM -rm -rf $PKG -mkdir -p $TMP $PKG - -# Don't set any SLKCFLAGS here, or OPT="$SLKCFLAGS" before the ./configure. -# Python gets the compile options right without any help. -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "armel" ]; then - LIBDIRSUFFIX="" -fi - -# Location for Python site-packages: -SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages -# same as above without $PKG -TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages - -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xf $CWD/$SRCNAM-$VERSION.tar.xz || exit 1 -cd $SRCNAM-$VERSION || exit 1 - -zcat $CWD/python.readline.set_pre_input_hook.diff.gz | patch -p1 --verbose || exit 1 -# We don't want a large libpython*.a: -zcat $CWD/python.no-static-library.diff.gz | patch -p1 --verbose || exit 1 - -if [ "$ARCH" = "x86_64" ]; then - # Install to lib64 instead of lib and - # Python must report /usr/lib64/python2.7/site-packages as python_lib_dir: - zcat $CWD/python.x86_64.diff.gz | patch -p1 --verbose || exit 1 -fi - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -# Enable built-in SQLite module to load extensions -sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py - -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/python-$VERSION \ - --with-threads \ - --enable-ipv6 \ - --enable-shared \ - --enable-unicode=ucs4 \ - --with-system-expat \ - --with-system-ffi \ - --without-ensurepip \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Install some python-demo files: -mkdir -p $PKG/usr/doc/python-$VERSION -cp -a Demo $PKG/usr/doc/python-$VERSION - -# We'll install the python-tools under site-packages: -mkdir -p $SITEPK -cp -a Tools/* $SITEPK - -mkdir -p $PKG/usr/doc/python-$VERSION -mv $SITEPK/README $PKG/usr/doc/python-$VERSION/README.python-tools -( cd $PKG/usr/doc/python-$VERSION - ln -sf $TOOLSDIR Tools -) - -# Make a few useful symlinks: -mkdir -p $PKG/usr/bin -( cd $PKG/usr/bin - ln -sf $TOOLSDIR/pynche/pynche pynche - ln -sf $TOOLSDIR/i18n/msgfmt.py . - ln -sf $TOOLSDIR/i18n/pygettext.py . -) - -# Install docs: -mkdir -p $PKG/usr/doc/python-$VERSION/Documentation -cp -a README LICENSE $PKG/usr/doc/python-$VERSION -cp -a Misc $PKG/usr/doc/python-$VERSION -tar xf $CWD/python-$VERSION-docs-text.tar.?z* -mv python-${VERSION}-docs-text/* $PKG/usr/doc/python-$VERSION/Documentation -chown -R root:root $PKG/usr/doc/python-$VERSION - -# Fix possible incorrect permissions: -( cd $PKG - find . -type d -exec chmod 755 "{}" \+ - find . -perm 640 -exec chmod 644 "{}" \+ - find . -perm 750 -exec chmod 755 "{}" \+ -) - - -( cd $PKG/usr/bin - rm -f python - ln -sf python${BRANCH_VERSION} python -) - -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null -) - -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \+ - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) - -( cd $PKG/usr/man - if [ -r python${BRANCH_VERSION}.1.gz ] ; then - ln -sf python${BRANCH_VERSION}.1.gz python.1.gz - fi -) - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/python-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/d/python/python.no-static-library.diff b/source/d/python/python.no-static-library.diff deleted file mode 100644 index 96209897..00000000 --- a/source/d/python/python.no-static-library.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- ./Makefile.pre.in.orig 2012-04-09 18:07:33.000000000 -0500 -+++ ./Makefile.pre.in 2012-05-09 13:38:24.913226185 -0500 -@@ -396,7 +396,7 @@ - - - # Build the interpreter --$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) -+$(BUILDPYTHON): Modules/python.o $(LDLIBRARY) - $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ - Modules/python.o \ - $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -@@ -412,18 +412,6 @@ - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ - esac - --# Build static library --# avoid long command lines, same as LIBRARY_OBJS --$(LIBRARY): $(LIBRARY_OBJS) -- -rm -f $@ -- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o -- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS) -- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) -- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) -- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS) -- $(AR) $(ARFLAGS) $@ $(MODOBJS) -- $(RANLIB) $@ -- - libpython$(VERSION).so: $(LIBRARY_OBJS) - if test $(INSTSONAME) != $(LDLIBRARY); then \ - $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ -@@ -1008,18 +996,6 @@ - else true; \ - fi; \ - done -- @if test -d $(LIBRARY); then :; else \ -- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ -- if test "$(SO)" = .dll; then \ -- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ -- else \ -- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ -- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ -- fi; \ -- else \ -- echo Skip install of $(LIBRARY) - use make frameworkinstall; \ -- fi; \ -- fi - $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c - $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o - $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in diff --git a/source/d/python/python.readline.set_pre_input_hook.diff b/source/d/python/python.readline.set_pre_input_hook.diff deleted file mode 100644 index 8af4b4be..00000000 --- a/source/d/python/python.readline.set_pre_input_hook.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- ./Modules/readline.c.orig 2008-11-04 14:43:31.000000000 -0600 -+++ ./Modules/readline.c 2009-06-09 14:23:16.000000000 -0500 -@@ -11,6 +11,9 @@ - #include - #include - -+/* This seems to be needed for set_pre_input_hook to work */ -+#define HAVE_RL_PRE_INPUT_HOOK 1 -+ - #if defined(HAVE_SETLOCALE) - /* GNU readline() mistakenly sets the LC_CTYPE locale. - * This is evil. Only the user or the app's main() should do this! diff --git a/source/d/python/python.url b/source/d/python/python.url deleted file mode 100644 index 8738d0b1..00000000 --- a/source/d/python/python.url +++ /dev/null @@ -1 +0,0 @@ -http://www.python.org/ftp/python/ diff --git a/source/d/python/python.x86_64.diff b/source/d/python/python.x86_64.diff deleted file mode 100644 index 55cdf499..00000000 --- a/source/d/python/python.x86_64.diff +++ /dev/null @@ -1,174 +0,0 @@ ---- ./Makefile.pre.in.orig 2016-12-17 14:05:06.000000000 -0600 -+++ ./Makefile.pre.in 2016-12-28 13:17:09.089663880 -0600 -@@ -111,7 +111,7 @@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/lib64 - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) ---- ./Lib/sysconfig.py.orig 2016-12-17 14:05:06.000000000 -0600 -+++ ./Lib/sysconfig.py 2016-12-28 13:17:09.086663880 -0600 -@@ -7,20 +7,20 @@ - - _INSTALL_SCHEMES = { - 'posix_prefix': { -- 'stdlib': '{base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', -- 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', -+ 'stdlib': '{base}/lib64/python{py_version_short}', -+ 'platstdlib': '{platbase}/lib64/python{py_version_short}', -+ 'purelib': '{base}/lib64/python{py_version_short}/site-packages', -+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', - 'include': '{base}/include/python{py_version_short}', - 'platinclude': '{platbase}/include/python{py_version_short}', - 'scripts': '{base}/bin', - 'data': '{base}', - }, - 'posix_home': { -- 'stdlib': '{base}/lib/python', -- 'platstdlib': '{base}/lib/python', -- 'purelib': '{base}/lib/python', -- 'platlib': '{base}/lib/python', -+ 'stdlib': '{base}/lib64/python', -+ 'platstdlib': '{base}/lib64/python', -+ 'purelib': '{base}/lib64/python', -+ 'platlib': '{base}/lib64/python', - 'include': '{base}/include/python', - 'platinclude': '{base}/include/python', - 'scripts': '{base}/bin', -@@ -65,10 +65,10 @@ - 'data' : '{userbase}', - }, - 'posix_user': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', -- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'stdlib': '{userbase}/lib64/python{py_version_short}', -+ 'platstdlib': '{userbase}/lib64/python{py_version_short}', -+ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', -+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', - 'data' : '{userbase}', ---- ./Lib/site.py.orig 2016-12-17 14:05:06.000000000 -0600 -+++ ./Lib/site.py 2016-12-28 13:19:06.612662631 -0600 -@@ -288,13 +288,13 @@ - if sys.platform in ('os2emx', 'riscos'): - sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': -- sitepackages.append(os.path.join(prefix, "lib", -+ sitepackages.append(os.path.join(prefix, "lib64", - "python" + sys.version[:3], - "site-packages")) -- sitepackages.append(os.path.join(prefix, "lib", "site-python")) -+ sitepackages.append(os.path.join(prefix, "lib64", "site-python")) - else: - sitepackages.append(prefix) -- sitepackages.append(os.path.join(prefix, "lib", "site-packages")) -+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) - return sitepackages - - def addsitepackages(known_paths): ---- ./Lib/distutils/command/install.py.orig 2016-12-17 14:05:05.000000000 -0600 -+++ ./Lib/distutils/command/install.py 2016-12-28 13:17:09.079663880 -0600 -@@ -41,15 +41,15 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/lib64/python$py_version_short/site-packages', -+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { -- 'purelib': '$base/lib/python', -- 'platlib': '$base/lib/python', -+ 'purelib': '$base/lib64/python', -+ 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- ./Lib/distutils/sysconfig.py.orig 2016-12-17 14:05:05.000000000 -0600 -+++ ./Lib/distutils/sysconfig.py 2016-12-28 13:17:09.081663880 -0600 -@@ -120,7 +120,7 @@ - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ "lib64", "python" + get_python_version()) - if standard_lib: - return libpython - else: ---- ./Modules/getpath.c.orig 2016-12-17 14:05:07.000000000 -0600 -+++ ./Modules/getpath.c 2016-12-28 13:17:09.093663880 -0600 -@@ -108,7 +108,7 @@ - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "lib64/python" VERSION; - - static void - reduce(char *dir) -@@ -520,7 +520,7 @@ - } - else - strncpy(zip_path, PREFIX, MAXPATHLEN); -- joinpath(zip_path, "lib/python00.zip"); -+ joinpath(zip_path, "lib64/python00.zip"); - bufsz = strlen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -530,7 +530,7 @@ - fprintf(stderr, - "Could not find platform dependent libraries \n"); - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, "lib/lib-dynload"); -+ joinpath(exec_prefix, "lib64/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - ---- ./setup.py.orig 2016-12-17 14:05:07.000000000 -0600 -+++ ./setup.py 2016-12-28 13:17:09.097663880 -0600 -@@ -456,7 +456,7 @@ - def detect_modules(self): - # Ensure that /usr/local is always used - if not cross_compiling: -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - if cross_compiling: - self.add_gcc_paths() -@@ -782,11 +782,11 @@ - elif curses_library: - readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/lib64/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: -@@ -821,8 +821,8 @@ - if krb5_h: - ssl_incs += krb5_h - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -- '/usr/contrib/ssl/lib/' -+ ['/usr/local/ssl/lib64', -+ '/usr/contrib/ssl/lib64/' - ] ) - - if (ssl_incs is not None and diff --git a/source/d/python/slack-desc b/source/d/python/slack-desc deleted file mode 100644 index d7db551f..00000000 --- a/source/d/python/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -python: python (object-oriented interpreted programming language) -python: -python: Python is an interpreted, interactive, object-oriented programming -python: language that combines remarkable power with very clear syntax. -python: Python's basic power can be extended with your own modules written in -python: C or C++. Python is also adaptable as an extension language for -python: existing applications. -python: -python: -python: -python: diff --git a/source/d/python2/python.no-static-library.diff b/source/d/python2/python.no-static-library.diff new file mode 100644 index 00000000..96209897 --- /dev/null +++ b/source/d/python2/python.no-static-library.diff @@ -0,0 +1,49 @@ +--- ./Makefile.pre.in.orig 2012-04-09 18:07:33.000000000 -0500 ++++ ./Makefile.pre.in 2012-05-09 13:38:24.913226185 -0500 +@@ -396,7 +396,7 @@ + + + # Build the interpreter +-$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) ++$(BUILDPYTHON): Modules/python.o $(LDLIBRARY) + $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ + Modules/python.o \ + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) +@@ -412,18 +412,6 @@ + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ + esac + +-# Build static library +-# avoid long command lines, same as LIBRARY_OBJS +-$(LIBRARY): $(LIBRARY_OBJS) +- -rm -f $@ +- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o +- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS) +- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) +- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) +- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS) +- $(AR) $(ARFLAGS) $@ $(MODOBJS) +- $(RANLIB) $@ +- + libpython$(VERSION).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ + $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ +@@ -1008,18 +996,6 @@ + else true; \ + fi; \ + done +- @if test -d $(LIBRARY); then :; else \ +- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ +- if test "$(SO)" = .dll; then \ +- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ +- else \ +- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ +- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ +- fi; \ +- else \ +- echo Skip install of $(LIBRARY) - use make frameworkinstall; \ +- fi; \ +- fi + $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c + $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o + $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in diff --git a/source/d/python2/python.readline.set_pre_input_hook.diff b/source/d/python2/python.readline.set_pre_input_hook.diff new file mode 100644 index 00000000..8af4b4be --- /dev/null +++ b/source/d/python2/python.readline.set_pre_input_hook.diff @@ -0,0 +1,12 @@ +--- ./Modules/readline.c.orig 2008-11-04 14:43:31.000000000 -0600 ++++ ./Modules/readline.c 2009-06-09 14:23:16.000000000 -0500 +@@ -11,6 +11,9 @@ + #include + #include + ++/* This seems to be needed for set_pre_input_hook to work */ ++#define HAVE_RL_PRE_INPUT_HOOK 1 ++ + #if defined(HAVE_SETLOCALE) + /* GNU readline() mistakenly sets the LC_CTYPE locale. + * This is evil. Only the user or the app's main() should do this! diff --git a/source/d/python2/python.url b/source/d/python2/python.url new file mode 100644 index 00000000..8738d0b1 --- /dev/null +++ b/source/d/python2/python.url @@ -0,0 +1 @@ +http://www.python.org/ftp/python/ diff --git a/source/d/python2/python.x86_64.diff b/source/d/python2/python.x86_64.diff new file mode 100644 index 00000000..55cdf499 --- /dev/null +++ b/source/d/python2/python.x86_64.diff @@ -0,0 +1,174 @@ +--- ./Makefile.pre.in.orig 2016-12-17 14:05:06.000000000 -0600 ++++ ./Makefile.pre.in 2016-12-28 13:17:09.089663880 -0600 +@@ -111,7 +111,7 @@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include +-SCRIPTDIR= $(prefix)/lib ++SCRIPTDIR= $(prefix)/lib64 + + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) +--- ./Lib/sysconfig.py.orig 2016-12-17 14:05:06.000000000 -0600 ++++ ./Lib/sysconfig.py 2016-12-28 13:17:09.086663880 -0600 +@@ -7,20 +7,20 @@ + + _INSTALL_SCHEMES = { + 'posix_prefix': { +- 'stdlib': '{base}/lib/python{py_version_short}', +- 'platstdlib': '{platbase}/lib/python{py_version_short}', +- 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', ++ 'stdlib': '{base}/lib64/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib64/python{py_version_short}', ++ 'purelib': '{base}/lib64/python{py_version_short}/site-packages', ++ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', + 'include': '{base}/include/python{py_version_short}', + 'platinclude': '{platbase}/include/python{py_version_short}', + 'scripts': '{base}/bin', + 'data': '{base}', + }, + 'posix_home': { +- 'stdlib': '{base}/lib/python', +- 'platstdlib': '{base}/lib/python', +- 'purelib': '{base}/lib/python', +- 'platlib': '{base}/lib/python', ++ 'stdlib': '{base}/lib64/python', ++ 'platstdlib': '{base}/lib64/python', ++ 'purelib': '{base}/lib64/python', ++ 'platlib': '{base}/lib64/python', + 'include': '{base}/include/python', + 'platinclude': '{base}/include/python', + 'scripts': '{base}/bin', +@@ -65,10 +65,10 @@ + 'data' : '{userbase}', + }, + 'posix_user': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', +- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'stdlib': '{userbase}/lib64/python{py_version_short}', ++ 'platstdlib': '{userbase}/lib64/python{py_version_short}', ++ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', +--- ./Lib/site.py.orig 2016-12-17 14:05:06.000000000 -0600 ++++ ./Lib/site.py 2016-12-28 13:19:06.612662631 -0600 +@@ -288,13 +288,13 @@ + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': +- sitepackages.append(os.path.join(prefix, "lib", ++ sitepackages.append(os.path.join(prefix, "lib64", + "python" + sys.version[:3], + "site-packages")) +- sitepackages.append(os.path.join(prefix, "lib", "site-python")) ++ sitepackages.append(os.path.join(prefix, "lib64", "site-python")) + else: + sitepackages.append(prefix) +- sitepackages.append(os.path.join(prefix, "lib", "site-packages")) ++ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) + return sitepackages + + def addsitepackages(known_paths): +--- ./Lib/distutils/command/install.py.orig 2016-12-17 14:05:05.000000000 -0600 ++++ ./Lib/distutils/command/install.py 2016-12-28 13:17:09.079663880 -0600 +@@ -41,15 +41,15 @@ + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/lib64/python$py_version_short/site-packages', ++ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { +- 'purelib': '$base/lib/python', +- 'platlib': '$base/lib/python', ++ 'purelib': '$base/lib64/python', ++ 'platlib': '$base/lib64/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +--- ./Lib/distutils/sysconfig.py.orig 2016-12-17 14:05:05.000000000 -0600 ++++ ./Lib/distutils/sysconfig.py 2016-12-28 13:17:09.081663880 -0600 +@@ -120,7 +120,7 @@ + + if os.name == "posix": + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ "lib64", "python" + get_python_version()) + if standard_lib: + return libpython + else: +--- ./Modules/getpath.c.orig 2016-12-17 14:05:07.000000000 -0600 ++++ ./Modules/getpath.c 2016-12-28 13:17:09.093663880 -0600 +@@ -108,7 +108,7 @@ + static char exec_prefix[MAXPATHLEN+1]; + static char progpath[MAXPATHLEN+1]; + static char *module_search_path = NULL; +-static char lib_python[] = "lib/python" VERSION; ++static char lib_python[] = "lib64/python" VERSION; + + static void + reduce(char *dir) +@@ -520,7 +520,7 @@ + } + else + strncpy(zip_path, PREFIX, MAXPATHLEN); +- joinpath(zip_path, "lib/python00.zip"); ++ joinpath(zip_path, "lib64/python00.zip"); + bufsz = strlen(zip_path); /* Replace "00" with version */ + zip_path[bufsz - 6] = VERSION[0]; + zip_path[bufsz - 5] = VERSION[2]; +@@ -530,7 +530,7 @@ + fprintf(stderr, + "Could not find platform dependent libraries \n"); + strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); +- joinpath(exec_prefix, "lib/lib-dynload"); ++ joinpath(exec_prefix, "lib64/lib-dynload"); + } + /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ + +--- ./setup.py.orig 2016-12-17 14:05:07.000000000 -0600 ++++ ./setup.py 2016-12-28 13:17:09.097663880 -0600 +@@ -456,7 +456,7 @@ + def detect_modules(self): + # Ensure that /usr/local is always used + if not cross_compiling: +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + if cross_compiling: + self.add_gcc_paths() +@@ -782,11 +782,11 @@ + elif curses_library: + readline_libs.append(curses_library) + elif self.compiler.find_library_file(lib_dirs + +- ['/usr/lib/termcap'], ++ ['/usr/lib64/termcap'], + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], ++ library_dirs=['/usr/lib64/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs) ) + else: +@@ -821,8 +821,8 @@ + if krb5_h: + ssl_incs += krb5_h + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, +- ['/usr/local/ssl/lib', +- '/usr/contrib/ssl/lib/' ++ ['/usr/local/ssl/lib64', ++ '/usr/contrib/ssl/lib64/' + ] ) + + if (ssl_incs is not None and diff --git a/source/d/python2/python2.SlackBuild b/source/d/python2/python2.SlackBuild new file mode 100755 index 00000000..b4698415 --- /dev/null +++ b/source/d/python2/python2.SlackBuild @@ -0,0 +1,183 @@ +#!/bin/bash + +# Copyright 2008, 2009, 2012, 2013, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=python2 +SRCNAM=Python +VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . ) +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM +rm -rf $PKG +mkdir -p $TMP $PKG + +# Don't set any SLKCFLAGS here, or OPT="$SLKCFLAGS" before the ./configure. +# Python gets the compile options right without any help. +if [ "$ARCH" = "i586" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "arm" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "armel" ]; then + LIBDIRSUFFIX="" +fi + +# Location for Python site-packages: +SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages +# same as above without $PKG +TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages + +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xf $CWD/$SRCNAM-$VERSION.tar.xz || exit 1 +cd $SRCNAM-$VERSION || exit 1 + +zcat $CWD/python.readline.set_pre_input_hook.diff.gz | patch -p1 --verbose || exit 1 +# We don't want a large libpython*.a: +zcat $CWD/python.no-static-library.diff.gz | patch -p1 --verbose || exit 1 + +if [ "$ARCH" = "x86_64" ]; then + # Install to lib64 instead of lib and + # Python must report /usr/lib64/python2.7/site-packages as python_lib_dir: + zcat $CWD/python.x86_64.diff.gz | patch -p1 --verbose || exit 1 +fi + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Enable built-in SQLite module to load extensions +sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc/python2-$VERSION \ + --with-threads \ + --enable-ipv6 \ + --enable-shared \ + --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ + --without-ensurepip \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Install some python-demo files: +mkdir -p $PKG/usr/doc/python2-$VERSION +cp -a Demo $PKG/usr/doc/python2-$VERSION + +# We'll install the python-tools under site-packages: +mkdir -p $SITEPK +cp -a Tools/* $SITEPK + +mkdir -p $PKG/usr/doc/python2-$VERSION +mv $SITEPK/README $PKG/usr/doc/python2-$VERSION/README.python-tools +( cd $PKG/usr/doc/python2-$VERSION + ln -sf $TOOLSDIR Tools +) + +# Make a few useful symlinks: +mkdir -p $PKG/usr/bin +( cd $PKG/usr/bin + ln -sf $TOOLSDIR/pynche/pynche pynche + ln -sf $TOOLSDIR/i18n/msgfmt.py . + ln -sf $TOOLSDIR/i18n/pygettext.py . +) + +# Install docs: +mkdir -p $PKG/usr/doc/python2-$VERSION/Documentation +cp -a README LICENSE $PKG/usr/doc/python2-$VERSION +cp -a Misc $PKG/usr/doc/python2-$VERSION +tar xf $CWD/python-$VERSION-docs-text.tar.?z* +mv python-${VERSION}-docs-text/* $PKG/usr/doc/python2-$VERSION/Documentation +chown -R root:root $PKG/usr/doc/python2-$VERSION + +# Fix possible incorrect permissions: +( cd $PKG + find . -type d -exec chmod 755 "{}" \+ + find . -perm 640 -exec chmod 644 "{}" \+ + find . -perm 750 -exec chmod 755 "{}" \+ +) + + +( cd $PKG/usr/bin + rm -f python + ln -sf python${BRANCH_VERSION} python +) + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null +) + +( cd $PKG/usr/man + find . -type f -exec gzip -9 {} \+ + for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +) + +( cd $PKG/usr/man + if [ -r python${BRANCH_VERSION}.1.gz ] ; then + ln -sf python${BRANCH_VERSION}.1.gz python.1.gz + fi +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/python2-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/d/python2/slack-desc b/source/d/python2/slack-desc new file mode 100644 index 00000000..05d05ac1 --- /dev/null +++ b/source/d/python2/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +python2: python2 (object-oriented interpreted programming language, v2) +python2: +python2: Python is an interpreted, interactive, object-oriented programming +python2: language that combines remarkable power with very clear syntax. +python2: Python's basic power can be extended with your own modules written in +python2: C or C++. Python is also adaptable as an extension language for +python2: existing applications. +python2: +python2: Homepage: http://www.python.org +python2: +python2: diff --git a/source/l/M2Crypto/M2Crypto.SlackBuild b/source/l/M2Crypto/M2Crypto.SlackBuild index 28a7a45e..0491c1b7 100755 --- a/source/l/M2Crypto/M2Crypto.SlackBuild +++ b/source/l/M2Crypto/M2Crypto.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=M2Crypto VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -62,6 +62,7 @@ find . \ -exec chmod 644 {} \+ python setup.py install --root=$PKG || exit 1 +python3 setup.py install --root=$PKG || exit 1 mkdir -p $PKG/usr/doc/M2Crypto-$VERSION cp -a \ @@ -70,9 +71,9 @@ cp -a \ # Embed required dep typing module: cd $TMP -rm -rf typing-3.7.4 -tar xvf $CWD/typing-3.7.4.tar.xz || exit 1 -cd typing-3.7.4 || exit 1 +rm -rf typing-3.7.4.1 +tar xvf $CWD/typing-3.7.4.1.tar.xz || exit 1 +cd typing-3.7.4.1 || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -80,10 +81,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ python setup.py install --root=$PKG || exit 1 -mkdir -p $PKG/usr/doc/typing-3.7.4 +python3 setup.py install --root=$PKG || exit 1 +mkdir -p $PKG/usr/doc/typing-3.7.4.1 cp -a \ CHANGES INSTALL* LICENCE* PKG-INFO README* doc/* \ - $PKG/usr/doc/typing-3.7.4 + $PKG/usr/doc/typing-3.7.4.1 ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ diff --git a/source/l/harfbuzz/harfbuzz.url b/source/l/harfbuzz/harfbuzz.url new file mode 100644 index 00000000..29ce27a5 --- /dev/null +++ b/source/l/harfbuzz/harfbuzz.url @@ -0,0 +1 @@ +https://github.com/harfbuzz/harfbuzz/releases diff --git a/source/l/harfbuzz/slack-desc b/source/l/harfbuzz/slack-desc index 9ede2a02..798e33bf 100644 --- a/source/l/harfbuzz/slack-desc +++ b/source/l/harfbuzz/slack-desc @@ -10,7 +10,7 @@ harfbuzz: harfbuzz (OpenType text shaping engine) harfbuzz: harfbuzz: HarfBuzz is an OpenType text shaping engine. harfbuzz: -harfbuzz: Homepage: http://www.freedesktop.org/software/harfbuzz/release +harfbuzz: Homepage: http://harfbuzz.org harfbuzz: harfbuzz: harfbuzz: diff --git a/source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch b/source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch deleted file mode 100644 index f0dae9cb..00000000 --- a/source/l/libuv/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch +++ /dev/null @@ -1,484 +0,0 @@ -From 977be04762b9bda29a88d39bb3e2cb7c44b2ad22 Mon Sep 17 00:00:00 2001 -From: Ben Noordhuis -Date: Thu, 16 Apr 2020 09:59:03 +0200 -Subject: [PATCH] Revert "freebsd,linux: add recvmmsg() + sendmmsg() udp - implementation" - -This reverts commit 3d7136639a39db46bc4a9074922559a564e49514. -This reverts commit d9cd7d437d6bcea56355b6e0ef215aa64687d7a1. - -The first reverted commit is the sendmmsg/recvmmsg support, the second -one a fix-up to deliver datagrams in order. The second commit has been -implicated in causing bind9 to crash on freebsd. - -A quick review of the code suggests that downstream code written against -pre-v1.35.0 libuv can't safely deal with multi-datagram support because -they are unaware of the `UV_UDP_MMSG_CHUNK` flag and what that implies -for buffer management, hence I'm moving to revert it. - -The `UV_UDP_MMSG_CHUNK` flag remains part of `uv_udp_flags` for -API/ABI backwards compatibility reasons but it is no longer used. - -Fixes: https://github.com/libuv/libuv/issues/2791 -Refs: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245653 ---- - docs/src/udp.rst | 18 +--- - include/uv.h | 5 +- - src/unix/freebsd.c | 25 ----- - src/unix/internal.h | 24 ----- - src/unix/linux-syscalls.c | 1 - - src/unix/linux-syscalls.h | 14 +++ - src/unix/udp.c | 207 +------------------------------------- - 7 files changed, 22 insertions(+), 272 deletions(-) - -diff --git a/docs/src/udp.rst b/docs/src/udp.rst -index 786a28b030..53b1fea493 100644 ---- a/docs/src/udp.rst -+++ b/docs/src/udp.rst -@@ -42,11 +42,6 @@ Data types - * any traffic, in effect "stealing" the port from the previous listener. - */ - UV_UDP_REUSEADDR = 4 -- /* -- * Indicates that the message was received by recvmmsg, so the buffer provided -- * must not be freed by the recv_cb callback. -- */ -- UV_UDP_MMSG_CHUNK = 8 - }; - - .. c:type:: void (*uv_udp_send_cb)(uv_udp_send_t* req, int status) -@@ -67,18 +62,13 @@ Data types - * `buf`: :c:type:`uv_buf_t` with the received data. - * `addr`: ``struct sockaddr*`` containing the address of the sender. - Can be NULL. Valid for the duration of the callback only. -- * `flags`: One or more or'ed UV_UDP_* constants. -+ * `flags`: One or more or'ed UV_UDP_* constants. Right now only -+ ``UV_UDP_PARTIAL`` is used. - - The callee is responsible for freeing the buffer, libuv does not reuse it. - The buffer may be a null buffer (where `buf->base` == NULL and `buf->len` == 0) - on error. - -- When using :man:`recvmmsg(2)`, chunks will have the `UV_UDP_MMSG_CHUNK` flag set, -- those must not be freed. There will be a final callback with `nread` set to 0, -- `addr` set to NULL and the buffer pointing at the initially allocated data with -- the `UV_UDP_MMSG_CHUNK` flag cleared. This is a good chance for the callee to -- free the provided buffer. -- - .. note:: - The receive callback will be called with `nread` == 0 and `addr` == NULL when there is - nothing to read, and with `nread` == 0 and `addr` != NULL when an empty UDP packet is -@@ -376,10 +366,6 @@ API - - :returns: 0 on success, or an error code < 0 on failure. - -- .. versionchanged:: 1.35.0 added support for :man:`recvmmsg(2)` on supported platforms). -- The use of this feature requires a buffer larger than -- 2 * 64KB to be passed to `alloc_cb`. -- - .. c:function:: int uv_udp_recv_stop(uv_udp_t* handle) - - Stop listening for incoming datagrams. -diff --git a/include/uv.h b/include/uv.h -index 2e8072fdae..dd8c8a40b0 100644 ---- a/include/uv.h -+++ b/include/uv.h -@@ -1,4 +1,4 @@ --/* Copyright Joyent, Inc. and other Node contributors. All rights reserved. -+/* COPYRIGHT JOYENT, INC. AND OTHER NODE CONTRIBUTORS. ALL RIGHTS RESERVED. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to -@@ -607,8 +607,7 @@ enum uv_udp_flags { - */ - UV_UDP_REUSEADDR = 4, - /* -- * Indicates that the message was received by recvmmsg, so the buffer provided -- * must not be freed by the recv_cb callback. -+ * Unused. Here for API/ABI compatibility. - */ - UV_UDP_MMSG_CHUNK = 8 - }; -diff --git a/src/unix/freebsd.c b/src/unix/freebsd.c -index ef77e127c2..57bd04e240 100644 ---- a/src/unix/freebsd.c -+++ b/src/unix/freebsd.c -@@ -288,28 +288,3 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { - uv__free(cp_times); - return 0; - } -- -- --int uv__sendmmsg(int fd, -- struct uv__mmsghdr* mmsg, -- unsigned int vlen, -- unsigned int flags) { --#if __FreeBSD__ >= 11 -- return sendmmsg(fd, mmsg, vlen, flags); --#else -- return errno = ENOSYS, -1; --#endif --} -- -- --int uv__recvmmsg(int fd, -- struct uv__mmsghdr* mmsg, -- unsigned int vlen, -- unsigned int flags, -- struct timespec* timeout) { --#if __FreeBSD__ >= 11 -- return recvmmsg(fd, mmsg, vlen, flags, timeout); --#else -- return errno = ENOSYS, -1; --#endif --} -diff --git a/src/unix/internal.h b/src/unix/internal.h -index 598554b607..469fd7d2b8 100644 ---- a/src/unix/internal.h -+++ b/src/unix/internal.h -@@ -31,7 +31,6 @@ - #include /* O_CLOEXEC and O_NONBLOCK, if supported. */ - #include - #include --#include - - #if defined(__STRICT_ANSI__) - # define inline __inline -@@ -328,27 +327,4 @@ int uv__getsockpeername(const uv_handle_t* handle, - struct sockaddr* name, - int* namelen); - --#if defined(__linux__) || \ -- defined(__FreeBSD__) || \ -- defined(__FreeBSD_kernel__) --#define HAVE_MMSG 1 --struct uv__mmsghdr { -- struct msghdr msg_hdr; -- unsigned int msg_len; --}; -- --int uv__recvmmsg(int fd, -- struct uv__mmsghdr* mmsg, -- unsigned int vlen, -- unsigned int flags, -- struct timespec* timeout); --int uv__sendmmsg(int fd, -- struct uv__mmsghdr* mmsg, -- unsigned int vlen, -- unsigned int flags); --#else --#define HAVE_MMSG 0 --#endif -- -- - #endif /* UV_UNIX_INTERNAL_H_ */ -diff --git a/src/unix/linux-syscalls.c b/src/unix/linux-syscalls.c -index 742f26ada8..eb5a8fd274 100644 ---- a/src/unix/linux-syscalls.c -+++ b/src/unix/linux-syscalls.c -@@ -126,7 +126,6 @@ - # endif - #endif /* __NR_getrandom */ - --struct uv__mmsghdr; - - int uv__sendmmsg(int fd, - struct uv__mmsghdr* mmsg, -diff --git a/src/unix/linux-syscalls.h b/src/unix/linux-syscalls.h -index 2e8fa2a519..7ee1511a45 100644 ---- a/src/unix/linux-syscalls.h -+++ b/src/unix/linux-syscalls.h -@@ -61,6 +61,20 @@ struct uv__statx { - uint64_t unused1[14]; - }; - -+struct uv__mmsghdr { -+ struct msghdr msg_hdr; -+ unsigned int msg_len; -+}; -+ -+int uv__recvmmsg(int fd, -+ struct uv__mmsghdr* mmsg, -+ unsigned int vlen, -+ unsigned int flags, -+ struct timespec* timeout); -+int uv__sendmmsg(int fd, -+ struct uv__mmsghdr* mmsg, -+ unsigned int vlen, -+ unsigned int flags); - ssize_t uv__preadv(int fd, const struct iovec *iov, int iovcnt, int64_t offset); - ssize_t uv__pwritev(int fd, const struct iovec *iov, int iovcnt, int64_t offset); - int uv__dup3(int oldfd, int newfd, int flags); -diff --git a/src/unix/udp.c b/src/unix/udp.c -index f2fcae1760..982059ff48 100644 ---- a/src/unix/udp.c -+++ b/src/unix/udp.c -@@ -32,8 +32,6 @@ - #endif - #include - --#define UV__UDP_DGRAM_MAXSIZE (64 * 1024) -- - #if defined(IPV6_JOIN_GROUP) && !defined(IPV6_ADD_MEMBERSHIP) - # define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP - #endif -@@ -51,36 +49,6 @@ static int uv__udp_maybe_deferred_bind(uv_udp_t* handle, - int domain, - unsigned int flags); - --#if HAVE_MMSG -- --#define UV__MMSG_MAXWIDTH 20 -- --static int uv__udp_recvmmsg(uv_udp_t* handle, uv_buf_t* buf); --static void uv__udp_sendmmsg(uv_udp_t* handle); -- --static int uv__recvmmsg_avail; --static int uv__sendmmsg_avail; --static uv_once_t once = UV_ONCE_INIT; -- --static void uv__udp_mmsg_init(void) { -- int ret; -- int s; -- s = uv__socket(AF_INET, SOCK_DGRAM, 0); -- if (s < 0) -- return; -- ret = uv__sendmmsg(s, NULL, 0, 0); -- if (ret == 0 || errno != ENOSYS) { -- uv__sendmmsg_avail = 1; -- uv__recvmmsg_avail = 1; -- } else { -- ret = uv__recvmmsg(s, NULL, 0, 0, NULL); -- if (ret == 0 || errno != ENOSYS) -- uv__recvmmsg_avail = 1; -- } -- uv__close(s); --} -- --#endif - - void uv__udp_close(uv_udp_t* handle) { - uv__io_close(handle->loop, &handle->io_watcher); -@@ -180,61 +148,6 @@ static void uv__udp_io(uv_loop_t* loop, uv__io_t* w, unsigned int revents) { - } - } - --#if HAVE_MMSG --static int uv__udp_recvmmsg(uv_udp_t* handle, uv_buf_t* buf) { -- struct sockaddr_in6 peers[UV__MMSG_MAXWIDTH]; -- struct iovec iov[UV__MMSG_MAXWIDTH]; -- struct uv__mmsghdr msgs[UV__MMSG_MAXWIDTH]; -- ssize_t nread; -- uv_buf_t chunk_buf; -- size_t chunks; -- int flags; -- size_t k; -- -- /* prepare structures for recvmmsg */ -- chunks = buf->len / UV__UDP_DGRAM_MAXSIZE; -- if (chunks > ARRAY_SIZE(iov)) -- chunks = ARRAY_SIZE(iov); -- for (k = 0; k < chunks; ++k) { -- iov[k].iov_base = buf->base + k * UV__UDP_DGRAM_MAXSIZE; -- iov[k].iov_len = UV__UDP_DGRAM_MAXSIZE; -- msgs[k].msg_hdr.msg_iov = iov + k; -- msgs[k].msg_hdr.msg_iovlen = 1; -- msgs[k].msg_hdr.msg_name = peers + k; -- msgs[k].msg_hdr.msg_namelen = sizeof(peers[0]); -- } -- -- do -- nread = uv__recvmmsg(handle->io_watcher.fd, msgs, chunks, 0, NULL); -- while (nread == -1 && errno == EINTR); -- -- if (nread < 1) { -- if (nread == 0 || errno == EAGAIN || errno == EWOULDBLOCK) -- handle->recv_cb(handle, 0, buf, NULL, 0); -- else -- handle->recv_cb(handle, UV__ERR(errno), buf, NULL, 0); -- } else { -- /* pass each chunk to the application */ -- for (k = 0; k < (size_t) nread && handle->recv_cb != NULL; k++) { -- flags = UV_UDP_MMSG_CHUNK; -- if (msgs[k].msg_hdr.msg_flags & MSG_TRUNC) -- flags |= UV_UDP_PARTIAL; -- -- chunk_buf = uv_buf_init(iov[k].iov_base, iov[k].iov_len); -- handle->recv_cb(handle, -- msgs[k].msg_len, -- &chunk_buf, -- msgs[k].msg_hdr.msg_name, -- flags); -- } -- -- /* one last callback so the original buffer is freed */ -- if (handle->recv_cb != NULL) -- handle->recv_cb(handle, 0, buf, NULL, 0); -- } -- return nread; --} --#endif - - static void uv__udp_recvmsg(uv_udp_t* handle) { - struct sockaddr_storage peer; -@@ -254,27 +167,13 @@ static void uv__udp_recvmsg(uv_udp_t* handle) { - - do { - buf = uv_buf_init(NULL, 0); -- handle->alloc_cb((uv_handle_t*) handle, UV__UDP_DGRAM_MAXSIZE, &buf); -+ handle->alloc_cb((uv_handle_t*) handle, 64 * 1024, &buf); - if (buf.base == NULL || buf.len == 0) { - handle->recv_cb(handle, UV_ENOBUFS, &buf, NULL, 0); - return; - } - assert(buf.base != NULL); - --#if HAVE_MMSG -- uv_once(&once, uv__udp_mmsg_init); -- if (uv__recvmmsg_avail) { -- /* Returned space for more than 1 datagram, use it to receive -- * multiple datagrams. */ -- if (buf.len >= 2 * UV__UDP_DGRAM_MAXSIZE) { -- nread = uv__udp_recvmmsg(handle, &buf); -- if (nread > 0) -- count -= nread; -- continue; -- } -- } --#endif -- - memset(&h, 0, sizeof(h)); - memset(&peer, 0, sizeof(peer)); - h.msg_name = &peer; -@@ -300,120 +199,21 @@ static void uv__udp_recvmsg(uv_udp_t* handle) { - - handle->recv_cb(handle, nread, &buf, (const struct sockaddr*) &peer, flags); - } -- count--; - } - /* recv_cb callback may decide to pause or close the handle */ - while (nread != -1 -- && count > 0 -+ && count-- > 0 - && handle->io_watcher.fd != -1 - && handle->recv_cb != NULL); - } - --#if HAVE_MMSG --static void uv__udp_sendmmsg(uv_udp_t* handle) { -- uv_udp_send_t* req; -- struct uv__mmsghdr h[UV__MMSG_MAXWIDTH]; -- struct uv__mmsghdr *p; -- QUEUE* q; -- ssize_t npkts; -- size_t pkts; -- size_t i; -- -- if (QUEUE_EMPTY(&handle->write_queue)) -- return; -- --write_queue_drain: -- for (pkts = 0, q = QUEUE_HEAD(&handle->write_queue); -- pkts < UV__MMSG_MAXWIDTH && q != &handle->write_queue; -- ++pkts, q = QUEUE_HEAD(q)) { -- assert(q != NULL); -- req = QUEUE_DATA(q, uv_udp_send_t, queue); -- assert(req != NULL); -- -- p = &h[pkts]; -- memset(p, 0, sizeof(*p)); -- if (req->addr.ss_family == AF_UNSPEC) { -- p->msg_hdr.msg_name = NULL; -- p->msg_hdr.msg_namelen = 0; -- } else { -- p->msg_hdr.msg_name = &req->addr; -- if (req->addr.ss_family == AF_INET6) -- p->msg_hdr.msg_namelen = sizeof(struct sockaddr_in6); -- else if (req->addr.ss_family == AF_INET) -- p->msg_hdr.msg_namelen = sizeof(struct sockaddr_in); -- else if (req->addr.ss_family == AF_UNIX) -- p->msg_hdr.msg_namelen = sizeof(struct sockaddr_un); -- else { -- assert(0 && "unsupported address family"); -- abort(); -- } -- } -- h[pkts].msg_hdr.msg_iov = (struct iovec*) req->bufs; -- h[pkts].msg_hdr.msg_iovlen = req->nbufs; -- } -- -- do -- npkts = uv__sendmmsg(handle->io_watcher.fd, h, pkts, 0); -- while (npkts == -1 && errno == EINTR); -- -- if (npkts < 1) { -- if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS) -- return; -- for (i = 0, q = QUEUE_HEAD(&handle->write_queue); -- i < pkts && q != &handle->write_queue; -- ++i, q = QUEUE_HEAD(q)) { -- assert(q != NULL); -- req = QUEUE_DATA(q, uv_udp_send_t, queue); -- assert(req != NULL); -- -- req->status = UV__ERR(errno); -- QUEUE_REMOVE(&req->queue); -- QUEUE_INSERT_TAIL(&handle->write_completed_queue, &req->queue); -- } -- uv__io_feed(handle->loop, &handle->io_watcher); -- return; -- } -- -- for (i = 0, q = QUEUE_HEAD(&handle->write_queue); -- i < pkts && q != &handle->write_queue; -- ++i, q = QUEUE_HEAD(&handle->write_queue)) { -- assert(q != NULL); -- req = QUEUE_DATA(q, uv_udp_send_t, queue); -- assert(req != NULL); -- -- req->status = req->bufs[0].len; -- -- /* Sending a datagram is an atomic operation: either all data -- * is written or nothing is (and EMSGSIZE is raised). That is -- * why we don't handle partial writes. Just pop the request -- * off the write queue and onto the completed queue, done. -- */ -- QUEUE_REMOVE(&req->queue); -- QUEUE_INSERT_TAIL(&handle->write_completed_queue, &req->queue); -- } -- -- /* couldn't batch everything, continue sending (jump to avoid stack growth) */ -- if (!QUEUE_EMPTY(&handle->write_queue)) -- goto write_queue_drain; -- uv__io_feed(handle->loop, &handle->io_watcher); -- return; --} --#endif - - static void uv__udp_sendmsg(uv_udp_t* handle) { - uv_udp_send_t* req; -- struct msghdr h; - QUEUE* q; -+ struct msghdr h; - ssize_t size; - --#if HAVE_MMSG -- uv_once(&once, uv__udp_mmsg_init); -- if (uv__sendmmsg_avail) { -- uv__udp_sendmmsg(handle); -- return; -- } --#endif -- - while (!QUEUE_EMPTY(&handle->write_queue)) { - q = QUEUE_HEAD(&handle->write_queue); - assert(q != NULL); -@@ -463,6 +263,7 @@ static void uv__udp_sendmsg(uv_udp_t* handle) { - } - } - -+ - /* On the BSDs, SO_REUSEPORT implies SO_REUSEADDR but with some additional - * refinements for programs that use multicast. - * - diff --git a/source/l/libuv/libuv.SlackBuild b/source/l/libuv/libuv.SlackBuild index 4e182fa9..716c1c92 100755 --- a/source/l/libuv/libuv.SlackBuild +++ b/source/l/libuv/libuv.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libuv VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -85,9 +85,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Revert commits that cause BIND to crash: -zcat $CWD/libuv.977be04762b9bda29a88d39bb3e2cb7c44b2ad22.patch.gz | patch -p1 --verbose || exit 1 - if [ ! -r configure ]; then NOCONFIGURE=1 ./autogen.sh fi diff --git a/source/l/oniguruma/oniguruma.SlackBuild b/source/l/oniguruma/oniguruma.SlackBuild index 2699ab61..68573881 100755 --- a/source/l/oniguruma/oniguruma.SlackBuild +++ b/source/l/oniguruma/oniguruma.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=oniguruma -SRCNAM=onig +SRCNAM=oniguruma VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} @@ -86,6 +86,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +if [ ! -r configure ]; then + NOCONFIGURE=1 ./autogen.sh +fi + # Configure, build, and install: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ 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 -- cgit v1.2.3