summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/sane-backends/Makefile8
-rw-r--r--graphics/sane-backends/Makefile.common4
-rw-r--r--graphics/sane-backends/PLIST5
-rw-r--r--graphics/sane-backends/distinfo21
-rw-r--r--graphics/sane-backends/options.mk4
-rw-r--r--graphics/sane-backends/patches/patch-aa4
-rw-r--r--graphics/sane-backends/patches/patch-ab10
-rw-r--r--graphics/sane-backends/patches/patch-aj4
-rw-r--r--graphics/sane-backends/patches/patch-ak4
-rw-r--r--graphics/sane-backends/patches/patch-backend_genesys_low.cpp16
-rw-r--r--graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c4
-rw-r--r--graphics/sane-backends/patches/patch-m4_byteorder.m44
12 files changed, 38 insertions, 50 deletions
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 6fbd7901561..b87959d80f2 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2022/01/03 14:48:49 triaxx Exp $
+# $NetBSD: Makefile,v 1.76 2022/01/04 16:04:39 triaxx Exp $
-PKGREVISION= 1
.include "Makefile.common"
-MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/
+MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/
COMMENT= API for access to scanners, digital cameras, frame grabbers, etc
DISTNAME= sane-backends-${SANE_VERSION}
@@ -75,6 +74,9 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
.include "../../graphics/libv4l/buildlink3.mk"
.endif
.include "../../graphics/tiff/buildlink3.mk"
+JPEG_ACCEPTED= foo
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 12bf404c898..b29bfff4e06 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2020/06/13 20:54:32 leot Exp $
+# $NetBSD: Makefile.common,v 1.36 2022/01/04 16:04:39 triaxx Exp $
# used by graphics/sane-frontends/Makefile
CATEGORIES?= graphics
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
SANE_MAJOR?= 1
SANE_MINOR?= 0
-SANE_MICRO?= 30
+SANE_MICRO?= 32
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 bee8cff987b..5cf30b3705f 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2022/01/03 14:48:49 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.37 2022/01/04 16:04:39 triaxx Exp $
bin/gamma4scanimage
bin/sane-config
bin/sane-find-scanner
@@ -19,6 +19,7 @@ lib/sane/libsane-bh.la
lib/sane/libsane-canon.la
lib/sane/libsane-canon630u.la
lib/sane/libsane-canon_dr.la
+lib/sane/libsane-canon_lide70.la
lib/sane/libsane-cardscan.la
lib/sane/libsane-coolscan.la
lib/sane/libsane-coolscan2.la
@@ -107,6 +108,7 @@ man/man5/sane-bh.5
man/man5/sane-canon.5
man/man5/sane-canon630u.5
man/man5/sane-canon_dr.5
+man/man5/sane-canon_lide70.5
man/man5/sane-cardscan.5
man/man5/sane-coolscan.5
man/man5/sane-coolscan2.5
@@ -305,6 +307,7 @@ share/examples/sane/bh.conf
share/examples/sane/canon.conf
share/examples/sane/canon630u.conf
share/examples/sane/canon_dr.conf
+share/examples/sane/canon_lide70.conf
share/examples/sane/cardscan.conf
share/examples/sane/coolscan.conf
share/examples/sane/coolscan2.conf
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 5c56203e787..c2af954e392 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.50 2021/10/26 10:46:53 nia Exp $
+$NetBSD: distinfo,v 1.51 2022/01/04 16:04:39 triaxx Exp $
-BLAKE2s (sane-backends-1.0.30.tar.gz) = 8c1a63e0d9228ef8975059300667b2c155e340327532ba94958280d90e16f3ba
-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
+BLAKE2s (sane-backends-1.0.32.tar.gz) = 2df20c4efa3f83b6e228c4ab0629e6fd64cae3b348af7fa3d818cc4393e0a03a
+SHA512 (sane-backends-1.0.32.tar.gz) = 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
+Size (sane-backends-1.0.32.tar.gz) = 7349442 bytes
+SHA1 (patch-aa) = 612cd8b6d6d1cb00aae9efc0c13f48151a9503e8
+SHA1 (patch-ab) = 8d099b9b944585d7c7f77738bffbd44e184a13e6
SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
SHA1 (patch-ai) = 14f5467eb865406cbec00b8d47b5c23c4c89f113
-SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
-SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
-SHA1 (patch-backend_genesys_low.cpp) = 6df874fc4e4909e401db923510f802367f2377f5
-SHA1 (patch-backend_pixma_pixma__bjnp.c) = c48e929910cbe33b91c919de3f47badd2bf063f0
-SHA1 (patch-m4_byteorder.m4) = 23f4b0256fc9980d3472e77ab558b0e24a9495b4
+SHA1 (patch-aj) = 0a9e585b74087db3f8f56529f1e27dc325d8f89a
+SHA1 (patch-ak) = 0552ea77c243eb209d0af0e07a0c5a79dd1897d2
+SHA1 (patch-backend_pixma_pixma__bjnp.c) = c2e99ba6a4e6b177b0f8d151b65ece23cc44e3ef
+SHA1 (patch-m4_byteorder.m4) = 9e44d6a14b4c9de681dedcfb64344d21f6b549fc
SHA1 (patch-tools_umax__pp.c) = debe660184a1380a894e8a5414983f5fdb19cded
diff --git a/graphics/sane-backends/options.mk b/graphics/sane-backends/options.mk
index a2f3cc011d0..ed2ff160e22 100644
--- a/graphics/sane-backends/options.mk
+++ b/graphics/sane-backends/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.11 2019/07/27 00:40:50 ryoon Exp $
+# $NetBSD: options.mk,v 1.12 2022/01/04 16:04:39 triaxx Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sane-backends
PKG_SUPPORTED_OPTIONS= inet6 nls snmp
-PKG_SUGGESTED_OPTIONS= inet6
+PKG_SUGGESTED_OPTIONS= inet6 nls
.include "../../mk/bsd.options.mk"
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index edee652aebf..68a796e4460 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.13 2015/10/27 11:29:35 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2022/01/04 16:04:40 triaxx Exp $
Adapt installation to pkgsrc example config file location.
--- backend/Makefile.in.orig 2009-04-30 13:41:18.000000000 +0000
+++ backend/Makefile.in
-@@ -1444,7 +1444,7 @@ build_cpu = @build_cpu@
+@@ -2369,7 +2369,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
index 4dd81c4f6bc..9f1da000368 100644
--- a/graphics/sane-backends/patches/patch-ab
+++ b/graphics/sane-backends/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.16 2016/04/09 14:19:25 richard Exp $
+$NetBSD: patch-ab,v 1.17 2022/01/04 16:04:40 triaxx Exp $
-add SunOS byteorder needs
+Add SunOS byteorder needs.
--- configure.orig 2015-10-04 13:18:39.000000000 +0000
+++ configure
-@@ -5979,6 +5979,36 @@ else
+@@ -20903,6 +20903,36 @@ else
$as_echo "no" >&6; }
@@ -41,7 +41,7 @@ add SunOS byteorder needs
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32 in machine/endian.h" >&5
$as_echo_n "checking for bswap32 in machine/endian.h... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6139,6 +6169,11 @@ rm -f conftest*
+@@ -21093,6 +21123,11 @@ rm -f conftest*
@@ -53,7 +53,7 @@ add SunOS byteorder needs
if test "$HAVE_LE32TOH" != "1"; then
cat >> "$ac_byteorder" << EOF
-@@ -9148,6 +9183,8 @@ else
+@@ -8977,6 +9012,8 @@ else
# ifdef _MSC_VER
# include <malloc.h>
# define alloca _alloca
diff --git a/graphics/sane-backends/patches/patch-aj b/graphics/sane-backends/patches/patch-aj
index eca6d4ae4e8..8182aa33ac4 100644
--- a/graphics/sane-backends/patches/patch-aj
+++ b/graphics/sane-backends/patches/patch-aj
@@ -1,10 +1,10 @@
-$NetBSD: patch-aj,v 1.1 2010/12/27 15:07:52 adam Exp $
+$NetBSD: patch-aj,v 1.2 2022/01/04 16:04:40 triaxx Exp $
Avoid duplicate symbols in libepson and libepson2.
--- backend/epson.c.orig 2010-12-27 14:36:16.000000000 +0000
+++ backend/epson.c
-@@ -333,7 +333,7 @@
+@@ -331,7 +331,7 @@
#include "epson.h"
#include "epson_scsi.h"
diff --git a/graphics/sane-backends/patches/patch-ak b/graphics/sane-backends/patches/patch-ak
index 3f746913a6e..6bb456f6846 100644
--- a/graphics/sane-backends/patches/patch-ak
+++ b/graphics/sane-backends/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.1 2010/12/27 15:07:52 adam Exp $
+$NetBSD: patch-ak,v 1.2 2022/01/04 16:04:40 triaxx Exp $
Avoid duplicate symbols in libepson and libepson2.
--- backend/epson2.c.orig 2010-12-27 14:36:45.000000000 +0000
+++ backend/epson2.c
-@@ -72,7 +72,7 @@
+@@ -77,7 +77,7 @@
#include "epson2-ops.h"
#include "epson2_scsi.h"
diff --git a/graphics/sane-backends/patches/patch-backend_genesys_low.cpp b/graphics/sane-backends/patches/patch-backend_genesys_low.cpp
deleted file mode 100644
index 17271681b85..00000000000
--- a/graphics/sane-backends/patches/patch-backend_genesys_low.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-backend_genesys_low.cpp,v 1.1 2020/08/16 22:42:09 gutteridge Exp $
-
-Fix big-endian builds. Patch from Gentoo:
-https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49491819885af7f659dafe3a116ada80fbcfe1d7
-
---- backend/genesys/low.cpp.orig 2020-05-17 11:54:18.000000000 +0000
-+++ backend/genesys/low.cpp
-@@ -539,7 +539,7 @@ Image read_unshuffled_image_from_scanner
- }
-
- #ifdef WORDS_BIGENDIAN
-- if (depth == 16) {
-+ if (session.params.depth == 16) {
- dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>();
- }
- #endif
diff --git a/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c b/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c
index 87076520f10..7ba15241f84 100644
--- a/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c
+++ b/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-backend_pixma_pixma__bjnp.c,v 1.1 2020/06/13 20:54:32 leot Exp $
+$NetBSD: patch-backend_pixma_pixma__bjnp.c,v 1.2 2022/01/04 16:04:40 triaxx Exp $
Reuse BJNP_HOST_MAX instead of possible undefined HOST_NAME_MAX.
@@ -7,7 +7,7 @@ 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
+@@ -2027,8 +2027,8 @@ sanei_bjnp_find_devices (const char **co
fd_set fdset;
fd_set active_fdset;
struct timeval timeout;
diff --git a/graphics/sane-backends/patches/patch-m4_byteorder.m4 b/graphics/sane-backends/patches/patch-m4_byteorder.m4
index 852dde5a3d7..1b9b3d8de35 100644
--- a/graphics/sane-backends/patches/patch-m4_byteorder.m4
+++ b/graphics/sane-backends/patches/patch-m4_byteorder.m4
@@ -1,6 +1,6 @@
-$NetBSD: patch-m4_byteorder.m4,v 1.1 2016/04/09 14:19:25 richard Exp $
+$NetBSD: patch-m4_byteorder.m4,v 1.2 2022/01/04 16:04:40 triaxx Exp $
-add SunOS byteorder needs
+Add SunOS byteorder needs.
--- m4/byteorder.m4.orig 2013-02-23 02:00:56.000000000 +0000
+++ m4/byteorder.m4
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 17:25:45 +0000