diff options
Diffstat (limited to 'media-gfx/iscan/files')
-rw-r--r-- | media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch | 64 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch | 13 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.26.2-libpng15.patch | 51 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.26.2-png-libs.patch | 37 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch | 48 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch | 64 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.29.1-png-libs.patch | 37 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.30.1-fix-g++-test.patch | 45 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.30.1.1-gcc6.patch | 11 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-usb.sh | 26 |
10 files changed, 396 insertions, 0 deletions
diff --git a/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch b/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch new file mode 100644 index 000000000000..8ac18defc007 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch @@ -0,0 +1,64 @@ +diff -Naur iscan-2.25.0.orig//backend/Makefile.am iscan-2.25.0/backend/Makefile.am +--- iscan-2.25.0.orig//backend/Makefile.am 2010-05-19 07:51:55.000000000 +0200 ++++ iscan-2.25.0/backend/Makefile.am 2010-07-21 22:49:08.579705272 +0200 +@@ -56,7 +56,6 @@ + + libepkowa_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ +- $(LTDLINCL) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/non-free \ + $(XML_CFLAGS) \ +@@ -66,7 +65,7 @@ + libepkowa_la_LIBADD = \ + -lm \ + $(XML_LIBS) \ +- $(LIBLTDL) ++ -lltdl + libepkowa_la_SOURCES = \ + $(sane_backends_files) \ + marshal.c \ +diff -Naur iscan-2.25.0.orig//configure.ac iscan-2.25.0/configure.ac +--- iscan-2.25.0.orig//configure.ac 2010-07-21 22:48:11.411332268 +0200 ++++ iscan-2.25.0/configure.ac 2010-07-21 22:49:58.918332411 +0200 +@@ -261,13 +261,10 @@ + dnl The somewhat obscure LT_AC_PROG_SED is here to make sure that the + dnl SED environment variable gets set before it's used by the libtool + dnl machinery. This works around buggy libtool versions. +-LT_AC_PROG_SED +-AC_LIBLTDL_INSTALLABLE +-AC_LIBTOOL_DLOPEN + AC_PROG_LIBTOOL +-AC_LIB_LTDL +-AC_SUBST(LTDLINCL) +-AC_SUBST(LIBLTDL) ++AC_LTDL_SHLIBPATH ++AC_LTDL_SHLIBEXT ++AC_LTDL_SYSSEARCHPATH + + + dnl Graphic file format options +diff -Naur iscan-2.25.0.orig//frontend/Makefile.am iscan-2.25.0/frontend/Makefile.am +--- iscan-2.25.0.orig//frontend/Makefile.am 2010-05-19 07:51:54.000000000 +0200 ++++ iscan-2.25.0/frontend/Makefile.am 2010-07-21 22:50:53.965581385 +0200 +@@ -34,7 +34,7 @@ + iscan_LDADD = \ + $(top_builddir)/lib/libimage-stream.la \ + -lsane \ +- @LIBLTDL@ \ ++ -lltdl \ + @GTK_LIBS@ \ + @GDK_IMLIB_LIBS@ \ + $(top_builddir)/non-free/libesmod.so +diff -Naur iscan-2.25.0.orig//lib/Makefile.am iscan-2.25.0/lib/Makefile.am +--- iscan-2.25.0.orig//lib/Makefile.am 2010-05-19 07:51:56.000000000 +0200 ++++ iscan-2.25.0/lib/Makefile.am 2010-07-21 22:51:29.794329919 +0200 +@@ -29,7 +29,7 @@ + libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include + libimage_stream_la_LDFLAGS = -static + libimage_stream_la_LIBADD = \ +- $(LIBLTDL) \ ++ -lltdl \ + $(top_builddir)/lib/pdf/libpdf.la + libimage_stream_la_SOURCES = \ + $(libimage_stream_la_files) diff --git a/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch b/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch new file mode 100644 index 000000000000..23fa6edd76b4 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.25.0-fix-g++-test.patch @@ -0,0 +1,13 @@ +Index: iscan-2.21.0/configure.ac +=================================================================== +--- iscan-2.21.0.orig/configure.ac ++++ iscan-2.21.0/configure.ac +@@ -68,7 +68,7 @@ AC_PROG_CXX + # to be larger than that for the gcc-3.[23] packages (as long as both + # are distributed) for smooth upgrade paths. + +-if test x"$CXX" = xg++; then ++if test "$GXX" = "yes"; then + AC_MSG_CHECKING([C++ ABI version]) + CXX_ABI="`$CXX -E -dM - < /dev/null | $AWK '/GXX_ABI/ { print $3 }'`" + AC_MSG_RESULT([$CXX_ABI]) diff --git a/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch b/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch new file mode 100644 index 000000000000..1b89b735c23f --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch @@ -0,0 +1,51 @@ +http://bugs.gentoo.org/show_bug.cgi?id=383799#c13 +Upstream: http://www.avasys.jp/cgi-bin/lx/bbs/en/scanner-bbs/hyperbbs.cgi?mode=view;Code=5197 + +--- lib/pngstream.cc ++++ lib/pngstream.cc +@@ -76,7 +76,12 @@ + set_error_handler (_png, _info); + + lib->write_flush (_png); ++/* when not interlacing (ie, only one pass), number of rows is image height: _v_sz */ ++#if PNG_LIBPNG_VER > 10499 ++ if (!_footer && _v_sz == lib->get_current_row_number(_png)) ++#else + if (!_footer && _png->num_rows == _png->flush_rows) ++#endif + { + lib->write_end (_png, _info); + _footer = true; +@@ -161,6 +166,9 @@ + funcsym (write_row); + funcsym (write_flush); + funcsym (write_end); ++#if PNG_LIBPNG_VER > 10499 ++ funcsym (get_current_row_number); ++#endif + + if (lib->access_version_number + && lib->create_write_struct +@@ -170,6 +178,9 @@ + && lib->set_IHDR + && lib->set_pHYs + && lib->set_invert_mono ++#if PNG_LIBPNG_VER > 10499 ++ && lib->get_current_row_number ++#endif + && lib->write_info + && lib->write_row + && lib->write_flush +--- lib/pngstream.hh ++++ lib/pngstream.hh +@@ -108,6 +108,10 @@ + png_structp); + fundecl (void, write_end, + png_structp, png_infop); ++#if PNG_LIBPNG_VER > 10499 ++ fundecl (png_uint_32, get_current_row_number, ++ png_structp); ++#endif + #endif /* HAVE_PNG_H */ + }; + static png_lib_handle *lib; diff --git a/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch b/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch new file mode 100644 index 000000000000..0866e604915a --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch @@ -0,0 +1,37 @@ +diff -ur iscan-2.26.2/configure.ac iscan-2.26.2.new/configure.ac +--- iscan-2.26.2/configure.ac 2014-01-27 13:37:26.782024452 -0500 ++++ iscan-2.26.2.new/configure.ac 2014-01-27 13:36:47.738024120 -0500 +@@ -274,6 +274,9 @@ + AC_HELP_STRING([--enable-$1], + [ensure support for the $3 file format]), + [if test "x$enable_$1" != xno; then ++ if test "x$4" != xno; then ++ PKG_CHECK_MODULES($3,[$4]) ++ fi + iff_header="`echo $2 | $as_tr_sh`" + AC_CHECK_HEADERS([$2]) + if test `eval echo '$ac_cv_header_'$iff_header` \ +@@ -284,9 +287,9 @@ + [AC_CHECK_HEADERS([$2])]) + ]) + +-ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG) +-ISCAN_FILE_FORMAT(png,png.h,PNG) +-ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF) ++ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG,no) ++ISCAN_FILE_FORMAT(png,png.h,PNG,libpng) ++ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF,no) + + + dnl Support for performance measurements. +diff -ur iscan-2.26.2/frontend/Makefile.am iscan-2.26.2.new/frontend/Makefile.am +--- iscan-2.26.2/frontend/Makefile.am 2014-01-27 13:31:09.488021241 -0500 ++++ iscan-2.26.2.new/frontend/Makefile.am 2014-01-27 13:37:50.065024650 -0500 +@@ -37,6 +37,7 @@ + -lltdl \ + @GTK_LIBS@ \ + @GDK_IMLIB_LIBS@ \ ++ @PNG_LIBS@ \ + $(top_builddir)/non-free/libesmod.so + iscan_SOURCES = \ + $(iscan_source_files) diff --git a/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch new file mode 100644 index 000000000000..7205028d8248 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch @@ -0,0 +1,48 @@ +--- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100 ++++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100 +@@ -83,7 +83,12 @@ + #if HAVE_PNG_H + set_error_handler (_png, _info); + ++/* when not interlacing (ie, only one pass), number of rows is image height: _v_sz */ ++#if PNG_LIBPNG_VER > 10499 ++ if (!_footer && _v_sz == lib->get_current_row_number(_png)) ++#else + if (_header && !_footer && _png->num_rows == _png->flush_rows) ++#endif + { + lib->write_end (_png, _info); + _footer = true; +@@ -167,6 +172,9 @@ + funcsym (write_row); + funcsym (write_flush); + funcsym (write_end); ++#if PNG_LIBPNG_VER > 10499 ++ funcsym (get_current_row_number); ++#endif + + if (lib->access_version_number + && lib->create_write_struct +@@ -176,6 +184,9 @@ + && lib->set_IHDR + && lib->set_pHYs + && lib->set_invert_mono ++#if PNG_LIBPNG_VER > 10499 ++ && lib->get_current_row_number ++#endif + && lib->write_info + && lib->write_row + && lib->write_flush +--- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100 ++++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100 +@@ -108,6 +108,10 @@ + png_structp); + fundecl (void, write_end, + png_structp, png_infop); ++#if PNG_LIBPNG_VER > 10499 ++ fundecl (png_uint_32, get_current_row_number, ++ png_structp); ++#endif + #endif /* HAVE_PNG_H */ + }; + static png_lib_handle *lib; diff --git a/media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch b/media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch new file mode 100644 index 000000000000..489f0c5cd71e --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch @@ -0,0 +1,64 @@ +diff -Naur iscan-2.29.1.orig/backend/Makefile.am iscan-2.29.1/backend/Makefile.am +--- iscan-2.29.1.orig/backend/Makefile.am 2012-06-11 23:33:33.000000000 -0500 ++++ iscan-2.29.1/backend/Makefile.am 2013-02-18 20:29:05.091814060 -0600 +@@ -58,7 +58,6 @@ + + libepkowa_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ +- $(LTDLINCL) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/non-free \ + $(XML_CFLAGS) \ +@@ -70,7 +69,7 @@ + -lm \ + $(XML_LIBS) \ + $(LIBUSB_1_0_LIBS) \ +- $(LIBLTDL) ++ -lltdl + libepkowa_la_SOURCES = \ + $(sane_backends_files) \ + ipc.c \ +diff -Naur iscan-2.29.1.orig/configure.ac iscan-2.29.1/configure.ac +--- iscan-2.29.1.orig/configure.ac 2012-06-11 23:33:34.000000000 -0500 ++++ iscan-2.29.1/configure.ac 2013-02-18 20:30:10.413311997 -0600 +@@ -266,13 +266,10 @@ + dnl The somewhat obscure LT_AC_PROG_SED is here to make sure that the + dnl SED environment variable gets set before it's used by the libtool + dnl machinery. This works around buggy libtool versions. +-LT_AC_PROG_SED +-AC_LIBLTDL_INSTALLABLE +-AC_LIBTOOL_DLOPEN + AC_PROG_LIBTOOL +-AC_LIB_LTDL +-AC_SUBST(LTDLINCL) +-AC_SUBST(LIBLTDL) ++AC_LTDL_SHLIBPATH ++AC_LTDL_SHLIBEXT ++AC_LTDL_SYSSEARCHPATH + + + dnl Graphic file format options +diff -Naur iscan-2.29.1.orig/frontend/Makefile.am iscan-2.29.1/frontend/Makefile.am +--- iscan-2.29.1.orig/frontend/Makefile.am 2012-06-11 23:33:33.000000000 -0500 ++++ iscan-2.29.1/frontend/Makefile.am 2013-02-18 20:30:38.764092975 -0600 +@@ -34,7 +34,7 @@ + iscan_LDADD = \ + $(top_builddir)/lib/libimage-stream.la \ + -lsane \ +- @LIBLTDL@ \ ++ -lltdl \ + @GTK_LIBS@ \ + @GDK_IMLIB_LIBS@ \ + $(top_builddir)/non-free/libesmod.so +diff -Naur iscan-2.29.1.orig/lib/Makefile.am iscan-2.29.1/lib/Makefile.am +--- iscan-2.29.1.orig/lib/Makefile.am 2012-06-11 23:33:34.000000000 -0500 ++++ iscan-2.29.1/lib/Makefile.am 2013-02-18 20:30:58.852936051 -0600 +@@ -30,7 +30,7 @@ + libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include + libimage_stream_la_LDFLAGS = -static + libimage_stream_la_LIBADD = \ +- $(LIBLTDL) \ ++ -lltdl \ + $(top_builddir)/lib/pdf/libpdf.la + libimage_stream_la_SOURCES = \ + $(libimage_stream_la_files) diff --git a/media-gfx/iscan/files/iscan-2.29.1-png-libs.patch b/media-gfx/iscan/files/iscan-2.29.1-png-libs.patch new file mode 100644 index 000000000000..32de60a83899 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.29.1-png-libs.patch @@ -0,0 +1,37 @@ +diff -ur iscan-2.29.1/configure.ac iscan-2.29.1.new/configure.ac +--- iscan-2.29.1/configure.ac 2014-01-27 14:15:28.139043864 -0500 ++++ iscan-2.29.1.new/configure.ac 2014-01-27 14:17:10.608044736 -0500 +@@ -279,6 +279,9 @@ + AC_HELP_STRING([--enable-$1], + [ensure support for the $3 file format]), + [if test "x$enable_$1" != xno; then ++ if test "x$4" != xno; then ++ PKG_CHECK_MODULES($3,[$4]) ++ fi + iff_header="`echo $2 | $as_tr_sh`" + AC_CHECK_HEADERS([$2]) + if test `eval echo '$ac_cv_header_'$iff_header` \ +@@ -289,9 +292,9 @@ + [AC_CHECK_HEADERS([$2])]) + ]) + +-ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG) +-ISCAN_FILE_FORMAT(png,png.h,PNG) +-ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF) ++ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG,no) ++ISCAN_FILE_FORMAT(png,png.h,PNG,libpng) ++ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF,no) + + + dnl Support for performance measurements. +diff -ur iscan-2.29.1/frontend/Makefile.am iscan-2.29.1.new/frontend/Makefile.am +--- iscan-2.29.1/frontend/Makefile.am 2014-01-27 14:15:28.123043864 -0500 ++++ iscan-2.29.1.new/frontend/Makefile.am 2014-01-27 14:17:43.628045017 -0500 +@@ -37,6 +37,7 @@ + -lltdl \ + @GTK_LIBS@ \ + @GDK_IMLIB_LIBS@ \ ++ @PNG_LIBS@ \ + $(top_builddir)/non-free/libesmod.so + iscan_SOURCES = \ + $(iscan_source_files) diff --git a/media-gfx/iscan/files/iscan-2.30.1-fix-g++-test.patch b/media-gfx/iscan/files/iscan-2.30.1-fix-g++-test.patch new file mode 100644 index 000000000000..5a7f26eb4ca5 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.30.1-fix-g++-test.patch @@ -0,0 +1,45 @@ +Drop obsolete C++ ABI transistion code. +https://bugs.gentoo.org/549866 + + +--- a/configure.ac ++++ b/configure.ac +@@ -62,27 +62,6 @@ dnl checks for programs + + AC_PROG_CXX + +-# Transitionary check for the C++ ABI while we are switching provided +-# binaries from gcc-3.[23] to gcc-3.4 or later. Currently gcc-3.[23] +-# is still the official compiler version to use, but experimental bi- +-# naries are released with a ".c2" suffix. +-# The CXX_ABI for gcc-3.[23] is 102, btw. +-# Note that the PACKAGE_RELEASE for the gcc-3.4 or later packages has +-# to be larger than that for the gcc-3.[23] packages (as long as both +-# are distributed) for smooth upgrade paths. +- +-if test x"$CXX" = xg++; then +- AC_MSG_CHECKING([C++ ABI version]) +- CXX_ABI="`$CXX -E -dM - < /dev/null | $AWK '/GXX_ABI/ { print $3 }'`" +- AC_MSG_RESULT([$CXX_ABI]) +- if test x"$CXX_ABI" = x1002; then +- PACKAGE_CXX_ABI=".c2" +- else +- PACKAGE_CXX_ABI="" +- fi +- AC_SUBST(PACKAGE_CXX_ABI) +-fi +- + AC_PROG_CC + AC_PROG_CPP + AC_PROG_INSTALL +--- a/non-free/Makefile.am ++++ b/non-free/Makefile.am +@@ -65,7 +65,7 @@ $(NON_FREE_SOLIBS): + *) echo "unsupported architecture" 1>&2; \ + exit 1;; \ + esac; \ +- $(LN_S) $(srcdir)/libesmod-$${arch}$(PACKAGE_CXX_ABI).so $@ ++ $(LN_S) $(srcdir)/libesmod-$${arch}.c2.so $@ + + install-exec-local: $(NON_FREE_SOLIBS) + $(mkinstalldirs) $(DESTDIR)$(libdir) diff --git a/media-gfx/iscan/files/iscan-2.30.1.1-gcc6.patch b/media-gfx/iscan/files/iscan-2.30.1.1-gcc6.patch new file mode 100644 index 000000000000..14a64bcdd9cc --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.30.1.1-gcc6.patch @@ -0,0 +1,11 @@ +--- iscan-2.30.1/lib/jpegstream.cc.old 2016-10-12 02:55:47.345862674 -0400 ++++ iscan-2.30.1/lib/jpegstream.cc 2016-10-12 03:02:53.790439580 -0400 +@@ -82,7 +82,7 @@ + // only that _bits != 8. + for (unsigned int i = 0; i < _h_sz; ++i) + { +- div_t index = div (i, 8 * sizeof (JSAMPLE)); ++ div_t index = div ((int) i, (int) 8 * sizeof (JSAMPLE)); + int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem; + _scanline[i] = ((line[index.quot] & (1 << offset)) + ? 0 : ~0); diff --git a/media-gfx/iscan/files/iscan-usb.sh b/media-gfx/iscan/files/iscan-usb.sh new file mode 100644 index 000000000000..49430616e69e --- /dev/null +++ b/media-gfx/iscan/files/iscan-usb.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# This file is part of media-gfx/iscan +# +# This script changes the permissions and ownership of a USB device under +# /proc/bus/usb to grant access to this device to users in the scanner group. +# +# Ownership is set to root:scanner, permissions are set to 0660. +# +# Arguments : +# ----------- +# ACTION=[add|remove] +# DEVNAME=/dev/bus/usb/BBB/DDD +# SUBSYSTEM=usb_device + +OWNER="root" +GROUP="scanner" +PERMS="0660" + +DEVICE="${DEVNAME/dev/proc}" + +if [ "${ACTION}" = "add" -a "${SUBSYSTEM}" = "usb_device" -a -f "${DEVICE}" ]; then + chmod ${PERMS} "${DEVICE}" && chown ${OWNER}:${GROUP} "${DEVICE}" +fi |