diff -Nru libdrilbo-0.2.10/aclocal.m4 libdrilbo-0.2.11/aclocal.m4 --- libdrilbo-0.2.10/aclocal.m4 2017-04-08 19:37:49.000000000 +0000 +++ libdrilbo-0.2.11/aclocal.m4 2017-09-04 20:12:51.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,9 +20,9 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 12 (pkg-config-0.29.2) - +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -63,7 +63,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.2]) +[m4_define([PKG_MACROS_VERSION], [0.29]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $2]) +AC_MSG_CHECKING([for $1]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -195,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -296,7 +296,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -311,7 +311,7 @@ [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -327,12 +327,12 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -394,7 +394,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -446,7 +446,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -477,7 +477,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -668,7 +668,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -744,7 +744,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -941,7 +941,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -962,7 +962,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -983,7 +983,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1033,7 +1033,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1072,7 +1072,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1101,7 +1101,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1148,7 +1148,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1167,7 +1167,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1248,7 +1248,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1308,7 +1308,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1336,7 +1336,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1355,7 +1355,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru libdrilbo-0.2.10/ar-lib libdrilbo-0.2.11/ar-lib --- libdrilbo-0.2.10/ar-lib 2017-04-08 19:37:51.000000000 +0000 +++ libdrilbo-0.2.11/ar-lib 2017-09-04 20:12:51.000000000 +0000 @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2017 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify diff -Nru libdrilbo-0.2.10/CHANGELOG.txt libdrilbo-0.2.11/CHANGELOG.txt --- libdrilbo-0.2.10/CHANGELOG.txt 2017-04-08 19:39:33.000000000 +0000 +++ libdrilbo-0.2.11/CHANGELOG.txt 2017-09-04 20:12:51.000000000 +0000 @@ -1,4 +1,11 @@ + Version 0.2.11 -- September 3, 2017 + - Fix superfluous libraries and includes during install when using $DESTDIR, + addressing github issue #21. + - Added missing contributor phrasing to BSD-3 clause. The resulting license + now exactly matches the wording used on Github and so also makes the + license detection work. + Version 0.2.10 -- April 8, 2017 - Fixed drilbo to correctly ignore drilbo-x11.c when configured with "--disable-x11". diff -Nru libdrilbo-0.2.10/config-libs.m4 libdrilbo-0.2.11/config-libs.m4 --- libdrilbo-0.2.10/config-libs.m4 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/config-libs.m4 2017-09-04 20:12:50.000000000 +0000 @@ -1,22 +1,24 @@ AS_IF([test "x$enable_x11" != "xno"], [ - PKG_CHECK_MODULES([x11], [x11]) - AS_IF([test "x$libdrilbo_reqs" != "x"], [ - libdrilbo_reqs+=", " - ]) - libdrilbo_reqs+="x11" + PKG_CHECK_MODULES( + [libx11], + [x11], + [AS_IF([test "x$libdrilbo_reqs" != "x"], [ + libdrilbo_reqs+=", " + ]) + libdrilbo_reqs+="x11"]) ]) AS_IF([test "x$enable_jpeg" != "xno"], [ PKG_CHECK_MODULES( - [jpeg], - [jpeg], + [libjpeg], + [libjpeg], [AS_IF([test "x$libdrilbo_reqs" != "x"], [ - libdrilbo_reqs+=", " + libdrilbo_reqs+=", " ]) - libdrilbo_reqs+="jpeg" ], + libdrilbo_reqs+="libjpeg"], [for dir in $with_jpeg_includedir /usr/include /usr/local/include /opt/local/include ; do - AC_MSG_CHECKING(for $dir/jpeglib.h) + AC_MSG_CHECKING(for jpeglib.h in $dir) if [ test -e $dir/jpeglib.h ]; then AC_MSG_RESULT(yes) jpeglib_h_dir=$dir @@ -27,11 +29,13 @@ done if [ test "x$jpeglib_h_dir" == "x"] ; then echo "Could not find libjpeg.h." - echo "Try setting the location using --with-jpeg-libdir." + echo "Try setting the location using --with-jpeg-includedir." exit fi - libdrilbo_nonpkg_cflags+="-I$jpeglib_h_dir" + libjpeg_nonpkg_cflags+="-I$jpeglib_h_dir" + libjpeg_CFLAGS="-I$jpeglib_h_dir" + CFLAGS_SAVED=$CFLAGS LIBS_SAVED=$LIBS LDFLAGS_SAVED=$LDFLAGS LIBS="-ljpeg" @@ -55,15 +59,19 @@ fi LIBS=$LIBS_SAVED LDFLAGS=$LDFLAGS_SAVED - libdrilbo_nonpkg_libs="-L$jpeglib_l_dir -ljpeg" + CFLAGS=$CFLAGS_SAVED + libjpeg_nonpkg_libs="-L$jpeglib_l_dir -ljpeg" + libjpeg_LIBS="-L$jpeglib_l_dir -ljpeg" ]) ]) AS_IF([test "x$enable_png" != "xno"], [ - PKG_CHECK_MODULES([png], [libpng >= 1.2]) - AS_IF([test "x$libdrilbo_reqs" != "x"], [ - libdrilbo_reqs+=", " - ]) - libdrilbo_reqs+="libpng >= 1.2" + PKG_CHECK_MODULES( + [libpng], + [libpng >= 1.2], + [AS_IF([test "x$libdrilbo_reqs" != "x"], [ + libdrilbo_reqs+=", " + ]) + libdrilbo_reqs+="libpng >= 1.2"]) ]) diff -Nru libdrilbo-0.2.10/config-subst.m4 libdrilbo-0.2.11/config-subst.m4 --- libdrilbo-0.2.10/config-subst.m4 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/config-subst.m4 2017-09-04 20:12:50.000000000 +0000 @@ -6,6 +6,6 @@ # The $build_prefix, $build_prefix_cflags and $build_prefix_libs are # pre-defined by fizmo-dist. -AC_SUBST([libdrilbo_CFLAGS], "-I$build_prefix_cflags $x11_CFLAGS $jpeg_CFLAGS $libdrilbo_nonpkg_cflags $png_CFLAGS") -AC_SUBST([libdrilbo_LIBS], "-L$build_prefix_libs -ldrilbo -lpthread $x11_LIBS $jpeg_LIBS $libdrilbo_nonpkg_libs $png_LIBS") +AC_SUBST([libdrilbo_CFLAGS], "-I$build_prefix_cflags $libx11_CFLAGS $libjpeg_CFLAGS $libjpeg_nonpkg_cflags $libpng_CFLAGS") +AC_SUBST([libdrilbo_LIBS], "-L$build_prefix_libs -ldrilbo -lpthread $libx11_LIBS $libjpeg_LIBS $libjpeg_nonpkg_libs $libpng_LIBS") diff -Nru libdrilbo-0.2.10/configure libdrilbo-0.2.11/configure --- libdrilbo-0.2.10/configure 2017-04-08 19:37:50.000000000 +0000 +++ libdrilbo-0.2.11/configure 2017-09-04 20:12:51.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libdrilbo 0.2.10. +# Generated by GNU Autoconf 2.69 for libdrilbo 0.2.11. # # Report bugs to . # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='libdrilbo' PACKAGE_TARNAME='libdrilbo' -PACKAGE_VERSION='0.2.10' -PACKAGE_STRING='libdrilbo 0.2.10' +PACKAGE_VERSION='0.2.11' +PACKAGE_STRING='libdrilbo 0.2.11' PACKAGE_BUGREPORT='fizmo@spellbreaker.org' PACKAGE_URL='' @@ -596,8 +596,12 @@ ENABLE_X11_TRUE ENABLE_TRACING_FALSE ENABLE_TRACING_TRUE -LIBDRILBO_NONPKG_LIBS -LIBDRILBO_NONPKG_CFLAGS +LIBPNG_NONPKG_LIBS +LIBPNG_NONPKG_CFLAGS +LIBJPEG_NONPKG_LIBS +LIBJPEG_NONPKG_CFLAGS +LIBX11_NONPKG_LIBS +LIBX11_NONPKG_CFLAGS LIBDRILBO_REQS FIZMO_DIST_BUILD_FALSE FIZMO_DIST_BUILD_TRUE @@ -641,8 +645,8 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -png_LIBS -png_CFLAGS +libpng_LIBS +libpng_CFLAGS OBJEXT EXEEXT ac_ct_CC @@ -650,10 +654,10 @@ LDFLAGS CFLAGS CC -jpeg_LIBS -jpeg_CFLAGS -x11_LIBS -x11_CFLAGS +libjpeg_LIBS +libjpeg_CFLAGS +libx11_LIBS +libx11_CFLAGS libfizmo_LIBS libfizmo_CFLAGS PKG_CONFIG_LIBDIR @@ -678,6 +682,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -717,17 +722,17 @@ PKG_CONFIG_LIBDIR libfizmo_CFLAGS libfizmo_LIBS -x11_CFLAGS -x11_LIBS -jpeg_CFLAGS -jpeg_LIBS +libx11_CFLAGS +libx11_LIBS +libjpeg_CFLAGS +libjpeg_LIBS CC CFLAGS LDFLAGS LIBS CPPFLAGS -png_CFLAGS -png_LIBS' +libpng_CFLAGS +libpng_LIBS' # Initialize some variables set by options. @@ -766,6 +771,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1018,6 +1024,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1155,7 +1170,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1268,7 +1283,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libdrilbo 0.2.10 to adapt to many kinds of systems. +\`configure' configures libdrilbo 0.2.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1308,6 +1323,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1343,7 +1359,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libdrilbo 0.2.10:";; + short | recursive ) echo "Configuration of libdrilbo 0.2.11:";; esac cat <<\_ACEOF --enable-dependency-tracking @@ -1369,10 +1385,13 @@ C compiler flags for libfizmo, overriding pkg-config libfizmo_LIBS linker flags for libfizmo, overriding pkg-config - x11_CFLAGS C compiler flags for x11, overriding pkg-config - x11_LIBS linker flags for x11, overriding pkg-config - jpeg_CFLAGS C compiler flags for jpeg, overriding pkg-config - jpeg_LIBS linker flags for jpeg, overriding pkg-config + libx11_CFLAGS + C compiler flags for libx11, overriding pkg-config + libx11_LIBS linker flags for libx11, overriding pkg-config + libjpeg_CFLAGS + C compiler flags for libjpeg, overriding pkg-config + libjpeg_LIBS + linker flags for libjpeg, overriding pkg-config CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a @@ -1380,8 +1399,9 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - png_CFLAGS C compiler flags for png, overriding pkg-config - png_LIBS linker flags for png, overriding pkg-config + libpng_CFLAGS + C compiler flags for libpng, overriding pkg-config + libpng_LIBS linker flags for libpng, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1449,7 +1469,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libdrilbo configure 0.2.10 +libdrilbo configure 0.2.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1550,7 +1570,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libdrilbo $as_me 0.2.10, which was +It was created by libdrilbo $as_me 0.2.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1929,7 +1949,7 @@ -libdrilbo_reqs="libfizmo >= 0.7.14" +libdrilbo_reqs="libfizmo >= 0.7.15" libdrilbo_nonpkg_cflags="" libdrilbo_nonpkg_libs="" @@ -2055,19 +2075,19 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfizmo >= 0.7.14" >&5 -$as_echo_n "checking for libfizmo >= 0.7.14... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfizmo" >&5 +$as_echo_n "checking for libfizmo... " >&6; } if test -n "$libfizmo_CFLAGS"; then pkg_cv_libfizmo_CFLAGS="$libfizmo_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfizmo >= 0.7.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libfizmo >= 0.7.14") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfizmo >= 0.7.15\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libfizmo >= 0.7.15") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libfizmo_CFLAGS=`$PKG_CONFIG --cflags "libfizmo >= 0.7.14" 2>/dev/null` + pkg_cv_libfizmo_CFLAGS=`$PKG_CONFIG --cflags "libfizmo >= 0.7.15" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -2079,12 +2099,12 @@ pkg_cv_libfizmo_LIBS="$libfizmo_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfizmo >= 0.7.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libfizmo >= 0.7.14") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libfizmo >= 0.7.15\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libfizmo >= 0.7.15") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libfizmo_LIBS=`$PKG_CONFIG --libs "libfizmo >= 0.7.14" 2>/dev/null` + pkg_cv_libfizmo_LIBS=`$PKG_CONFIG --libs "libfizmo >= 0.7.15" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -2096,7 +2116,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -2105,14 +2125,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libfizmo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libfizmo >= 0.7.14" 2>&1` + libfizmo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libfizmo >= 0.7.15" 2>&1` else - libfizmo_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libfizmo >= 0.7.14" 2>&1` + libfizmo_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libfizmo >= 0.7.15" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$libfizmo_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libfizmo >= 0.7.14) were not met: + as_fn_error $? "Package requirements (libfizmo >= 0.7.15) were not met: $libfizmo_PKG_ERRORS @@ -2123,7 +2143,7 @@ and libfizmo_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -2150,11 +2170,11 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11" >&5 -$as_echo_n "checking for x11... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libx11" >&5 +$as_echo_n "checking for libx11... " >&6; } -if test -n "$x11_CFLAGS"; then - pkg_cv_x11_CFLAGS="$x11_CFLAGS" +if test -n "$libx11_CFLAGS"; then + pkg_cv_libx11_CFLAGS="$libx11_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 @@ -2162,7 +2182,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_x11_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` + pkg_cv_libx11_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -2170,8 +2190,8 @@ else pkg_failed=untried fi -if test -n "$x11_LIBS"; then - pkg_cv_x11_LIBS="$x11_LIBS" +if test -n "$libx11_LIBS"; then + pkg_cv_libx11_LIBS="$libx11_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 @@ -2179,7 +2199,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_x11_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` + pkg_cv_libx11_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -2191,7 +2211,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -2200,25 +2220,25 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - x11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11" 2>&1` + libx11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11" 2>&1` else - x11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11" 2>&1` + libx11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$x11_PKG_ERRORS" >&5 + echo "$libx11_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (x11) were not met: -$x11_PKG_ERRORS +$libx11_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables x11_CFLAGS -and x11_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables libx11_CFLAGS +and libx11_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -2226,25 +2246,24 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables x11_CFLAGS -and x11_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables libx11_CFLAGS +and libx11_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - x11_CFLAGS=$pkg_cv_x11_CFLAGS - x11_LIBS=$pkg_cv_x11_LIBS + libx11_CFLAGS=$pkg_cv_libx11_CFLAGS + libx11_LIBS=$pkg_cv_libx11_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + if test "x$libdrilbo_reqs" != "x"; then : -fi - if test "x$libdrilbo_reqs" != "x"; then : - - libdrilbo_reqs+=", " + libdrilbo_reqs+=", " fi - libdrilbo_reqs+="x11" + libdrilbo_reqs+="x11" +fi fi @@ -3104,19 +3123,19 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg" >&5 -$as_echo_n "checking for jpeg... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5 +$as_echo_n "checking for libjpeg... " >&6; } -if test -n "$jpeg_CFLAGS"; then - pkg_cv_jpeg_CFLAGS="$jpeg_CFLAGS" +if test -n "$libjpeg_CFLAGS"; then + pkg_cv_libjpeg_CFLAGS="$libjpeg_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jpeg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "jpeg") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_jpeg_CFLAGS=`$PKG_CONFIG --cflags "jpeg" 2>/dev/null` + pkg_cv_libjpeg_CFLAGS=`$PKG_CONFIG --cflags "libjpeg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -3124,16 +3143,16 @@ else pkg_failed=untried fi -if test -n "$jpeg_LIBS"; then - pkg_cv_jpeg_LIBS="$jpeg_LIBS" +if test -n "$libjpeg_LIBS"; then + pkg_cv_libjpeg_LIBS="$libjpeg_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jpeg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "jpeg") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_jpeg_LIBS=`$PKG_CONFIG --libs "jpeg" 2>/dev/null` + pkg_cv_libjpeg_LIBS=`$PKG_CONFIG --libs "libjpeg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -3145,7 +3164,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -3154,16 +3173,16 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - jpeg_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jpeg" 2>&1` + libjpeg_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libjpeg" 2>&1` else - jpeg_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jpeg" 2>&1` + libjpeg_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libjpeg" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$jpeg_PKG_ERRORS" >&5 + echo "$libjpeg_PKG_ERRORS" >&5 for dir in $with_jpeg_includedir /usr/include /usr/local/include /opt/local/include ; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/jpeglib.h" >&5 -$as_echo_n "checking for $dir/jpeglib.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h in $dir" >&5 +$as_echo_n "checking for jpeglib.h in $dir... " >&6; } if test -e $dir/jpeglib.h ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3176,11 +3195,13 @@ done if test "x$jpeglib_h_dir" == "x" ; then echo "Could not find libjpeg.h." - echo "Try setting the location using --with-jpeg-libdir." + echo "Try setting the location using --with-jpeg-includedir." exit fi - libdrilbo_nonpkg_cflags+="-I$jpeglib_h_dir" + libjpeg_nonpkg_cflags+="-I$jpeglib_h_dir" + libjpeg_CFLAGS="-I$jpeglib_h_dir" + CFLAGS_SAVED=$CFLAGS LIBS_SAVED=$LIBS LDFLAGS_SAVED=$LDFLAGS LIBS="-ljpeg" @@ -3220,14 +3241,16 @@ fi LIBS=$LIBS_SAVED LDFLAGS=$LDFLAGS_SAVED - libdrilbo_nonpkg_libs="-L$jpeglib_l_dir -ljpeg" + CFLAGS=$CFLAGS_SAVED + libjpeg_nonpkg_libs="-L$jpeglib_l_dir -ljpeg" + libjpeg_LIBS="-L$jpeglib_l_dir -ljpeg" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } for dir in $with_jpeg_includedir /usr/include /usr/local/include /opt/local/include ; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/jpeglib.h" >&5 -$as_echo_n "checking for $dir/jpeglib.h... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h in $dir" >&5 +$as_echo_n "checking for jpeglib.h in $dir... " >&6; } if test -e $dir/jpeglib.h ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3240,11 +3263,13 @@ done if test "x$jpeglib_h_dir" == "x" ; then echo "Could not find libjpeg.h." - echo "Try setting the location using --with-jpeg-libdir." + echo "Try setting the location using --with-jpeg-includedir." exit fi - libdrilbo_nonpkg_cflags+="-I$jpeglib_h_dir" + libjpeg_nonpkg_cflags+="-I$jpeglib_h_dir" + libjpeg_CFLAGS="-I$jpeglib_h_dir" + CFLAGS_SAVED=$CFLAGS LIBS_SAVED=$LIBS LDFLAGS_SAVED=$LDFLAGS LIBS="-ljpeg" @@ -3284,19 +3309,21 @@ fi LIBS=$LIBS_SAVED LDFLAGS=$LDFLAGS_SAVED - libdrilbo_nonpkg_libs="-L$jpeglib_l_dir -ljpeg" + CFLAGS=$CFLAGS_SAVED + libjpeg_nonpkg_libs="-L$jpeglib_l_dir -ljpeg" + libjpeg_LIBS="-L$jpeglib_l_dir -ljpeg" else - jpeg_CFLAGS=$pkg_cv_jpeg_CFLAGS - jpeg_LIBS=$pkg_cv_jpeg_LIBS + libjpeg_CFLAGS=$pkg_cv_libjpeg_CFLAGS + libjpeg_LIBS=$pkg_cv_libjpeg_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } if test "x$libdrilbo_reqs" != "x"; then : - libdrilbo_reqs+=", " + libdrilbo_reqs+=", " fi - libdrilbo_reqs+="jpeg" + libdrilbo_reqs+="libjpeg" fi fi @@ -3305,11 +3332,11 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng >= 1.2" >&5 -$as_echo_n "checking for libpng >= 1.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5 +$as_echo_n "checking for libpng... " >&6; } -if test -n "$png_CFLAGS"; then - pkg_cv_png_CFLAGS="$png_CFLAGS" +if test -n "$libpng_CFLAGS"; then + pkg_cv_libpng_CFLAGS="$libpng_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2\""; } >&5 @@ -3317,7 +3344,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2" 2>/dev/null` + pkg_cv_libpng_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -3325,8 +3352,8 @@ else pkg_failed=untried fi -if test -n "$png_LIBS"; then - pkg_cv_png_LIBS="$png_LIBS" +if test -n "$libpng_LIBS"; then + pkg_cv_libpng_LIBS="$libpng_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2\""; } >&5 @@ -3334,7 +3361,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_png_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2" 2>/dev/null` + pkg_cv_libpng_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -3346,7 +3373,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -3355,25 +3382,25 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - png_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng >= 1.2" 2>&1` + libpng_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng >= 1.2" 2>&1` else - png_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng >= 1.2" 2>&1` + libpng_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng >= 1.2" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$png_PKG_ERRORS" >&5 + echo "$libpng_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (libpng >= 1.2) were not met: -$png_PKG_ERRORS +$libpng_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables png_CFLAGS -and png_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables libpng_CFLAGS +and libpng_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -3381,25 +3408,24 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables png_CFLAGS -and png_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables libpng_CFLAGS +and libpng_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - png_CFLAGS=$pkg_cv_png_CFLAGS - png_LIBS=$pkg_cv_png_LIBS + libpng_CFLAGS=$pkg_cv_libpng_CFLAGS + libpng_LIBS=$pkg_cv_libpng_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + if test "x$libdrilbo_reqs" != "x"; then : -fi - if test "x$libdrilbo_reqs" != "x"; then : - - libdrilbo_reqs+=", " + libdrilbo_reqs+=", " fi - libdrilbo_reqs+="libpng >= 1.2" + libdrilbo_reqs+="libpng >= 1.2" +fi fi @@ -3951,7 +3977,7 @@ # Define the identity of the package. PACKAGE='libdrilbo' - VERSION='0.2.10' + VERSION='0.2.11' cat >>confdefs.h <<_ACEOF @@ -5045,9 +5071,17 @@ LIBDRILBO_REQS=$libdrilbo_reqs -LIBDRILBO_NONPKG_CFLAGS=$libdrilbo_nonpkg_cflags +LIBX11_NONPKG_CFLAGS=$libx11_nonpkg_cflags + +LIBX11_NONPKG_LIBS=$libx11_nonpkg_libs + +LIBJPEG_NONPKG_CFLAGS=$libjpeg_nonpkg_cflags + +LIBJPEG_NONPKG_LIBS=$libjpeg_nonpkg_libs + +LIBPNG_NONPKG_CFLAGS=$libpng_nonpkg_cflags -LIBDRILBO_NONPKG_LIBS=$libdrilbo_nonpkg_libs +LIBPNG_NONPKG_LIBS=$libpng_nonpkg_libs if test "$enable_tracing" = "yes"; then @@ -5677,7 +5711,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libdrilbo $as_me 0.2.10, which was +This file was extended by libdrilbo $as_me 0.2.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5734,7 +5768,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libdrilbo config.status 0.2.10 +libdrilbo config.status 0.2.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru libdrilbo-0.2.10/configure.ac libdrilbo-0.2.11/configure.ac --- libdrilbo-0.2.10/configure.ac 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/configure.ac 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# 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. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR +# CONTRIBUTORS 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. AC_ARG_ENABLE([tracing], @@ -45,17 +47,17 @@ AC_INIT( [libdrilbo], - [0.2.10], + [0.2.11], fizmo@spellbreaker.org, libdrilbo) AC_CONFIG_AUX_DIR([.]) -libdrilbo_reqs="libfizmo >= 0.7.14" +libdrilbo_reqs="libfizmo >= 0.7.15" libdrilbo_nonpkg_cflags="" libdrilbo_nonpkg_libs="" -PKG_CHECK_MODULES([libfizmo], [libfizmo >= 0.7.14]) +PKG_CHECK_MODULES([libfizmo], [libfizmo >= 0.7.15]) m4_include(config-libs.m4) @@ -67,8 +69,12 @@ AM_CONDITIONAL([FIZMO_DIST_BUILD], [test "x" = ""]) AC_SUBST([LIBDRILBO_REQS], $libdrilbo_reqs) -AC_SUBST([LIBDRILBO_NONPKG_CFLAGS], $libdrilbo_nonpkg_cflags) -AC_SUBST([LIBDRILBO_NONPKG_LIBS], $libdrilbo_nonpkg_libs) +AC_SUBST([LIBX11_NONPKG_CFLAGS], $libx11_nonpkg_cflags) +AC_SUBST([LIBX11_NONPKG_LIBS], $libx11_nonpkg_libs) +AC_SUBST([LIBJPEG_NONPKG_CFLAGS], $libjpeg_nonpkg_cflags) +AC_SUBST([LIBJPEG_NONPKG_LIBS], $libjpeg_nonpkg_libs) +AC_SUBST([LIBPNG_NONPKG_CFLAGS], $libpng_nonpkg_cflags) +AC_SUBST([LIBPNG_NONPKG_LIBS], $libpng_nonpkg_libs) AM_CONDITIONAL([ENABLE_TRACING], [test "$enable_tracing" = "yes"]) diff -Nru libdrilbo-0.2.10/COPYRIGHT.txt libdrilbo-0.2.11/COPYRIGHT.txt --- libdrilbo-0.2.10/COPYRIGHT.txt 2017-04-08 19:38:14.000000000 +0000 +++ libdrilbo-0.2.11/COPYRIGHT.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ - - Copyright (c) 2009-2017 Christoph Ender - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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. - diff -Nru libdrilbo-0.2.10/debian/changelog libdrilbo-0.2.11/debian/changelog --- libdrilbo-0.2.10/debian/changelog 2017-07-16 19:00:00.000000000 +0000 +++ libdrilbo-0.2.11/debian/changelog 2017-09-12 19:45:00.000000000 +0000 @@ -1,3 +1,21 @@ +libdrilbo (0.2.11-2) unstable; urgency=low + + * Switched priority from "extra" to "optional". + * Updated standards version to 4.1.0. + * Added "Vcs-Browser" and "Vcs-Git" fields to control file. + + -- Christoph Ender Tue, 12 Sep 2017 21:45:00 +0200 + + +libdrilbo (0.2.11-1) unstable; urgency=low + + * New upstream version. + * Updated BSD-3 license to include contributors. License is now to 100% + identical to the 3-Clause BSD License. + + -- Christoph Ender Mon, 11 Sep 2017 17:50:00 +0200 + + libdrilbo (0.2.10-2) unstable; urgency=low * New standards version 4.0.0. diff -Nru libdrilbo-0.2.10/debian/control libdrilbo-0.2.11/debian/control --- libdrilbo-0.2.10/debian/control 2017-07-16 19:00:00.000000000 +0000 +++ libdrilbo-0.2.11/debian/control 2017-09-12 19:45:00.000000000 +0000 @@ -1,18 +1,20 @@ Source: libdrilbo Section: libdevel -Priority: extra +Priority: optional Maintainer: Christoph Ender Build-Depends: debhelper (>= 9.0.0), dh-autoreconf, automake, autoconf, pkg-config, + libfizmo-dev, libx11-dev, libjpeg-dev, - libpng-dev, - libfizmo-dev -Standards-Version: 4.0.0 + libpng-dev +Standards-Version: 4.1.0 Homepage: https://fizmo.spellbreaker.org/ +Vcs-Browser: https://github.com/chrender/libdrilbo +Vcs-Git: https://github.com/chrender/libdrilbo Package: libdrilbo-common Breaks: fizmo-common (<= 0.7.10-2) @@ -27,7 +29,11 @@ Architecture: any Depends: libdrilbo-common, ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + libfizmo-dev, + libx11-dev, + libjpeg-dev, + libpng-dev Description: Imaging support library for the fizmo Z-Machine interpreter This library provides mg1, jpeg, png and X11-support for fizmo. It is usually used by fizmo-related frontends or interfaces to support Z-Machine diff -Nru libdrilbo-0.2.10/debian/copyright libdrilbo-0.2.11/debian/copyright --- libdrilbo-0.2.10/debian/copyright 2017-07-16 19:00:00.000000000 +0000 +++ libdrilbo-0.2.11/debian/copyright 2017-09-12 19:45:00.000000000 +0000 @@ -20,19 +20,21 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. . - 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. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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. Files: debian/* Copyright: 2009-2017, Christoph Ender diff -Nru libdrilbo-0.2.10/depcomp libdrilbo-0.2.11/depcomp --- libdrilbo-0.2.10/depcomp 2017-04-08 19:37:51.000000000 +0000 +++ libdrilbo-0.2.11/depcomp 2017-09-04 20:12:51.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru libdrilbo-0.2.10/doc/changelog.xml libdrilbo-0.2.11/doc/changelog.xml --- libdrilbo-0.2.10/doc/changelog.xml 2017-04-08 19:39:33.000000000 +0000 +++ libdrilbo-0.2.11/doc/changelog.xml 2017-09-04 20:12:50.000000000 +0000 @@ -1,5 +1,12 @@ + + + Fix superfluous libraries and includes during install when using $DESTDIR, addressing github issue #21. + Added missing contributor phrasing to BSD-3 clause. The resulting license now exactly matches the wording used on Github and so also makes the license detection work. + + diff -Nru libdrilbo-0.2.10/doc/copyright.xml libdrilbo-0.2.11/doc/copyright.xml --- libdrilbo-0.2.10/doc/copyright.xml 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/doc/copyright.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ - - -
-

Copyright (c) 2009-2017 Christoph Ender
All rights reserved.

- -

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

-
    -
  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    2. -
  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
    3. -
  3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.
    4. -
- -

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.

-
- - diff -Nru libdrilbo-0.2.10/doc/create-mds.sh libdrilbo-0.2.11/doc/create-mds.sh --- libdrilbo-0.2.10/doc/create-mds.sh 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/doc/create-mds.sh 2017-09-04 20:12:50.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/bash ./tiny-xml-doc-tools/xml-to-md.sh -u -o .. readme.xml changelog.xml \ - copyright.xml + license.xml diff -Nru libdrilbo-0.2.10/doc/create-txts.sh libdrilbo-0.2.11/doc/create-txts.sh --- libdrilbo-0.2.10/doc/create-txts.sh 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/doc/create-txts.sh 2017-09-04 20:12:50.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/bash ./tiny-xml-doc-tools/xml-to-txt.sh -u -o .. readme.xml changelog.xml \ - copyright.xml + license.xml diff -Nru libdrilbo-0.2.10/doc/license.xml libdrilbo-0.2.11/doc/license.xml --- libdrilbo-0.2.10/doc/license.xml 1970-01-01 00:00:00.000000000 +0000 +++ libdrilbo-0.2.11/doc/license.xml 2017-09-04 20:12:50.000000000 +0000 @@ -0,0 +1,16 @@ + + +
+

Copyright (c) 2009-2017, Christoph Ender
All rights reserved.

+ +

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

+
    +
  • Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    • +
  • Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
    • +
  • Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
    • +
+ +

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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.

+
+ + diff -Nru libdrilbo-0.2.10/doc/tiny-xml-doc-tools/changelog-ascii.xslt libdrilbo-0.2.11/doc/tiny-xml-doc-tools/changelog-ascii.xslt --- libdrilbo-0.2.10/doc/tiny-xml-doc-tools/changelog-ascii.xslt 2017-04-08 19:35:24.000000000 +0000 +++ libdrilbo-0.2.11/doc/tiny-xml-doc-tools/changelog-ascii.xslt 2017-09-04 20:12:51.000000000 +0000 @@ -220,5 +220,23 @@ + + + + + + + + + ( + + ) + + + + + + + diff -Nru libdrilbo-0.2.10/doc/tiny-xml-doc-tools/CHANGELOG.md libdrilbo-0.2.11/doc/tiny-xml-doc-tools/CHANGELOG.md --- libdrilbo-0.2.10/doc/tiny-xml-doc-tools/CHANGELOG.md 2017-04-08 19:35:24.000000000 +0000 +++ libdrilbo-0.2.11/doc/tiny-xml-doc-tools/CHANGELOG.md 2017-09-04 20:12:51.000000000 +0000 @@ -1,6 +1,13 @@ + **Version 0.1.4 — July 19, 2017** + + - Added support for hyperlinks in changelogs. + +--- + + **Version 0.1.3 — August 25, 2016** - Fix suffix for conversion to text files. diff -Nru libdrilbo-0.2.10/doc/tiny-xml-doc-tools/changelog-md.xslt libdrilbo-0.2.11/doc/tiny-xml-doc-tools/changelog-md.xslt --- libdrilbo-0.2.10/doc/tiny-xml-doc-tools/changelog-md.xslt 2017-04-08 19:35:24.000000000 +0000 +++ libdrilbo-0.2.11/doc/tiny-xml-doc-tools/changelog-md.xslt 2017-09-04 20:12:51.000000000 +0000 @@ -119,5 +119,24 @@ + + + + + [ + + + + + + + + + ] + ( + + ) + + diff -Nru libdrilbo-0.2.10/doc/tiny-xml-doc-tools/changelog.xml libdrilbo-0.2.11/doc/tiny-xml-doc-tools/changelog.xml --- libdrilbo-0.2.10/doc/tiny-xml-doc-tools/changelog.xml 2017-04-08 19:35:24.000000000 +0000 +++ libdrilbo-0.2.11/doc/tiny-xml-doc-tools/changelog.xml 2017-09-04 20:12:51.000000000 +0000 @@ -1,5 +1,11 @@ + + + Added support for hyperlinks in changelogs. + + diff -Nru libdrilbo-0.2.10/doc/tiny-xml-doc-tools/LICENSE.md libdrilbo-0.2.11/doc/tiny-xml-doc-tools/LICENSE.md --- libdrilbo-0.2.10/doc/tiny-xml-doc-tools/LICENSE.md 1970-01-01 00:00:00.000000000 +0000 +++ libdrilbo-0.2.11/doc/tiny-xml-doc-tools/LICENSE.md 2017-09-04 20:12:51.000000000 +0000 @@ -0,0 +1,16 @@ + + + +Copyright (c) 2016-2017, Christoph Ender +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + - Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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. + diff -Nru libdrilbo-0.2.10/doc/tiny-xml-doc-tools/license.xml libdrilbo-0.2.11/doc/tiny-xml-doc-tools/license.xml --- libdrilbo-0.2.10/doc/tiny-xml-doc-tools/license.xml 1970-01-01 00:00:00.000000000 +0000 +++ libdrilbo-0.2.11/doc/tiny-xml-doc-tools/license.xml 2017-09-04 20:12:51.000000000 +0000 @@ -0,0 +1,16 @@ + + +
+

Copyright (c) 2016-2017, Christoph Ender
All rights reserved.

+ +

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

+
    +
  • Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    • +
  • Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
    • +
  • Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
    • +
+ +

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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.

+
+ + diff -Nru libdrilbo-0.2.10/doc/tiny-xml-doc-tools/README.md libdrilbo-0.2.11/doc/tiny-xml-doc-tools/README.md --- libdrilbo-0.2.10/doc/tiny-xml-doc-tools/README.md 2017-04-08 19:35:24.000000000 +0000 +++ libdrilbo-0.2.11/doc/tiny-xml-doc-tools/README.md 2017-09-04 20:12:51.000000000 +0000 @@ -1,6 +1,6 @@ -**About tiny-xml-doc-tools v0.1.2** +**About tiny-xml-doc-tools v0.1.4** The tiny-xml-doc-tools are a set of XSLT and script files used by the fizmo modules to provide documentation in various output formats. It invokes xsltproc to perform the actual conversion. @@ -18,7 +18,7 @@ - \, \ and \ — Lists and items - \ — Text paragraph - \ — Code section - - \ with @href — Link + - \ with @href — Hyperlink - \ — Italics - \ — Bold - \ — Monospaced @@ -37,5 +37,6 @@ - \ with @version — Version container - \ with @day-of-week, @month, @day, @hour, @minute, @second, @timezone and @year — denotes parent's change date. - \ — Describes change, used inside change element. + - \ with @href — Hyperlink diff -Nru libdrilbo-0.2.10/doc/tiny-xml-doc-tools/readme.xml libdrilbo-0.2.11/doc/tiny-xml-doc-tools/readme.xml --- libdrilbo-0.2.10/doc/tiny-xml-doc-tools/readme.xml 2017-04-08 19:35:24.000000000 +0000 +++ libdrilbo-0.2.11/doc/tiny-xml-doc-tools/readme.xml 2017-09-04 20:12:51.000000000 +0000 @@ -1,7 +1,7 @@ -
+

The tiny-xml-doc-tools are a set of XSLT and script files used by the fizmo modules to provide documentation in various output formats. It invokes xsltproc to perform the actual conversion.

@@ -13,7 +13,7 @@
  • <ul>, <ol> and <li> — Lists and items
  • <p> — Text paragraph
  • <code> — Code section
    • -
  • <a> with @href — Link
    • +
  • <a> with @href — Hyperlink
  • <i> — Italics
  • <b> — Bold
  • <tt> — Monospaced
    • @@ -28,6 +28,7 @@
  • <change> with @version — Version container
  • <datetime> with @day-of-week, @month, @day, @hour, @minute, @second, @timezone and @year — denotes parent's change date.
  • <logentry> — Describes change, used inside change element.
    • +
  • <a> with @href — Hyperlink
    • diff -Nru libdrilbo-0.2.10/install-sh libdrilbo-0.2.11/install-sh --- libdrilbo-0.2.10/install-sh 2017-04-08 19:37:51.000000000 +0000 +++ libdrilbo-0.2.11/install-sh 2017-09-04 20:12:51.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -324,34 +324,41 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; diff -Nru libdrilbo-0.2.10/LICENSE.txt libdrilbo-0.2.11/LICENSE.txt --- libdrilbo-0.2.10/LICENSE.txt 1970-01-01 00:00:00.000000000 +0000 +++ libdrilbo-0.2.11/LICENSE.txt 2017-09-04 20:12:51.000000000 +0000 @@ -0,0 +1,29 @@ + + Copyright (c) 2009-2017, Christoph Ender + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + - Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + - Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + CONTRIBUTORS 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. + diff -Nru libdrilbo-0.2.10/Makefile.am libdrilbo-0.2.11/Makefile.am --- libdrilbo-0.2.10/Makefile.am 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/Makefile.am 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# 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. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR +# CONTRIBUTORS 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. AUTOMAKE_OPTIONS = -Wno-override @@ -35,11 +37,13 @@ if FIZMO_DIST_BUILD dev_prefix=$(FIZMO_DIST_BUILD_PREFIX) + pkg_prefix=$(FIZMO_DIST_BUILD_PREFIX) else - dev_prefix=$(prefix) + dev_prefix=$(DESTDIR)/$(prefix) + pkg_prefix=$(prefix) endif -pkg_dir = $(DESTDIR)$(dev_prefix)/lib/pkgconfig +pkg_dir = $(dev_prefix)/lib/pkgconfig pkgfile = $(pkg_dir)/libdrilbo.pc SUBDIRS = src/drilbo . @@ -50,23 +54,24 @@ mv src/drilbo/libdrilbo.a . install-dev:: libdrilbo.a - mkdir -p "$(DESTDIR)$(dev_prefix)"/lib/fizmo - cp libdrilbo.a "$(DESTDIR)$(dev_prefix)"/lib/fizmo - mkdir -p "$(DESTDIR)$(dev_prefix)"/include/fizmo/drilbo - cp src/drilbo/*.h "$(DESTDIR)$(dev_prefix)"/include/fizmo/drilbo + mkdir -p "$(dev_prefix)"/lib/fizmo + cp libdrilbo.a "$(dev_prefix)"/lib/fizmo + mkdir -p "$(dev_prefix)"/include/fizmo/drilbo + cp src/drilbo/*.h "$(dev_prefix)"/include/fizmo/drilbo mkdir -p "$(pkg_dir)" - echo 'prefix=$(dev_prefix)' >"$(pkgfile)" + echo 'prefix=$(pkg_prefix)' >"$(pkgfile)" echo 'exec_prefix=$${prefix}' >>"$(pkgfile)" echo 'libdir=$${exec_prefix}/lib/fizmo' >>"$(pkgfile)" echo 'includedir=$${prefix}/include/fizmo' >>"$(pkgfile)" echo >>"$(pkgfile)" echo 'Name: libdrilbo' >>"$(pkgfile)" echo 'Description: libdrilbo' >>"$(pkgfile)" - echo 'Version: 0.2.10' >>"$(pkgfile)" + echo 'Version: 0.2.11' >>"$(pkgfile)" echo 'Requires: $(LIBDRILBO_REQS)' >>"$(pkgfile)" echo 'Requires.private:' >>"$(pkgfile)" - echo 'Cflags: -I$(dev_prefix)/include/fizmo $(LIBDRILBO_NONPKG_CFLAGS) ' >>"$(pkgfile)" - echo 'Libs: -L$(dev_prefix)/lib/fizmo -ldrilbo -lpthread $(LIBDRILBO_NONPKG_LIBS)' >>"$(pkgfile)" + echo 'Cflags: -I$(pkg_prefix)/include/fizmo' >>"$(pkgfile)" + echo 'Libs: -L$(pkg_prefix)/lib/fizmo -ldrilbo -lpthread $(LIBX11_NONPKG_LIBS) $(LIBJPEG_NONPKG_LIBS) $(LIBPNG_NONPKG_LIBS)' >>"$(pkgfile)" + echo 'Libs.private:' >>"$(pkgfile)" echo >>"$(pkgfile)" install-data-local:: @@ -81,9 +86,9 @@ # a - sign. rmdir may fail in clean-dev in case other libs have installed # development files, or in case clean-dev has been run before. clean-dev:: - -rm "$(DESTDIR)$(dev_prefix)/lib/fizmo/libdrilbo.a" - -rmdir "$(DESTDIR)$(dev_prefix)/lib/fizmo" - rm -rf "$(DESTDIR)$(dev_prefix)/include/fizmo/drilbo" - -rmdir "$(DESTDIR)$(dev_prefix)/include/fizmo" + -rm "$(dev_prefix)/lib/fizmo/libdrilbo.a" + -rmdir "$(dev_prefix)/lib/fizmo" + rm -rf "$(dev_prefix)/include/fizmo/drilbo" + -rmdir "$(dev_prefix)/include/fizmo" -rm "$(pkgfile)" diff -Nru libdrilbo-0.2.10/Makefile.in libdrilbo-0.2.11/Makefile.in --- libdrilbo-0.2.10/Makefile.in 2017-04-08 19:37:51.000000000 +0000 +++ libdrilbo-0.2.11/Makefile.in 2017-09-04 20:12:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -29,19 +29,21 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# 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. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR +# CONTRIBUTORS 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. VPATH = @srcdir@ am__is_gnu_make = { \ @@ -280,11 +282,15 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBDRILBO_NONPKG_CFLAGS = @LIBDRILBO_NONPKG_CFLAGS@ -LIBDRILBO_NONPKG_LIBS = @LIBDRILBO_NONPKG_LIBS@ LIBDRILBO_REQS = @LIBDRILBO_REQS@ +LIBJPEG_NONPKG_CFLAGS = @LIBJPEG_NONPKG_CFLAGS@ +LIBJPEG_NONPKG_LIBS = @LIBJPEG_NONPKG_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPNG_NONPKG_CFLAGS = @LIBPNG_NONPKG_CFLAGS@ +LIBPNG_NONPKG_LIBS = @LIBPNG_NONPKG_LIBS@ LIBS = @LIBS@ +LIBX11_NONPKG_CFLAGS = @LIBX11_NONPKG_CFLAGS@ +LIBX11_NONPKG_LIBS = @LIBX11_NONPKG_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -329,23 +335,26 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -jpeg_CFLAGS = @jpeg_CFLAGS@ -jpeg_LIBS = @jpeg_LIBS@ libdir = @libdir@ libexecdir = @libexecdir@ libfizmo_CFLAGS = @libfizmo_CFLAGS@ libfizmo_LIBS = @libfizmo_LIBS@ +libjpeg_CFLAGS = @libjpeg_CFLAGS@ +libjpeg_LIBS = @libjpeg_LIBS@ +libpng_CFLAGS = @libpng_CFLAGS@ +libpng_LIBS = @libpng_LIBS@ +libx11_CFLAGS = @libx11_CFLAGS@ +libx11_LIBS = @libx11_LIBS@ localedir = $(datarootdir)/fizmo/locales localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -png_CFLAGS = @png_CFLAGS@ -png_LIBS = @png_LIBS@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -354,12 +363,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -x11_CFLAGS = @x11_CFLAGS@ -x11_LIBS = @x11_LIBS@ AUTOMAKE_OPTIONS = -Wno-override -@FIZMO_DIST_BUILD_FALSE@dev_prefix = $(prefix) +@FIZMO_DIST_BUILD_FALSE@dev_prefix = $(DESTDIR)/$(prefix) @FIZMO_DIST_BUILD_TRUE@dev_prefix = $(FIZMO_DIST_BUILD_PREFIX) -pkg_dir = $(DESTDIR)$(dev_prefix)/lib/pkgconfig +@FIZMO_DIST_BUILD_FALSE@pkg_prefix = $(prefix) +@FIZMO_DIST_BUILD_TRUE@pkg_prefix = $(FIZMO_DIST_BUILD_PREFIX) +pkg_dir = $(dev_prefix)/lib/pkgconfig pkgfile = $(pkg_dir)/libdrilbo.pc SUBDIRS = src/drilbo . noinst_LIBRARIES = libdrilbo.a @@ -597,7 +606,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -623,7 +632,7 @@ @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -641,7 +650,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -651,7 +660,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -854,23 +863,24 @@ mv src/drilbo/libdrilbo.a . install-dev:: libdrilbo.a - mkdir -p "$(DESTDIR)$(dev_prefix)"/lib/fizmo - cp libdrilbo.a "$(DESTDIR)$(dev_prefix)"/lib/fizmo - mkdir -p "$(DESTDIR)$(dev_prefix)"/include/fizmo/drilbo - cp src/drilbo/*.h "$(DESTDIR)$(dev_prefix)"/include/fizmo/drilbo + mkdir -p "$(dev_prefix)"/lib/fizmo + cp libdrilbo.a "$(dev_prefix)"/lib/fizmo + mkdir -p "$(dev_prefix)"/include/fizmo/drilbo + cp src/drilbo/*.h "$(dev_prefix)"/include/fizmo/drilbo mkdir -p "$(pkg_dir)" - echo 'prefix=$(dev_prefix)' >"$(pkgfile)" + echo 'prefix=$(pkg_prefix)' >"$(pkgfile)" echo 'exec_prefix=$${prefix}' >>"$(pkgfile)" echo 'libdir=$${exec_prefix}/lib/fizmo' >>"$(pkgfile)" echo 'includedir=$${prefix}/include/fizmo' >>"$(pkgfile)" echo >>"$(pkgfile)" echo 'Name: libdrilbo' >>"$(pkgfile)" echo 'Description: libdrilbo' >>"$(pkgfile)" - echo 'Version: 0.2.10' >>"$(pkgfile)" + echo 'Version: 0.2.11' >>"$(pkgfile)" echo 'Requires: $(LIBDRILBO_REQS)' >>"$(pkgfile)" echo 'Requires.private:' >>"$(pkgfile)" - echo 'Cflags: -I$(dev_prefix)/include/fizmo $(LIBDRILBO_NONPKG_CFLAGS) ' >>"$(pkgfile)" - echo 'Libs: -L$(dev_prefix)/lib/fizmo -ldrilbo -lpthread $(LIBDRILBO_NONPKG_LIBS)' >>"$(pkgfile)" + echo 'Cflags: -I$(pkg_prefix)/include/fizmo' >>"$(pkgfile)" + echo 'Libs: -L$(pkg_prefix)/lib/fizmo -ldrilbo -lpthread $(LIBX11_NONPKG_LIBS) $(LIBJPEG_NONPKG_LIBS) $(LIBPNG_NONPKG_LIBS)' >>"$(pkgfile)" + echo 'Libs.private:' >>"$(pkgfile)" echo >>"$(pkgfile)" install-data-local:: @@ -885,10 +895,10 @@ # a - sign. rmdir may fail in clean-dev in case other libs have installed # development files, or in case clean-dev has been run before. clean-dev:: - -rm "$(DESTDIR)$(dev_prefix)/lib/fizmo/libdrilbo.a" - -rmdir "$(DESTDIR)$(dev_prefix)/lib/fizmo" - rm -rf "$(DESTDIR)$(dev_prefix)/include/fizmo/drilbo" - -rmdir "$(DESTDIR)$(dev_prefix)/include/fizmo" + -rm "$(dev_prefix)/lib/fizmo/libdrilbo.a" + -rmdir "$(dev_prefix)/lib/fizmo" + rm -rf "$(dev_prefix)/include/fizmo/drilbo" + -rmdir "$(dev_prefix)/include/fizmo" -rm "$(pkgfile)" # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo.c libdrilbo-0.2.11/src/drilbo/drilbo.c --- libdrilbo-0.2.10/src/drilbo/drilbo.c 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo.c 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo.h libdrilbo-0.2.11/src/drilbo/drilbo.h --- libdrilbo-0.2.10/src/drilbo/drilbo.h 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo.h 2017-09-04 20:12:50.000000000 +0000 @@ -14,26 +14,28 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ #ifndef drilbo_h_INCLUDED #define drilbo_h_INCLUDED -#define DRILBO_VERSION "0.2.10" +#define DRILBO_VERSION "0.2.11" #ifdef UNUSED #elif defined(__GNUC__) diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-jpeg.c libdrilbo-0.2.11/src/drilbo/drilbo-jpeg.c --- libdrilbo-0.2.10/src/drilbo/drilbo-jpeg.c 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-jpeg.c 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-jpeg.h libdrilbo-0.2.11/src/drilbo/drilbo-jpeg.h --- libdrilbo-0.2.10/src/drilbo/drilbo-jpeg.h 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-jpeg.h 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-mg1.c libdrilbo-0.2.11/src/drilbo/drilbo-mg1.c --- libdrilbo-0.2.10/src/drilbo/drilbo-mg1.c 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-mg1.c 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. * * * This module is an adapted version of Mark Howell's pix2gif utility from diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-mg1.h libdrilbo-0.2.11/src/drilbo/drilbo-mg1.h --- libdrilbo-0.2.10/src/drilbo/drilbo-mg1.h 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-mg1.h 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-png.c libdrilbo-0.2.11/src/drilbo/drilbo-png.c --- libdrilbo-0.2.10/src/drilbo/drilbo-png.c 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-png.c 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-png.h libdrilbo-0.2.11/src/drilbo/drilbo-png.h --- libdrilbo-0.2.10/src/drilbo/drilbo-png.h 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-png.h 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-ppm.c libdrilbo-0.2.11/src/drilbo/drilbo-ppm.c --- libdrilbo-0.2.10/src/drilbo/drilbo-ppm.c 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-ppm.c 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-ppm.h libdrilbo-0.2.11/src/drilbo/drilbo-ppm.h --- libdrilbo-0.2.10/src/drilbo/drilbo-ppm.h 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-ppm.h 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-test.c libdrilbo-0.2.11/src/drilbo/drilbo-test.c --- libdrilbo-0.2.10/src/drilbo/drilbo-test.c 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-test.c 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-x11.c libdrilbo-0.2.11/src/drilbo/drilbo-x11.c --- libdrilbo-0.2.10/src/drilbo/drilbo-x11.c 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-x11.c 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ /* diff -Nru libdrilbo-0.2.10/src/drilbo/drilbo-x11.h libdrilbo-0.2.11/src/drilbo/drilbo-x11.h --- libdrilbo-0.2.10/src/drilbo/drilbo-x11.h 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/drilbo-x11.h 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/drilbo/Makefile.am libdrilbo-0.2.11/src/drilbo/Makefile.am --- libdrilbo-0.2.10/src/drilbo/Makefile.am 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/Makefile.am 2017-09-04 20:12:50.000000000 +0000 @@ -14,26 +14,28 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# 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. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR +# CONTRIBUTORS 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. AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(libfizmo_CFLAGS) $(x11_CFLAGS) $(png_CFLAGS) $(jpeg_CFLAGS) -fPIC +AM_CFLAGS = $(libfizmo_CFLAGS) $(libx11_CFLAGS) $(libpng_CFLAGS) $(libjpeg_CFLAGS) -fPIC AM_CPPFLAGS = -LDADD = $(libfizmo_LIBS) $(x11_LIBS) $(png_LIBS) $(jpeg_LIBS) +LDADD = $(libfizmo_LIBS) $(libx11_LIBS) $(libpng_LIBS) $(libjpeg_LIBS) localedir = $(datarootdir)/fizmo/locales diff -Nru libdrilbo-0.2.10/src/drilbo/Makefile.in libdrilbo-0.2.11/src/drilbo/Makefile.in --- libdrilbo-0.2.10/src/drilbo/Makefile.in 2017-04-08 19:37:51.000000000 +0000 +++ libdrilbo-0.2.11/src/drilbo/Makefile.in 2017-09-04 20:12:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -29,19 +29,21 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# 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. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR +# CONTRIBUTORS 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. VPATH = @srcdir@ am__is_gnu_make = { \ @@ -233,11 +235,15 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBDRILBO_NONPKG_CFLAGS = @LIBDRILBO_NONPKG_CFLAGS@ -LIBDRILBO_NONPKG_LIBS = @LIBDRILBO_NONPKG_LIBS@ LIBDRILBO_REQS = @LIBDRILBO_REQS@ +LIBJPEG_NONPKG_CFLAGS = @LIBJPEG_NONPKG_CFLAGS@ +LIBJPEG_NONPKG_LIBS = @LIBJPEG_NONPKG_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPNG_NONPKG_CFLAGS = @LIBPNG_NONPKG_CFLAGS@ +LIBPNG_NONPKG_LIBS = @LIBPNG_NONPKG_LIBS@ LIBS = @LIBS@ +LIBX11_NONPKG_CFLAGS = @LIBX11_NONPKG_CFLAGS@ +LIBX11_NONPKG_LIBS = @LIBX11_NONPKG_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -282,23 +288,26 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -jpeg_CFLAGS = @jpeg_CFLAGS@ -jpeg_LIBS = @jpeg_LIBS@ libdir = @libdir@ libexecdir = @libexecdir@ libfizmo_CFLAGS = @libfizmo_CFLAGS@ libfizmo_LIBS = @libfizmo_LIBS@ +libjpeg_CFLAGS = @libjpeg_CFLAGS@ +libjpeg_LIBS = @libjpeg_LIBS@ +libpng_CFLAGS = @libpng_CFLAGS@ +libpng_LIBS = @libpng_LIBS@ +libx11_CFLAGS = @libx11_CFLAGS@ +libx11_LIBS = @libx11_LIBS@ localedir = $(datarootdir)/fizmo/locales localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -png_CFLAGS = @png_CFLAGS@ -png_LIBS = @png_LIBS@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -307,14 +316,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -x11_CFLAGS = @x11_CFLAGS@ -x11_LIBS = @x11_LIBS@ AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(libfizmo_CFLAGS) $(x11_CFLAGS) $(png_CFLAGS) \ - $(jpeg_CFLAGS) -fPIC $(am__append_1) $(am__append_2) \ +AM_CFLAGS = $(libfizmo_CFLAGS) $(libx11_CFLAGS) $(libpng_CFLAGS) \ + $(libjpeg_CFLAGS) -fPIC $(am__append_1) $(am__append_2) \ $(am__append_4) $(am__append_6) AM_CPPFLAGS = -LDADD = $(libfizmo_LIBS) $(x11_LIBS) $(png_LIBS) $(jpeg_LIBS) +LDADD = $(libfizmo_LIBS) $(libx11_LIBS) $(libpng_LIBS) $(libjpeg_LIBS) noinst_LIBRARIES = libdrilbo.a libdrilbo_a_SOURCES = ../locales/libdrilbo_locales.c drilbo.c \ drilbo-mg1.c drilbo-ppm.o $(am__append_3) $(am__append_5) \ diff -Nru libdrilbo-0.2.10/src/locales/libdrilbo_locales.c libdrilbo-0.2.11/src/locales/libdrilbo_locales.c --- libdrilbo-0.2.10/src/locales/libdrilbo_locales.c 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/locales/libdrilbo_locales.c 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */ diff -Nru libdrilbo-0.2.10/src/locales/libdrilbo_locales.h libdrilbo-0.2.11/src/locales/libdrilbo_locales.h --- libdrilbo-0.2.10/src/locales/libdrilbo_locales.h 2017-04-08 19:35:23.000000000 +0000 +++ libdrilbo-0.2.11/src/locales/libdrilbo_locales.h 2017-09-04 20:12:50.000000000 +0000 @@ -14,19 +14,21 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR + * CONTRIBUTORS 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. */