diff options
Diffstat (limited to 'package/sane-backends/patches')
22 files changed, 0 insertions, 326 deletions
diff --git a/package/sane-backends/patches/patch-Makefile_in b/package/sane-backends/patches/patch-Makefile_in deleted file mode 100644 index b1796c56f..000000000 --- a/package/sane-backends/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/Makefile.in 2011-01-30 19:50:56.000000000 +0100 -+++ sane-backends-1.0.22/Makefile.in 2011-10-01 19:26:02.309066938 +0200 -@@ -293,7 +293,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = include lib sanei backend frontend tools doc po -+SUBDIRS = include lib sanei backend frontend - DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite - dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \ - README README.aix README.beos README.darwin README.djpeg README.freebsd \ diff --git a/package/sane-backends/patches/patch-backend_canon630u-common_c b/package/sane-backends/patches/patch-backend_canon630u-common_c deleted file mode 100644 index d9acb4bf1..000000000 --- a/package/sane-backends/patches/patch-backend_canon630u-common_c +++ /dev/null @@ -1,12 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/canon630u-common.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/canon630u-common.c 2014-03-18 08:33:31.000000000 +0100 -@@ -58,9 +58,7 @@ - #include <unistd.h> /* usleep */ - #include <time.h> - #include <math.h> /* exp() */ --#ifdef HAVE_OS2_H - #include <sys/types.h> /* mode_t */ --#endif - #include <sys/stat.h> - #include "lm9830.h" - diff --git a/package/sane-backends/patches/patch-backend_epson2-commands_c b/package/sane-backends/patches/patch-backend_epson2-commands_c deleted file mode 100644 index 3b2c46841..000000000 --- a/package/sane-backends/patches/patch-backend_epson2-commands_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/epson2-commands.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/epson2-commands.c 2014-03-18 08:34:27.000000000 +0100 -@@ -19,6 +19,7 @@ - - #include "sane/config.h" - -+#include <sys/types.h> - #include <byteorder.h> - #include <math.h> - diff --git a/package/sane-backends/patches/patch-backend_genesys_c b/package/sane-backends/patches/patch-backend_genesys_c deleted file mode 100644 index fc0398856..000000000 --- a/package/sane-backends/patches/patch-backend_genesys_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/genesys.c 2011-02-14 00:10:18.000000000 +0100 -+++ sane-backends-1.0.22/backend/genesys.c 2014-03-18 08:36:00.000000000 +0100 -@@ -65,6 +65,7 @@ - #include <errno.h> - #include <string.h> - #include <stdlib.h> -+#include <sys/types.h> - #include <unistd.h> - #include <math.h> - diff --git a/package/sane-backends/patches/patch-backend_genesys_h b/package/sane-backends/patches/patch-backend_genesys_h deleted file mode 100644 index efc830be1..000000000 --- a/package/sane-backends/patches/patch-backend_genesys_h +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/genesys.h 2011-01-16 02:01:28.000000000 +0100 -+++ sane-backends-1.0.22/backend/genesys.h 2014-03-18 08:36:42.000000000 +0100 -@@ -52,6 +52,7 @@ - */ - #undef UNIT_TESTING - -+#include <sys/types.h> - #include "genesys_low.h" - - #define FREE_IFNOT_NULL(x) if(x!=NULL) { free(x); x=NULL;} diff --git a/package/sane-backends/patches/patch-backend_genesys_low_c b/package/sane-backends/patches/patch-backend_genesys_low_c deleted file mode 100644 index 430ab3791..000000000 --- a/package/sane-backends/patches/patch-backend_genesys_low_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/genesys_low.c 2011-02-14 00:10:18.000000000 +0100 -+++ sane-backends-1.0.22/backend/genesys_low.c 2014-03-18 08:37:27.000000000 +0100 -@@ -46,6 +46,7 @@ - #include <errno.h> - #include <string.h> - #include <stdlib.h> -+#include <sys/types.h> - #include <unistd.h> - #include <math.h> - diff --git a/package/sane-backends/patches/patch-backend_hp3900_rts8822_c b/package/sane-backends/patches/patch-backend_hp3900_rts8822_c deleted file mode 100644 index 59b9b5a9b..000000000 --- a/package/sane-backends/patches/patch-backend_hp3900_rts8822_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/hp3900_rts8822.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/hp3900_rts8822.c 2014-03-18 08:38:21.000000000 +0100 -@@ -64,6 +64,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> /* bzero() */ -+#include <sys/types.h> - #include <time.h> /* clock() */ - #include <math.h> /* truncf() */ - #include <ctype.h> /* tolower() */ diff --git a/package/sane-backends/patches/patch-backend_hp5400_sanei_c b/package/sane-backends/patches/patch-backend_hp5400_sanei_c deleted file mode 100644 index 7f340d607..000000000 --- a/package/sane-backends/patches/patch-backend_hp5400_sanei_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/hp5400_sanei.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/hp5400_sanei.c 2014-03-18 08:39:35.000000000 +0100 -@@ -56,6 +56,7 @@ - #include "hp5400_xfer.h" - #include "hp5400_debug.h" - #include <stdio.h> -+#include <sys/types.h> - #include "../include/sane/sanei_usb.h" - - #define CMD_INITBULK1 0x0087 /* send 0x14 */ diff --git a/package/sane-backends/patches/patch-backend_hp5590_low_c b/package/sane-backends/patches/patch-backend_hp5590_low_c deleted file mode 100644 index 7812886dc..000000000 --- a/package/sane-backends/patches/patch-backend_hp5590_low_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/hp5590_low.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/hp5590_low.c 2014-03-18 08:38:55.000000000 +0100 -@@ -46,6 +46,7 @@ - - #include <stdio.h> - #include <string.h> -+#include <sys/types.h> - #include <errno.h> - #ifdef HAVE_NETINET_IN_H - # include <netinet/in.h> diff --git a/package/sane-backends/patches/patch-backend_kvs20xx_opt_c b/package/sane-backends/patches/patch-backend_kvs20xx_opt_c deleted file mode 100644 index 253699d14..000000000 --- a/package/sane-backends/patches/patch-backend_kvs20xx_opt_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/kvs20xx_opt.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/kvs20xx_opt.c 2014-03-18 08:41:24.000000000 +0100 -@@ -8,6 +8,7 @@ - - #include "../include/sane/config.h" - -+#include <sys/types.h> - #include <string.h> - - #define DEBUG_DECLARE_ONLY diff --git a/package/sane-backends/patches/patch-backend_microtek_c b/package/sane-backends/patches/patch-backend_microtek_c deleted file mode 100644 index dde369f2d..000000000 --- a/package/sane-backends/patches/patch-backend_microtek_c +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/backend/microtek.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/microtek.c 2011-10-01 19:26:01.659066938 +0200 -@@ -59,6 +59,7 @@ - - #include "../include/sane/config.h" - -+#include <stdarg.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> diff --git a/package/sane-backends/patches/patch-backend_pixma_bjnp_c b/package/sane-backends/patches/patch-backend_pixma_bjnp_c deleted file mode 100644 index 5d347c00e..000000000 --- a/package/sane-backends/patches/patch-backend_pixma_bjnp_c +++ /dev/null @@ -1,22 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/backend/pixma_bjnp.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/pixma_bjnp.c 2011-10-01 19:26:01.699066938 +0200 -@@ -59,9 +59,6 @@ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif --#ifdef HAVE_SYS_TIME_H --#include <sys/timeb.h> --#endif - - /* - * networking stuff -@@ -196,7 +193,7 @@ truncate_hostname (char *hostname, char - { - /* this is a hostname, not an ip-address, so remove domain part of the name */ - -- if ((dot = index (short_hostname, '.')) != NULL) -+ if ((dot = strchr(short_hostname, '.')) != NULL) - *dot = '\0'; - } - return short_hostname; diff --git a/package/sane-backends/patches/patch-backend_pixma_common_h b/package/sane-backends/patches/patch-backend_pixma_common_h deleted file mode 100644 index 822cc888e..000000000 --- a/package/sane-backends/patches/patch-backend_pixma_common_h +++ /dev/null @@ -1,13 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.20.orig/backend/pixma_common.h 2009-02-05 15:36:36.000000000 +0100 -+++ sane-backends-1.0.20/backend/pixma_common.h 2009-05-11 21:00:58.000000000 +0200 -@@ -220,8 +220,8 @@ void pixma_hexdump (int level, const voi - void pixma_dump (int level, const char *type, const void *data, int len, - int size, int max); - # define DEBUG_DECLARE_ONLY --# include "../include/sane/sanei_debug.h" - #endif /* NDEBUG */ - /** @} end of group debug */ -+# include "../include/sane/sanei_debug.h" - - #endif diff --git a/package/sane-backends/patches/patch-backend_pixma_imageclass_c b/package/sane-backends/patches/patch-backend_pixma_imageclass_c deleted file mode 100644 index cb265aedb..000000000 --- a/package/sane-backends/patches/patch-backend_pixma_imageclass_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/backend/pixma_imageclass.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/pixma_imageclass.c 2011-10-01 19:26:01.779066938 +0200 -@@ -161,8 +161,6 @@ query_status (pixma_t * s) - if (error >= 0) - { - memcpy (mf->current_status, data, 12); -- DBG (3, "Current status: paper=%u cal=%u lamp=%u\n", -- data[1], data[8], data[7]); - PDBG (pixma_dbg (3, "Current status: paper=%u cal=%u lamp=%u\n", - data[1], data[8], data[7])); - } diff --git a/package/sane-backends/patches/patch-backend_rts88xx_lib_c b/package/sane-backends/patches/patch-backend_rts88xx_lib_c deleted file mode 100644 index 060f0a10e..000000000 --- a/package/sane-backends/patches/patch-backend_rts88xx_lib_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/rts88xx_lib.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/rts88xx_lib.c 2014-03-18 08:42:41.000000000 +0100 -@@ -54,6 +54,7 @@ - - #include <stdio.h> - #include <sys/time.h> -+#include <sys/types.h> - - #include "../include/_stdint.h" - diff --git a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c deleted file mode 100644 index 436102a18..000000000 --- a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/backend/sm3600-scanutil.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/sm3600-scanutil.c 2011-10-01 19:26:01.819066938 +0200 -@@ -47,6 +47,7 @@ $Id$ - - ====================================================================== */ - -+#include <stdarg.h> - #include <unistd.h> - #include "sm3600-scantool.h" - diff --git a/package/sane-backends/patches/patch-backend_umax1220u-common_c b/package/sane-backends/patches/patch-backend_umax1220u-common_c deleted file mode 100644 index 8889f7795..000000000 --- a/package/sane-backends/patches/patch-backend_umax1220u-common_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.20.orig/backend/umax1220u-common.c 2006-04-17 14:46:41.000000000 +0200 -+++ sane-backends-1.0.20/backend/umax1220u-common.c 2009-05-11 21:17:47.000000000 +0200 -@@ -556,7 +556,7 @@ cwritev (UMAX_Handle * scan, UMAX_Cmd cm - /* Read the opcode back */ - - CHK (cread (scan, cmd, len, buf, NULL)); -- if (bcmp (buf, data, len)) -+ if (memcmp (buf, data, len)) - { - DBG (1, "cwritev: verification failed\n"); - return SANE_STATUS_IO_ERROR; diff --git a/package/sane-backends/patches/patch-backend_xerox_mfp_c b/package/sane-backends/patches/patch-backend_xerox_mfp_c deleted file mode 100644 index d58262197..000000000 --- a/package/sane-backends/patches/patch-backend_xerox_mfp_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/xerox_mfp.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/xerox_mfp.c 2014-03-18 08:44:56.000000000 +0100 -@@ -22,6 +22,7 @@ - #include <math.h> - #include <unistd.h> - #include <sys/time.h> -+#include <sys/types.h> - #include "../include/sane/sane.h" - #include "../include/sane/sanei.h" - #include "../include/sane/saneopts.h" diff --git a/package/sane-backends/patches/patch-configure b/package/sane-backends/patches/patch-configure deleted file mode 100644 index d8d5aca8d..000000000 --- a/package/sane-backends/patches/patch-configure +++ /dev/null @@ -1,90 +0,0 @@ ---- sane-backends-1.0.22.orig/configure 2011-02-14 02:27:52.000000000 +0100 -+++ sane-backends-1.0.22/configure 2011-10-01 19:32:51.919066675 +0200 -@@ -7529,77 +7529,7 @@ done - - - -- -- -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L" >&5 --$as_echo_n "checking for LIBV4L... " >&6; } -- --if test -n "$LIBV4L_CFLAGS"; then -- pkg_cv_LIBV4L_CFLAGS="$LIBV4L_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_LIBV4L_CFLAGS=`$PKG_CONFIG --cflags "libv4l1" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$LIBV4L_LIBS"; then -- pkg_cv_LIBV4L_LIBS="$LIBV4L_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_LIBV4L_LIBS=`$PKG_CONFIG --libs "libv4l1" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libv4l1" 2>&1` -- else -- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors "libv4l1" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$LIBV4L_PKG_ERRORS" >&5 -- -- have_libv4l1=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- have_libv4l1=no --else -- LIBV4L_CFLAGS=$pkg_cv_LIBV4L_CFLAGS -- LIBV4L_LIBS=$pkg_cv_LIBV4L_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- have_libv4l1=yes --fi -+have_libv4l1=no - - - -@@ -16874,7 +16804,7 @@ ALL_BACKENDS="abaton agfafocus apple art - leo lexmark ma1509 magicolor \ - matsushita microtek microtek2 mustek mustek_pp \ - mustek_usb mustek_usb2 nec net niash pie pint \ -- pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ -+ pixma plustek plustek_pp ricoh rts8891 s9036 \ - sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ - stv680 tamarack teco1 teco2 teco3 test u12 umax - umax_pp umax1220u v4l xerox_mfp p5" diff --git a/package/sane-backends/patches/patch-configure_in b/package/sane-backends/patches/patch-configure_in deleted file mode 100644 index fbc410c70..000000000 --- a/package/sane-backends/patches/patch-configure_in +++ /dev/null @@ -1,11 +0,0 @@ ---- sane-backends-1.0.22.orig/configure.in 2011-02-14 00:27:15.000000000 +0100 -+++ sane-backends-1.0.22/configure.in 2011-10-01 19:26:02.249066938 +0200 -@@ -559,7 +559,7 @@ ALL_BACKENDS="abaton agfafocus apple art - leo lexmark ma1509 magicolor \ - matsushita microtek microtek2 mustek mustek_pp \ - mustek_usb mustek_usb2 nec net niash pie pint \ -- pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ -+ pixma plustek plustek_pp ricoh rts8891 s9036 \ - sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ - stv680 tamarack teco1 teco2 teco3 test u12 umax - umax_pp umax1220u v4l xerox_mfp p5" diff --git a/package/sane-backends/patches/patch-include_sane_sanei_tcp_h b/package/sane-backends/patches/patch-include_sane_sanei_tcp_h deleted file mode 100644 index 4ba390003..000000000 --- a/package/sane-backends/patches/patch-include_sane_sanei_tcp_h +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/include/sane/sanei_tcp.h 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/include/sane/sanei_tcp.h 2014-03-18 08:31:07.000000000 +0100 -@@ -20,6 +20,7 @@ - - #include <sane/sane.h> - -+#include <sys/types.h> - #include <netinet/in.h> - #include <netdb.h> - diff --git a/package/sane-backends/patches/patch-include_sane_sanei_udp_h b/package/sane-backends/patches/patch-include_sane_sanei_udp_h deleted file mode 100644 index 3d70edada..000000000 --- a/package/sane-backends/patches/patch-include_sane_sanei_udp_h +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/include/sane/sanei_udp.h 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/include/sane/sanei_udp.h 2014-03-18 08:31:40.000000000 +0100 -@@ -20,6 +20,7 @@ - - #include <sane/sane.h> - -+#include <sys/types.h> - #include <netinet/in.h> - #include <netdb.h> - |