CVS commit: pkgsrc/graphics/sane-backends

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Sep 24 15:48:38 UTC 2024

Modified Files:
        pkgsrc/graphics/sane-backends: Makefile Makefile.common PLIST distinfo
        pkgsrc/graphics/sane-backends/patches: patch-aa patch-ab patch-ak

Log Message:
sane-backends: Update to 1.3.1

pkgsrc changes:
---------------
  * Minor modification in Makefile to apply recommandation of pkglint.

upstream changes:
-----------------
New with 1.3.1 (released 2024-05-22)
* avision:
  o Correction for ADF presence detect which caused a hang.
  o Internationalised some text items in the backend to make them available for
    translation.
* epsonds:
  o Some small changes to option documentation.
  o Added support for models: ES-C220, DS-C330, and DS-C490.
* escl:
  o Fix for pwf:Version item.
  o Fix for crash in libjpeg when cropping image.
  o Fix for issue with configured device when AVAHI not running.
  o Fix for build without poppler-glib.
* fujitsu:
  o Added support for Ricoh scanners: FI-8040, FI-70F.
* genesys:
  o Added missing configuration for Plustek OpticFilm 7500i and Plustek
    OpticFilm 8100.
* hpljm1005:
  o Fixes to maximum geometries and various cropping and geometry details
    specifically for the HP LaserJet M1005.
* lexmark_X2670:
  o Added new backend for the Lexmark X26xx series of scanners.
* pixma:
  o Fix to prevent mode change when source is selected. Mode should not change
    if still valid for source.
  o Added support for models: TS8630 Series, XK110 Series, GX3000 Series,
    GX4000 Series, G3070 Series, G2070 Series, G4070 Series, G3030 Series,
    G2030 Series, TC-20M, TC-5200M, TR4500 Series, TS8700 series, XK120 series,
    GX1000 series, GX2000 series, TS6630 series, TS7700 series, TS7600i series,
    TS6730 series, TR7800 series, TS7700i series, TS7700A series, GX6500
    series, i-SENSYS MF750 Series
* snapscan:
  o Corrections for Agfa ARCUS 1200 scan area.
* test:
  o Fix for a crash in the backend.
* xerox_mfp:
  o Added support for Dell 1135n, which is a clone of the Samsung SCX-4623F.
  o Added support for Xerox WorkCentre 3335.
  o Added JPEG mitigation for modules that don't properly support JPEG output:
    Xerox WorkCentre 3225
  o Fix to remove USB CLEAR HALT during initialisation which can potentially
    lock up devices.
  o General fixes to support the SCX-4521F model.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/graphics/sane-backends/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/sane-backends/Makefile.common
cvs rdiff -u -r1.40 -r1.41 pkgsrc/graphics/sane-backends/PLIST
cvs rdiff -u -r1.52 -r1.53 pkgsrc/graphics/sane-backends/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/sane-backends/patches/patch-aa
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/sane-backends/patches/patch-ab
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/sane-backends/patches/patch-ak

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/sane-backends/Makefile
diff -u pkgsrc/graphics/sane-backends/Makefile:1.92 pkgsrc/graphics/sane-backends/Makefile:1.93
--- pkgsrc/graphics/sane-backends/Makefile:1.92 Wed May 29 16:33:03 2024
+++ pkgsrc/graphics/sane-backends/Makefile      Tue Sep 24 15:48:37 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2024/05/29 16:33:03 adam Exp $
+# $NetBSD: Makefile,v 1.93 2024/09/24 15:48:37 triaxx Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
-MASTER_SITES=  https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/
+MASTER_SITES=  ${MASTER_SITE_GITLAB:=sane-project/backends/uploads/83bdbb6c9a115184c2d48f1fdc6847db/}
 COMMENT=       API for access to scanners, digital cameras, frame grabbers, etc
 
 DISTNAME=      sane-backends-${SANE_VERSION}
@@ -30,7 +29,7 @@ CONFIGURE_ENV.SunOS+= ac_cv_func_inet_pt
 
 PLIST_VARS+=           pint
 
-.if (${OPSYS} == "NetBSD")
+.if ${OPSYS} == "NetBSD"
 PLIST.pint=            yes
 .endif
 
