Merge branch 'master' of git+ssh://openadk.org/git/openadk

8 files changed, 104 insertions, 36 deletions

diff --git a/package/sane-backends/patches/patch-Makefile_in b/package/sane-backends/patches/patch-Makefile_in
index 6a143eb05..b1796c56f 100644
--- a/package/sane-backends/patches/patch-Makefile_in
+++ b/package/sane-backends/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/Makefile.in	2009-04-30 15:41:20.000000000 +0200
-+++ sane-backends-1.0.20/Makefile.in	2009-05-11 00:17:44.000000000 +0200
-@@ -244,7 +244,7 @@ target_alias = @target_alias@
+--- 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@
diff --git a/package/sane-backends/patches/patch-backend_microtek_c b/package/sane-backends/patches/patch-backend_microtek_c
index 6d99f5808..dde369f2d 100644
--- a/package/sane-backends/patches/patch-backend_microtek_c
+++ b/package/sane-backends/patches/patch-backend_microtek_c
@@ -1,9 +1,9 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/backend/microtek.c	2009-02-26 17:11:17.000000000 +0100
-+++ sane-backends-1.0.20/backend/microtek.c	2009-05-11 00:10:23.000000000 +0200
+--- 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 "sane/config.h"
+ #include "../include/sane/config.h"
  
 +#include <stdarg.h>
  #include <stdlib.h>
diff --git a/package/sane-backends/patches/patch-backend_pixma_bjnp_c b/package/sane-backends/patches/patch-backend_pixma_bjnp_c
index 4b3224eb9..5d347c00e 100644
--- a/package/sane-backends/patches/patch-backend_pixma_bjnp_c
+++ b/package/sane-backends/patches/patch-backend_pixma_bjnp_c
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/backend/pixma_bjnp.c	2009-04-01 18:26:58.000000000 +0200
-+++ sane-backends-1.0.20/backend/pixma_bjnp.c	2009-05-11 00:23:33.000000000 +0200
+--- 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>
@@ -11,7 +11,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  /* 
   * networking stuff
-@@ -196,7 +193,7 @@ truncate_hostname (char *hostname, char 
+@@ -196,7 +193,7 @@ truncate_hostname (char *hostname, char
      {
        /* this is a hostname, not an ip-address, so remove domain part of the name */
  
diff --git a/package/sane-backends/patches/patch-backend_pixma_imageclass_c b/package/sane-backends/patches/patch-backend_pixma_imageclass_c
index 7c2492c5f..cb265aedb 100644
--- a/package/sane-backends/patches/patch-backend_pixma_imageclass_c
+++ b/package/sane-backends/patches/patch-backend_pixma_imageclass_c
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/backend/pixma_imageclass.c	2009-03-12 18:36:09.000000000 +0100
-+++ sane-backends-1.0.20/backend/pixma_imageclass.c	2009-05-11 00:30:36.000000000 +0200
-@@ -159,8 +159,6 @@ query_status (pixma_t * s)
+--- 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);
diff --git a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c
index 542afb9c1..436102a18 100644
--- a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c
+++ b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/backend/sm3600-scanutil.c	2005-08-16 21:50:34.000000000 +0200
-+++ sane-backends-1.0.20/backend/sm3600-scanutil.c	2009-05-11 21:08:46.000000000 +0200
-@@ -47,6 +47,7 @@ $Id: sm3600-scanutil.c,v 1.12 2005-08-16
+--- 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$
  
  ====================================================================== */
  
diff --git a/package/sane-backends/patches/patch-configure b/package/sane-backends/patches/patch-configure
index 927e3a8ab..d8d5aca8d 100644
--- a/package/sane-backends/patches/patch-configure
+++ b/package/sane-backends/patches/patch-configure
@@ -1,11 +1,90 @@
---- sane-backends-1.0.20.orig/configure	2009-05-03 18:59:22.000000000 +0200
-+++ sane-backends-1.0.20/configure	2010-01-14 19:51:31.000000000 +0100
-@@ -34117,7 +34117,7 @@ ALL_BACKENDS="abaton agfafocus apple art
-         hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \
+--- 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"
+         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
index 48e14d989..fbc410c70 100644
--- a/package/sane-backends/patches/patch-configure_in
+++ b/package/sane-backends/patches/patch-configure_in
@@ -1,11 +1,11 @@
---- sane-backends-1.0.20.orig/configure.in	2009-05-03 03:25:23.000000000 +0200
-+++ sane-backends-1.0.20/configure.in	2009-06-19 23:27:39.000000000 +0200
-@@ -513,7 +513,7 @@ ALL_BACKENDS="abaton agfafocus apple art
-         hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \
+--- 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"
+         umax_pp umax1220u v4l xerox_mfp p5"
diff --git a/package/sane-backends/patches/patch-ltmain_sh b/package/sane-backends/patches/patch-ltmain_sh
deleted file mode 100644
index 46c089aa5..000000000
--- a/package/sane-backends/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- sane-backends-1.0.20.orig/ltmain.sh	2009-02-10 22:41:47.000000000 +0100
-+++ sane-backends-1.0.20/ltmain.sh	2011-01-17 11:25:40.000000000 +0100
-@@ -1680,7 +1680,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.