Update to sane-backends-1.0.21.

* new backends
* lots of bugfixes
* 224 more scanner models supported

If you have any regression with your device, let me know.
This commit is contained in:
ajacoutot 2010-04-26 10:41:28 +00:00
parent 4980cdd108
commit 831597e2c8
10 changed files with 74 additions and 52 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2010/03/21 09:53:19 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.23 2010/04/26 10:41:28 ajacoutot Exp $
COMMENT= API for accessing scanners, backends
DISTNAME= sane-backends-1.0.20
PKGNAME= ${DISTNAME}p2
DISTNAME= sane-backends-1.0.21
SHARED_LIBS= sane 2.0 # .1.0
CATEGORIES= graphics

View File

@ -1,5 +1,5 @@
MD5 (sane-backends-1.0.20.tar.gz) = oM/f3ryi/rTyul00GLFaQg==
RMD160 (sane-backends-1.0.20.tar.gz) = uAwKFadbO84HBg1lrs3K94YMMjs=
SHA1 (sane-backends-1.0.20.tar.gz) = O00uzei+QEu0Qml3HPXcbkwQsIY=
SHA256 (sane-backends-1.0.20.tar.gz) = j7FTHmGSuc/i9EoCC4gdeKE/BUJrRiY8++f8JQeuPTo=
SIZE (sane-backends-1.0.20.tar.gz) = 4760873
MD5 (sane-backends-1.0.21.tar.gz) = vlhqI2M5Sc8uzwycbXaRMA==
RMD160 (sane-backends-1.0.21.tar.gz) = AArkL/1khMVDialGi93h3Px1jd4=
SHA1 (sane-backends-1.0.21.tar.gz) = SieJ6p2uHs4JDQFqvRSw8kUNm9s=
SHA256 (sane-backends-1.0.21.tar.gz) = 5E4vopJYl886nGN7gSJHcrRIODW/VGpIz5R3aJAilIs=
SIZE (sane-backends-1.0.21.tar.gz) = 5050344

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2009/05/06 10:23:21 ajacoutot Exp $
--- Makefile.in.orig Tue May 5 11:36:35 2009
+++ Makefile.in Tue May 5 11:37:09 2009
@@ -33,7 +33,7 @@ POST_UNINSTALL = :
$OpenBSD: patch-Makefile_in,v 1.2 2010/04/26 10:41:28 ajacoutot Exp $
--- Makefile.in.orig Wed Apr 14 02:52:59 2010
+++ Makefile.in Mon Apr 26 08:31:07 2010
@@ -35,7 +35,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2009/05/06 10:23:21 ajacoutot Exp $
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/configure $(top_srcdir)/include/sane/config.h.in \
AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \
@@ -246,11 +246,7 @@ top_builddir = @top_builddir@
@@ -292,11 +292,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = include lib sanei backend frontend tools doc po
DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-backend_Makefile_in,v 1.4 2009/05/06 10:23:21 ajacoutot Exp $
--- backend/Makefile.in.orig Tue May 5 10:27:46 2009
+++ backend/Makefile.in Tue May 5 10:29:13 2009
@@ -1485,7 +1485,7 @@ AM_LDFLAGS = @STRICT_LDFLAGS@
$OpenBSD: patch-backend_Makefile_in,v 1.5 2010/04/26 10:41:28 ajacoutot Exp $
--- backend/Makefile.in.orig Wed Apr 14 02:52:59 2010
+++ backend/Makefile.in Mon Apr 26 08:31:07 2010
@@ -1598,7 +1598,7 @@ AM_LDFLAGS = @STRICT_LDFLAGS@
# The -rpath option is added because we are creating _LTLIBRARIES based
# on configure substitution. This causes automake to not know the
# correct $libdir and must be added here.

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-backend_dll_conf_in,v 1.4 2010/03/21 09:53:19 ajacoutot Exp $
--- backend/dll.conf.in.orig Wed Mar 4 15:55:34 2009
+++ backend/dll.conf.in Thu Jan 21 11:03:41 2010
$OpenBSD: patch-backend_dll_conf_in,v 1.5 2010/04/26 10:41:28 ajacoutot Exp $
--- backend/dll.conf.in.orig Mon Apr 5 15:18:03 2010
+++ backend/dll.conf.in Mon Apr 26 08:31:07 2010
@@ -30,7 +30,7 @@ genesys
gt68xx
hp
@ -10,7 +10,7 @@ $OpenBSD: patch-backend_dll_conf_in,v 1.4 2010/03/21 09:53:19 ajacoutot Exp $
hp3500
hp4200
hp5400
@@ -56,7 +56,7 @@ pixma
@@ -59,7 +59,7 @@ pixma
plustek
#plustek_pp
#pnm
@ -19,7 +19,7 @@ $OpenBSD: patch-backend_dll_conf_in,v 1.4 2010/03/21 09:53:19 ajacoutot Exp $
ricoh
rts8891
s9036
@@ -77,5 +77,5 @@ u12
@@ -80,5 +80,5 @@ u12
umax
#umax_pp
umax1220u

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-backend_epson2_c,v 1.1 2010/04/26 10:41:28 ajacoutot Exp $
--- backend/epson2.c.orig Mon Apr 26 08:38:23 2010
+++ backend/epson2.c Mon Apr 26 08:39:26 2010
@@ -57,6 +57,7 @@
#include <unistd.h>
#include <errno.h>
#include <sys/time.h>
+#include <sys/socket.h>
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-backend_kodak_c,v 1.1 2010/04/26 10:41:28 ajacoutot Exp $
--- backend/kodak.c.orig Mon Apr 26 08:45:06 2010
+++ backend/kodak.c Mon Apr 26 09:03:45 2010
@@ -110,10 +110,10 @@
# include <libc.h> /* NeXTStep/OpenStep */
#endif
-#include "sane/sanei_backend.h"
-#include "sane/sanei_scsi.h"
-#include "sane/saneopts.h"
-#include "sane/sanei_config.h"
+#include "../include/sane/sanei_backend.h"
+#include "../include/sane/sanei_scsi.h"
+#include "../include/sane/saneopts.h"
+#include "../include/sane/sanei_config.h"
#include "kodak-cmd.h"
#include "kodak.h"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2010/03/21 09:53:19 ajacoutot Exp $
--- configure.orig Tue May 5 10:03:09 2009
+++ configure Tue May 5 10:04:50 2009
@@ -11606,13 +11606,13 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
$OpenBSD: patch-configure,v 1.9 2010/04/26 10:41:28 ajacoutot Exp $
--- configure.orig Mon Apr 26 02:57:49 2010
+++ configure Mon Apr 26 08:31:07 2010
@@ -11687,13 +11687,13 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.8 2010/03/21 09:53:19 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11672,7 +11672,7 @@ fi
@@ -11753,7 +11753,7 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.8 2010/03/21 09:53:19 ajacoutot Exp $
fi
have_pthread=yes
@@ -11843,18 +11843,6 @@ if test "${with_group+set}" = set; then
@@ -11927,18 +11927,6 @@ if test "${with_group+set}" = set; then
fi

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.8 2010/03/21 09:53:19 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared,v 1.9 2010/04/26 10:41:28 ajacoutot Exp $
@lib lib/libsane.so.${LIBsane_VERSION}
lib/sane/libsane-abaton.so
lib/sane/libsane-agfafocus.so
@ -37,6 +37,8 @@ lib/sane/libsane-hp5590.so
lib/sane/libsane-hpljm1005.so
lib/sane/libsane-hs2p.so
lib/sane/libsane-ibm.so
lib/sane/libsane-kodak.so
lib/sane/libsane-kvs1025.so
lib/sane/libsane-leo.so
lib/sane/libsane-lexmark.so
lib/sane/libsane-ma1509.so
@ -45,10 +47,10 @@ lib/sane/libsane-microtek.so
lib/sane/libsane-microtek2.so
lib/sane/libsane-mustek.so
lib/sane/libsane-mustek_usb.so
lib/sane/libsane-mustek_usb2.so
lib/sane/libsane-nec.so
lib/sane/libsane-net.so
lib/sane/libsane-niash.so
lib/sane/libsane-p5.so
lib/sane/libsane-pie.so
lib/sane/libsane-pint.so
lib/sane/libsane-pixma.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2010/03/21 09:53:19 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.8 2010/04/26 10:41:28 ajacoutot Exp $
@newgroup _saned:553
@newuser _saned:553:_saned:daemon:SANE Scanner Daemon:/var/empty:/sbin/nologin
%%SHARED%%
@ -86,6 +86,10 @@ lib/sane/
@comment lib/sane/libsane-hs2p.la
@comment lib/sane/libsane-ibm.a
@comment lib/sane/libsane-ibm.la
@comment lib/sane/libsane-kodak.a
@comment lib/sane/libsane-kodak.la
@comment lib/sane/libsane-kvs1025.a
@comment lib/sane/libsane-kvs1025.la
@comment lib/sane/libsane-leo.a
@comment lib/sane/libsane-leo.la
@comment lib/sane/libsane-lexmark.a
@ -102,14 +106,14 @@ lib/sane/
@comment lib/sane/libsane-mustek.la
@comment lib/sane/libsane-mustek_usb.a
@comment lib/sane/libsane-mustek_usb.la
@comment lib/sane/libsane-mustek_usb2.a
@comment lib/sane/libsane-mustek_usb2.la
@comment lib/sane/libsane-nec.a
@comment lib/sane/libsane-nec.la
@comment lib/sane/libsane-net.a
@comment lib/sane/libsane-net.la
@comment lib/sane/libsane-niash.a
@comment lib/sane/libsane-niash.la
@comment lib/sane/libsane-p5.a
@comment lib/sane/libsane-p5.la
@comment lib/sane/libsane-pie.a
@comment lib/sane/libsane-pie.la
@comment lib/sane/libsane-pint.a
@ -203,6 +207,8 @@ lib/sane/
@man man/man5/sane-hpljm1005.5
@man man/man5/sane-hs2p.5
@man man/man5/sane-ibm.5
@man man/man5/sane-kodak.5
@man man/man5/sane-kvs1025.5
@man man/man5/sane-leo.5
@man man/man5/sane-lexmark.5
@man man/man5/sane-ma1509.5
@ -211,10 +217,10 @@ lib/sane/
@man man/man5/sane-microtek2.5
@man man/man5/sane-mustek.5
@man man/man5/sane-mustek_usb.5
@man man/man5/sane-mustek_usb2.5
@man man/man5/sane-nec.5
@man man/man5/sane-net.5
@man man/man5/sane-niash.5
@man man/man5/sane-p5.5
@man man/man5/sane-pie.5
@man man/man5/sane-pint.5
@man man/man5/sane-pixma.5
@ -401,6 +407,8 @@ share/examples/sane-backends/sane.d/hs2p.conf
@sample ${SYSCONFDIR}/sane.d/hs2p.conf
share/examples/sane-backends/sane.d/ibm.conf
@sample ${SYSCONFDIR}/sane.d/ibm.conf
share/examples/sane-backends/sane.d/kodak.conf
@sample ${SYSCONFDIR}/sane.d/kodak.conf
share/examples/sane-backends/sane.d/leo.conf
@sample ${SYSCONFDIR}/sane.d/leo.conf
share/examples/sane-backends/sane.d/lexmark.conf
@ -421,6 +429,8 @@ share/examples/sane-backends/sane.d/nec.conf
@sample ${SYSCONFDIR}/sane.d/nec.conf
share/examples/sane-backends/sane.d/net.conf
@sample ${SYSCONFDIR}/sane.d/net.conf
share/examples/sane-backends/sane.d/p5.conf
@sample ${SYSCONFDIR}/sane.d/p5.conf
share/examples/sane-backends/sane.d/pie.conf
@sample ${SYSCONFDIR}/sane.d/pie.conf
share/examples/sane-backends/sane.d/pixma.conf
@ -471,24 +481,6 @@ share/examples/sane-backends/sane.d/umax_pp.conf
@sample ${SYSCONFDIR}/sane.d/umax_pp.conf
share/examples/sane-backends/sane.d/xerox_mfp.conf
@sample ${SYSCONFDIR}/sane.d/xerox_mfp.conf
share/locale/bg/LC_MESSAGES/sane-backends.mo
share/locale/cs/LC_MESSAGES/sane-backends.mo
share/locale/da/LC_MESSAGES/sane-backends.mo
share/locale/de/LC_MESSAGES/sane-backends.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/sane-backends.mo
share/locale/eo/LC_MESSAGES/sane-backends.mo
share/locale/es/LC_MESSAGES/sane-backends.mo
share/locale/fi/LC_MESSAGES/sane-backends.mo
share/locale/fr/LC_MESSAGES/sane-backends.mo
share/locale/it/LC_MESSAGES/sane-backends.mo
share/locale/nb/LC_MESSAGES/sane-backends.mo
share/locale/nl/LC_MESSAGES/sane-backends.mo
share/locale/pl/LC_MESSAGES/sane-backends.mo
share/locale/pt/LC_MESSAGES/sane-backends.mo
share/locale/ru/LC_MESSAGES/sane-backends.mo
share/locale/sv/LC_MESSAGES/sane-backends.mo
share/sane/
share/sane/artec_eplus48u/
share/sane/epjitsu/