diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index 7c116df92789..ee217e7ec981 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,21 +1,21 @@ -# $NetBSD: Makefile,v 1.72 2020/05/31 17:19:49 rillig Exp $ +# $NetBSD: Makefile,v 1.73 2020/06/13 20:54:32 leot Exp $ -PKGREVISION= 1 .include "Makefile.common" +MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/ COMMENT= API for access to scanners, digital cameras, frame grabbers, etc DISTNAME= sane-backends-${SANE_VERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -# lib/Makefile.in builds .o files and then .a, but rules for shlibs, -# while apparently independent, cause libtool to create .o again, -# making it possible for the ar step of the .a build to fail to find -# the .o -MAKE_JOBS_SAFE= NO - USE_TOOLS+= msgfmt msgmerge pkg-config USE_PKGLOCALEDIR= YES +# c++11 is needed for genesys backend +USE_LANGUAGES= c c++11 + +# C++11 +GCC_REQD+= 4.8 + CONFIGURE_ARGS+= --with-gphoto2=no CONFIGURE_ARGS+= --without-snmp CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common index 273df4d21bc7..12bf404c898b 100644 --- a/graphics/sane-backends/Makefile.common +++ b/graphics/sane-backends/Makefile.common @@ -1,9 +1,7 @@ -# $NetBSD: Makefile.common,v 1.34 2018/03/31 22:39:20 wiz Exp $ +# $NetBSD: Makefile.common,v 1.35 2020/06/13 20:54:32 leot Exp $ # used by graphics/sane-frontends/Makefile CATEGORIES?= graphics -MASTER_SITES?= https://alioth.debian.org/frs/download.php/file/4224/ -# http://alioth.debian.org/frs/?group_id=30186 MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE?= http://www.sane-project.org/ @@ -11,7 +9,7 @@ LICENSE= gnu-gpl-v2 SANE_MAJOR?= 1 SANE_MINOR?= 0 -SANE_MICRO?= 27 +SANE_MICRO?= 30 SANE_VERSION= ${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO} PLIST_SUBST+= SANE_MAJOR=${SANE_MAJOR:Q} PLIST_SUBST+= SANE_MINOR=${SANE_MINOR:Q} diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST index 3e8483d3d417..71fe12fcd1b3 100644 --- a/graphics/sane-backends/PLIST +++ b/graphics/sane-backends/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.34 2019/08/07 15:52:13 maya Exp $ +@comment $NetBSD: PLIST,v 1.35 2020/06/13 20:54:32 leot Exp $ bin/gamma4scanimage bin/sane-config bin/sane-find-scanner @@ -7,28 +7,6 @@ bin/umax_pp include/sane/sane.h include/sane/saneopts.h lib/libsane.la -${PLIST.nls}share/locale/bg/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/cs/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/da/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/de/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/en@quot/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/en_GB/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/eo/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/es/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/fi/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/fr/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/gl/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/hu/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/it/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/ja/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/nb/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/nl/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/pl/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/pt/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/ru/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/sv/LC_MESSAGES/sane-backends.mo -${PLIST.nls}share/locale/uk/LC_MESSAGES/sane-backends.mo lib/pkgconfig/sane-backends.pc lib/sane/libsane-abaton.la lib/sane/libsane-agfafocus.la @@ -93,6 +71,7 @@ lib/sane/libsane-pixma.la lib/sane/libsane-plustek.la lib/sane/libsane-plustek_pp.la lib/sane/libsane-ricoh.la +lib/sane/libsane-ricoh2.la lib/sane/libsane-rts8891.la lib/sane/libsane-s9036.la lib/sane/libsane-sceptre.la @@ -179,6 +158,7 @@ man/man5/sane-pixma.5 man/man5/sane-plustek.5 man/man5/sane-plustek_pp.5 man/man5/sane-ricoh.5 +man/man5/sane-ricoh2.5 man/man5/sane-rts8891.5 man/man5/sane-s9036.5 man/man5/sane-sceptre.5 @@ -207,6 +187,34 @@ sbin/saned share/doc/sane-backends/AUTHORS share/doc/sane-backends/COPYING share/doc/sane-backends/ChangeLog +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.0 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.1 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.10 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.11 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.12 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.13 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.14 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.15 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.16 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.17 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.18 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.19 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.2 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.20 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.21 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.22 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.23 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.24 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.25 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.27 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.28 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.3 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.4 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.5 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.6 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.7 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.8 +share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.9 share/doc/sane-backends/LICENSE share/doc/sane-backends/NEWS share/doc/sane-backends/PROBLEMS @@ -361,6 +369,28 @@ share/examples/sane/umax.conf share/examples/sane/umax1220u.conf share/examples/sane/umax_pp.conf share/examples/sane/xerox_mfp.conf +${PLIST.nls}share/locale/bg/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/cs/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/da/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/de/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/en@quot/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/en_GB/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/eo/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/es/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/fi/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/fr/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/gl/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/hu/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/it/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/ja/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/nb/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/nl/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/pl/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/pt/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/ru/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/sv/LC_MESSAGES/sane-backends.mo +${PLIST.nls}share/locale/uk/LC_MESSAGES/sane-backends.mo @pkgdir share/sane/snapscan @pkgdir share/sane/gt68xx @pkgdir share/sane/epjitsu diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo index 8d97952390e1..1e4e1a85c2d0 100644 --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.46 2018/02/25 21:22:07 wiz Exp $ +$NetBSD: distinfo,v 1.47 2020/06/13 20:54:32 leot Exp $ -SHA1 (sane-backends-1.0.27.tar.gz) = 579ec4d6279c7f0f02014358a7e74056672a1e43 -RMD160 (sane-backends-1.0.27.tar.gz) = 09afbf4efee05759aef49de8d41c7d089a41ed05 -SHA512 (sane-backends-1.0.27.tar.gz) = c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5 -Size (sane-backends-1.0.27.tar.gz) = 6430188 bytes +SHA1 (sane-backends-1.0.30.tar.gz) = 4f6a2e56d92d15a58dcabcba76a36929a2fd882f +RMD160 (sane-backends-1.0.30.tar.gz) = 85c57e773d26e8c82304d3d6bce38dcda0f2b8c0 +SHA512 (sane-backends-1.0.30.tar.gz) = e9f4ab1f21d5ab0e09b101389c325947824945af968f08b307485f79d4dc4c134b8a1979fb0cf0cfa72435abffe70d0060748a2c2ec46514eb15a0442ee181a5 +Size (sane-backends-1.0.30.tar.gz) = 7204519 bytes SHA1 (patch-aa) = 91f5838b7c455dc160ba22d15659c1b19a222668 SHA1 (patch-ab) = f6ec74b90f5499d07117559c7079ba2efccccf17 SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248 SHA1 (patch-ai) = 14f5467eb865406cbec00b8d47b5c23c4c89f113 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76 -SHA1 (patch-backend_epsonds.c) = 2ecbb36431254b7059c3e35b5ac094c4b3f41374 +SHA1 (patch-backend_pixma_pixma__bjnp.c) = c48e929910cbe33b91c919de3f47badd2bf063f0 SHA1 (patch-m4_byteorder.m4) = 23f4b0256fc9980d3472e77ab558b0e24a9495b4 SHA1 (patch-tools_umax__pp.c) = debe660184a1380a894e8a5414983f5fdb19cded diff --git a/graphics/sane-backends/patches/patch-backend_epsonds.c b/graphics/sane-backends/patches/patch-backend_epsonds.c deleted file mode 100644 index 8a1c2e96f911..000000000000 --- a/graphics/sane-backends/patches/patch-backend_epsonds.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-backend_epsonds.c,v 1.1 2018/02/25 21:22:07 wiz Exp $ - -Add header for struct timeval. - ---- backend/epsonds.c.orig 2017-05-15 01:19:11.000000000 +0000 -+++ backend/epsonds.c -@@ -41,6 +41,7 @@ - #include "sane/config.h" - - #include -+#include - #include - - #include "sane/saneopts.h" diff --git a/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c b/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c new file mode 100644 index 000000000000..87076520f106 --- /dev/null +++ b/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c @@ -0,0 +1,20 @@ +$NetBSD: patch-backend_pixma_pixma__bjnp.c,v 1.1 2020/06/13 20:54:32 leot Exp $ + +Reuse BJNP_HOST_MAX instead of possible undefined HOST_NAME_MAX. + +scanner_host is populated via get_scanner_name() that is already +limited by BJNP_HOST_MAX. + +--- backend/pixma/pixma_bjnp.c.orig 2020-05-17 11:54:18.000000000 +0000 ++++ backend/pixma/pixma_bjnp.c +@@ -1990,8 +1990,8 @@ sanei_bjnp_find_devices (const char **co + fd_set fdset; + fd_set active_fdset; + struct timeval timeout; +- char scanner_host[HOST_NAME_MAX]; +- char uri[HOST_NAME_MAX + 32]; ++ char scanner_host[BJNP_HOST_MAX]; ++ char uri[BJNP_HOST_MAX + 32]; + int dev_no; + int port; + int auto_detect = 1;