Merge branch 'release'

ChangeLog

@@ -1,5 +1,27 @@
+2020-01-12  Hayaki Saito <[email protected]>
+
+  * converters/Makefile.am, converters/Makefile.in, src/loader.c: More tweaks
+  for vpath build
+
+2020-01-11  Hayaki Saito <[email protected]>
+
+  * Makefile.am, Makefile.in, configure.ac, converters/Makefile.am,
+  converters/Makefile.in, python/libsixel/__init__.py, src/Makefile.am,
+  src/Makefile.in: Additional fixes for VPATH build(#56)
+
+  * python/libsixel/__init__.py: Fix broken python interface
+
+2020-01-09  Hayaki Saito <[email protected]>
+
+  * Makefile.am, Makefile.in, converters/Makefile.am, converters/Makefile.in,
+  src/Makefile.am, src/Makefile.in: Initial support for VPATH build(#56)
+
 2020-01-03  Hayaki Saito <[email protected]>
 
+  * NEWS: Update NEWS
+
+  * ChangeLog: Update ChangeLog
+
   * include/sixel.h.in, python/libsixel/__init__.py: Update python interface
 
 2020-01-01  Hayaki Saito <[email protected]>
@@ -66,6 +88,9 @@
   * include/sixel.h.in, src/allocator.c: Introduce SIXEL_ALLOCATE_BYTES_MAX
   macro and limit allocation size to 128MB(#74)
 
+  * config.h.in, configure, configure.ac, src/loader.c: Make stb_image errors
+  more detailed
+
   * src/fromgif.c: Minor fixes in load_gif().
 
   * src/fromgif.c: GIF loader: check bad image separator, ensure left/top

Makefile.am

@@ -1,36 +1,42 @@
+#
+# @configure_input@
+#
 SUBDIRS = include src converters tools python
 DIST_SUBDIRS = $(SUBDIRS)
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
+srcdir = @srcdir@
+VPATH = @srcdir@
+
 # pkgconfig
 pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libsixel.pc
+pkgconfig_DATA = $(builddir)/libsixel.pc
 
-CLEANFILES = valgrind.log test.log unittest.log test-output.png
+CLEANFILES = $(builddir)/valgrind.log $(builddir)/test.log $(builddir)/unittest.log
 
 all-am:
-	cp package.json.in package.json
+	cp $(builddir)/package.json.in $(builddir)/package.json
 
 check-am:
 
 unittest: all
-	cd src && $(MAKE) unittest 2>&1 |tee unittest.log
+	cd $(srcdir)/src && $(MAKE) unittest 2>&1 |tee $(builddir)/unittest.log
 
 test: all
-	cd src && $(MAKE) unittest 2>&1 |tee ../test.log
-	cd converters && $(MAKE) test 2>&1 |tee -a ../test.log
+	cd src && $(MAKE) unittest 2>&1 |tee $(builddir)/test.log
+	cd converters && $(MAKE) test 2>&1 |tee -a $(builddir)/test.log
 
 winetest: all
 	cd converters && $(MAKE) winetest
 
 valgrind: all
 	valgrind --leak-check=full --show-reachable=no --error-limit=no img2sixel images/snake.jpg -dfs 2>&1 \
 		| grep ^== \
-		| tee valgrind.log
-	grep "All heap blocks were freed" valgrind.log || \
+		| tee $(builddir)/valgrind.log
+	grep "All heap blocks were freed" $(builddir)/valgrind.log || \
 		grep "definitely lost: 0 bytes in 0 blocks" valgrind.log
-	grep "All heap blocks were freed" valgrind.log || \
+	grep "All heap blocks were freed" $(builddir)/valgrind.log || \
 		grep "indirectly lost: 0 bytes in 0 blocks" valgrind.log
 
 coveralls:

Makefile.in

@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
@@ -193,8 +192,8 @@ CTAGS = ctags
 CSCOPE = cscope
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/libsixel.pc.in $(srcdir)/package.json.in.in \
-	ChangeLog NEWS compile config.guess config.sub install-sh \
-	ltmain.sh missing py-compile
+	ChangeLog NEWS compile config.guess config.sub depcomp \
+	install-sh ltmain.sh missing py-compile
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -237,6 +236,7 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
+VPATH = @srcdir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
@@ -386,11 +386,15 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 zshcompletiondir = @zshcompletiondir@
+
+#
+# @configure_input@
+#
 SUBDIRS = include src converters tools python
 DIST_SUBDIRS = $(SUBDIRS)
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-pkgconfig_DATA = libsixel.pc
-CLEANFILES = valgrind.log test.log unittest.log test-output.png
+pkgconfig_DATA = $(builddir)/libsixel.pc
+CLEANFILES = $(builddir)/valgrind.log $(builddir)/test.log $(builddir)/unittest.log
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -907,27 +911,27 @@ uninstall-am: uninstall-pkgconfigDATA
 
 
 all-am:
-	cp package.json.in package.json
+	cp $(builddir)/package.json.in $(builddir)/package.json
 
 check-am:
 
 unittest: all
-	cd src && $(MAKE) unittest 2>&1 |tee unittest.log
+	cd $(srcdir)/src && $(MAKE) unittest 2>&1 |tee $(builddir)/unittest.log
 
 test: all
-	cd src && $(MAKE) unittest 2>&1 |tee ../test.log
-	cd converters && $(MAKE) test 2>&1 |tee -a ../test.log
+	cd src && $(MAKE) unittest 2>&1 |tee $(builddir)/test.log
+	cd converters && $(MAKE) test 2>&1 |tee -a $(builddir)/test.log
 
 winetest: all
 	cd converters && $(MAKE) winetest
 
 valgrind: all
 	valgrind --leak-check=full --show-reachable=no --error-limit=no img2sixel images/snake.jpg -dfs 2>&1 \
 		| grep ^== \
-		| tee valgrind.log
-	grep "All heap blocks were freed" valgrind.log || \
+		| tee $(builddir)/valgrind.log
+	grep "All heap blocks were freed" $(builddir)/valgrind.log || \
 		grep "definitely lost: 0 bytes in 0 blocks" valgrind.log
-	grep "All heap blocks were freed" valgrind.log || \
+	grep "All heap blocks were freed" $(builddir)/valgrind.log || \
 		grep "indirectly lost: 0 bytes in 0 blocks" valgrind.log
 
 coveralls:

NEWS

@@ -2,6 +2,11 @@
                   ------------------------------
                    What's new in libsixel-1.8 ?
                   ------------------------------
+
+* python: Fix broken python interface problem(#128), reported by @fd00.
+
+* build: Introduce VPATH build support(#56), suggested by @tkelman.
+
 * Security fix for CVE-2019-20205 (#127), integer overflow problem,
   reported by @sleicasper.
 

config.h.in

@@ -108,6 +108,9 @@
 /* define 1 if GCC supports -Wuninitialized */
 #undef HAVE_DIAGNOSTIC_UNINITIALIZED
 
+/* define 1 if GCC supports -Wunused-but-set-variable */
+#undef HAVE_DIAGNOSTIC_UNUSED_BUT_SET_VARIABLE
+
 /* define 1 if GCC supports -Wunused-function */
 #undef HAVE_DIAGNOSTIC_UNUSED_FUNCTION
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sixel 1.8.5.
+# Generated by GNU Autoconf 2.69 for sixel 1.8.6.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sixel'
 PACKAGE_TARNAME='sixel'
-PACKAGE_VERSION='1.8.5'
-PACKAGE_STRING='sixel 1.8.5'
+PACKAGE_VERSION='1.8.6'
+PACKAGE_STRING='sixel 1.8.6'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1393,7 +1393,7 @@ if test "$ac_init_help" = "long"; then
   # 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 sixel 1.8.5 to adapt to many kinds of systems.
+\`configure' configures sixel 1.8.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1463,7 +1463,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sixel 1.8.5:";;
+     short | recursive ) echo "Configuration of sixel 1.8.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1612,7 +1612,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sixel configure 1.8.5
+sixel configure 1.8.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2211,7 +2211,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sixel $as_me 1.8.5, which was
+It was created by sixel $as_me 1.8.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3154,7 +3154,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sixel'
- VERSION='1.8.5'
+ VERSION='1.8.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14109,6 +14109,36 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    CFLAGS="$saved_cflags"
 
 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused-but-set-variable" >&5
+$as_echo_n "checking if $CC supports -Wunused-but-set-variable... " >&6; }
+   saved_cflags="$CFLAGS"
+   CFLAGS="-Wunused-but-set-variable -Werror"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_DIAGNOSTIC_UNUSED_BUT_SET_VARIABLE 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                      :
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   CFLAGS="$saved_cflags"
+
+
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Bsymbolic" >&5
 $as_echo_n "checking if $CC supports -Bsymbolic... " >&6; }
    saved_cflags="$CFLAGS"
@@ -17205,7 +17235,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sixel $as_me 1.8.5, which was
+This file was extended by sixel $as_me 1.8.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17271,7 +17301,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sixel config.status 1.8.5
+sixel config.status 1.8.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.60])
 LT_PREREQ([2.4])
-AC_INIT([sixel], [1.8.5], [[email protected]])
+AC_INIT([sixel], [1.8.6], [[email protected]])
 LS_LT_CURRENT=1
 LS_LT_REVISION=6
 LS_LT_AGE=0
@@ -13,7 +13,7 @@ AC_SUBST([PACKAGE_DESCRIPTION],
 
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 LT_INIT
 AC_CONFIG_SRCDIR([src/fromsixel.c])
 AC_CONFIG_HEADERS([config.h])
@@ -210,6 +210,8 @@ LS_CHECK_CFLAG([-Wunused-function],
                [AC_DEFINE(HAVE_DIAGNOSTIC_UNUSED_FUNCTION, 1, [define 1 if GCC supports -Wunused-function])])
 LS_CHECK_CFLAG([-Wclobbered],
                [AC_DEFINE(HAVE_DIAGNOSTIC_CLOBBERED, 1, [define 1 if GCC supports -Wclobbered])])
+LS_CHECK_CFLAG([-Wunused-but-set-variable],
+               [AC_DEFINE(HAVE_DIAGNOSTIC_UNUSED_BUT_SET_VARIABLE, 1, [define 1 if GCC supports -Wunused-but-set-variable])])
 LS_CHECK_CFLAG([-Bsymbolic],
                [AM_CFLAGS="$AM_CFLAGS -Bsymbolic"
                 AC_DEFINE(HAVE_BSYMBOLIC, 1, [define 1 if GCC supports -Bsymbolic])])