@@ -58,7 +57,7 @@ test.conf u12.conf umax.conf umax1220u.c
 CONF_FILES+=   ${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
 .endfor
 
-.if (${OPSYS} == "Linux")
+.if ${OPSYS} == "Linux"
 .  for f in qcam.conf v4l.conf
 CONF_FILES+=   ${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
 .  endfor
@@ -66,7 +65,7 @@ CONF_FILES+=  ${EGDIR}/${f} ${PKG_SYSCONF
 
 .include "options.mk"
 .include "../../devel/libusb1/buildlink3.mk"
-.if (${OPSYS} == "Linux")
+.if ${OPSYS} == "Linux"
 .include "../../graphics/libv4l/buildlink3.mk"
 .endif
 .include "../../graphics/tiff/buildlink3.mk"

Index: pkgsrc/graphics/sane-backends/Makefile.common
diff -u pkgsrc/graphics/sane-backends/Makefile.common:1.37 pkgsrc/graphics/sane-backends/Makefile.common:1.38
--- pkgsrc/graphics/sane-backends/Makefile.common:1.37  Tue Sep  5 14:31:39 2023
+++ pkgsrc/graphics/sane-backends/Makefile.common       Tue Sep 24 15:48:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2023/09/05 14:31:39 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.38 2024/09/24 15:48:37 triaxx Exp $
 # used by graphics/sane-frontends/Makefile
 
 CATEGORIES?=   graphics
@@ -8,7 +8,7 @@ HOMEPAGE?=      http://www.sane-project.org/
 LICENSE=       gnu-gpl-v2
 
 SANE_MAJOR?=   1
-SANE_MINOR?=   2
+SANE_MINOR?=   3
 SANE_MICRO?=   1
 SANE_VERSION=  ${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
 PLIST_SUBST+=  SANE_MAJOR=${SANE_MAJOR:Q}

Index: pkgsrc/graphics/sane-backends/PLIST
diff -u pkgsrc/graphics/sane-backends/PLIST:1.40 pkgsrc/graphics/sane-backends/PLIST:1.41
--- pkgsrc/graphics/sane-backends/PLIST:1.40    Tue Sep  5 14:38:47 2023
+++ pkgsrc/graphics/sane-backends/PLIST Tue Sep 24 15:48:37 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2023/09/05 14:38:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.41 2024/09/24 15:48:37 triaxx Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -53,6 +53,7 @@ lib/sane/libsane-kvs20xx.la
 lib/sane/libsane-kvs40xx.la
 lib/sane/libsane-leo.la
 lib/sane/libsane-lexmark.la
+lib/sane/libsane-lexmark_x2600.la
 lib/sane/libsane-ma1509.la
 lib/sane/libsane-magicolor.la
 lib/sane/libsane-matsushita.la
@@ -141,6 +142,7 @@ man/man5/sane-kvs20xx.5
 man/man5/sane-kvs40xx.5
 man/man5/sane-leo.5
 man/man5/sane-lexmark.5
+man/man5/sane-lexmark_x2600.5
 man/man5/sane-ma1509.5
 man/man5/sane-magicolor.5
 man/man5/sane-matsushita.5
@@ -261,6 +263,7 @@ share/doc/sane-backends/sane-backends-ex
 share/doc/sane-backends/sane-backends.html
 share/doc/sane-backends/sane-mfgs-external.html
 share/doc/sane-backends/sane-mfgs.html
+share/doc/sane-backends/saned/saned.install.md
 share/doc/sane-backends/sceptre/s1200.txt
 share/doc/sane-backends/teco/teco1.txt
 share/doc/sane-backends/teco/teco2.txt
@@ -333,6 +336,7 @@ share/examples/sane/kodakaio.conf
 share/examples/sane/kvs1025.conf
 share/examples/sane/leo.conf
 share/examples/sane/lexmark.conf
+share/examples/sane/lexmark_x2600.conf
 share/examples/sane/ma1509.conf
 share/examples/sane/magicolor.conf
 share/examples/sane/matsushita.conf
@@ -387,6 +391,7 @@ ${PLIST.nls}share/locale/he/LC_MESSAGES/
 ${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/ka/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
@@ -395,3 +400,9 @@ ${PLIST.nls}share/locale/ru/LC_MESSAGES/
 ${PLIST.nls}share/locale/sv/LC_MESSAGES/sane-backends.mo
 ${PLIST.nls}share/locale/uk/LC_MESSAGES/sane-backends.mo
 ${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/sane-backends.mo
+@pkgdir var/lock
+@pkgdir share/sane/snapscan
+@pkgdir share/sane/gt68xx
+@pkgdir share/sane/epjitsu
+@pkgdir share/sane/artec_eplus48u
+@pkgdir share/examples/sane/dll.d

Index: pkgsrc/graphics/sane-backends/distinfo
diff -u pkgsrc/graphics/sane-backends/distinfo:1.52 pkgsrc/graphics/sane-backends/distinfo:1.53
--- pkgsrc/graphics/sane-backends/distinfo:1.52 Tue Sep  5 14:31:39 2023
+++ pkgsrc/graphics/sane-backends/distinfo      Tue Sep 24 15:48:37 2024
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.52 2023/09/05 14:31:39 ryoon Exp $
+$NetBSD: distinfo,v 1.53 2024/09/24 15:48:37 triaxx Exp $
 
-BLAKE2s (sane-backends-1.2.1.tar.gz) = 430fa0033b85623d9044b062a982f5d7f7c93ad0006987cc5029de2edeb582e6
-SHA512 (sane-backends-1.2.1.tar.gz) = 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1
-Size (sane-backends-1.2.1.tar.gz) = 7308040 bytes
-SHA1 (patch-aa) = 612cd8b6d6d1cb00aae9efc0c13f48151a9503e8
-SHA1 (patch-ab) = 8d099b9b944585d7c7f77738bffbd44e184a13e6
+BLAKE2s (sane-backends-1.3.1.tar.gz) = 470d826917835c901a3b5d6f57c8b0d38cba0e8e8491fba2aeb6e9e74bffbd11
+SHA512 (sane-backends-1.3.1.tar.gz) = c6c12bce5242fcdf208f034cc544605cad36fad60316cb51f0e1f6fe23d1566823778c7af4b0fc94ca4154e2cd3e38a9202073e4a4af05f641c3da081722a535
+Size (sane-backends-1.3.1.tar.gz) = 7432184 bytes
+SHA1 (patch-aa) = 6e2c605cbf6b437f4da2ba30d5e61c7d64e32bda
+SHA1 (patch-ab) = 0f5ceb8b2e80c354bc8661c0dbc80e23c4f80ebe
 SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
 SHA1 (patch-ai) = 14f5467eb865406cbec00b8d47b5c23c4c89f113
 SHA1 (patch-aj) = 0a9e585b74087db3f8f56529f1e27dc325d8f89a
-SHA1 (patch-ak) = 0552ea77c243eb209d0af0e07a0c5a79dd1897d2
+SHA1 (patch-ak) = 8986251a36db6a3e20b638f4713e09f88e532ff9
 SHA1 (patch-backend_pixma_pixma__bjnp.c) = c2e99ba6a4e6b177b0f8d151b65ece23cc44e3ef
 SHA1 (patch-m4_byteorder.m4) = 9e44d6a14b4c9de681dedcfb64344d21f6b549fc
 SHA1 (patch-tools_umax__pp.c) = debe660184a1380a894e8a5414983f5fdb19cded

Index: pkgsrc/graphics/sane-backends/patches/patch-aa
diff -u pkgsrc/graphics/sane-backends/patches/patch-aa:1.14 pkgsrc/graphics/sane-backends/patches/patch-aa:1.15
--- pkgsrc/graphics/sane-backends/patches/patch-aa:1.14 Tue Jan  4 16:04:40 2022
+++ pkgsrc/graphics/sane-backends/patches/patch-aa      Tue Sep 24 15:48:37 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.14 2022/01/04 16:04:40 triaxx Exp $
+$NetBSD: patch-aa,v 1.15 2024/09/24 15:48:37 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
-@@ -2369,7 +2369,7 @@ build_cpu = @build_cpu@
+@@ -2421,7 +2421,7 @@ build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
  builddir = @builddir@

Index: pkgsrc/graphics/sane-backends/patches/patch-ab
diff -u pkgsrc/graphics/sane-backends/patches/patch-ab:1.17 pkgsrc/graphics/sane-backends/patches/patch-ab:1.18
--- pkgsrc/graphics/sane-backends/patches/patch-ab:1.17 Tue Jan  4 16:04:40 2022
+++ pkgsrc/graphics/sane-backends/patches/patch-ab      Tue Sep 24 15:48:37 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.17 2022/01/04 16:04:40 triaxx Exp $
+$NetBSD: patch-ab,v 1.18 2024/09/24 15:48:37 triaxx Exp $
 
 Add SunOS byteorder needs.
 
 --- configure.orig     2015-10-04 13:18:39.000000000 +0000
 +++ configure
-@@ -20903,6 +20903,36 @@ else
+@@ -20599,6 +20599,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
-@@ -21093,6 +21123,11 @@ rm -f conftest*
+@@ -20759,6 +20789,11 @@ rm -f conftest*
  
  
  
@@ -53,7 +53,7 @@ Add SunOS byteorder needs.
  
  if test "$HAVE_LE32TOH" != "1"; then
   cat >> "$ac_byteorder" << EOF
-@@ -8977,6 +9012,8 @@ else
+@@ -23532,6 +23567,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca

Index: pkgsrc/graphics/sane-backends/patches/patch-ak
diff -u pkgsrc/graphics/sane-backends/patches/patch-ak:1.2 pkgsrc/graphics/sane-backends/patches/patch-ak:1.3
--- pkgsrc/graphics/sane-backends/patches/patch-ak:1.2  Tue Jan  4 16:04:40 2022
+++ pkgsrc/graphics/sane-backends/patches/patch-ak      Tue Sep 24 15:48:38 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.2 2022/01/04 16:04:40 triaxx Exp $
+$NetBSD: patch-ak,v 1.3 2024/09/24 15:48:38 triaxx Exp $
 
 Avoid duplicate symbols in libepson and libepson2.
 
 --- backend/epson2.c.orig      2010-12-27 14:36:45.000000000 +0000
 +++ backend/epson2.c
-@@ -77,7 +77,7 @@
+@@ -73,7 +73,7 @@
  #include "epson2-ops.h"
  
  #include "epson2_scsi.h"