Add an 'escl' FLAVOR:

build support for the eSCL protocol (vendor-neutral network protocol for
driverless scanning)

graphics/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.549 2021/04/24 13:26:04 solene Exp $
+# $OpenBSD: Makefile,v 1.550 2021/04/25 06:54:52 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += DevIL
@@ -272,6 +272,7 @@
      SUBDIR += ruby-rmagick,ruby30
      SUBDIR += s10sh
      SUBDIR += sane-backends
+     SUBDIR += sane-backends,escl
      SUBDIR += sane-backends,snmp
      SUBDIR += scour
      SUBDIR += scratch

graphics/sane-backends/Makefile

@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.100 2021/02/23 22:04:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.101 2021/04/25 06:54:52 ajacoutot Exp $
 
 BROKEN-alpha=		ICE hp5590.c:1141: error: unrecognizable insn
 
 COMMENT=		API for accessing scanners, backends
 
 DISTNAME=		sane-backends-1.0.32
+REVISION=		0
 
 SHARED_LIBS +=  sane                 2.1      # unknown
 
@@ -36,7 +37,7 @@ LIB_DEPENDS=		devel/libusb1 \
 			multimedia/libv4l \
 			textproc/libxml
 
-FLAVORS=		snmp
+FLAVORS=		escl snmp
 FLAVOR?=
 
 USE_GMAKE=		Yes
@@ -56,8 +57,18 @@ CONFIGURE_ARGS=		--sbindir=${PREFIX}/libexec \
 			--with-group=553 \
 			--enable-pthread
 
-# XXX doesn't work
+.if ${FLAVOR:Mescl}
+LIB_DEPENDS +=		net/avahi \
+			net/curl \
+			print/poppler
+WANTLIB += X11 Xext Xrender avahi-client avahi-common cairo crypto
+WANTLIB += curl dbus-1 expat ffi fontconfig freetype gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 intl lcms2 nghttp2 openjp2
+WANTLIB += pcre pixman-1 poppler poppler-glib ssl xcb xcb-render
+WANTLIB += xcb-shm
+.else
 CONFIGURE_ARGS +=	--without-avahi
+.endif
 
 .if ${FLAVOR:Msnmp}
 LIB_DEPENDS +=		net/net-snmp

graphics/sane-backends/patches/patch-backend_canon-sane_c

@@ -1,8 +1,10 @@
-$OpenBSD: patch-backend_canon-sane_c,v 1.3 2017/05/23 13:00:46 ajacoutot Exp $
+$OpenBSD: patch-backend_canon-sane_c,v 1.4 2021/04/25 06:54:52 ajacoutot Exp $
 
 errno.h header is required now that errno is a per-thread variable.
 "undefined symbol 'errno'" at runtime with dlopen()'d modules.
 
+64bit time_t
+
 Index: backend/canon-sane.c
 --- backend/canon-sane.c.orig
 +++ backend/canon-sane.c
@@ -35,3 +37,12 @@ Index: backend/canon-sane.c
  
  	      if (dtime < rt)
  		{
+@@ -2163,7 +2165,7 @@ sane_read (SANE_Handle handle, SANE_Byte *buf, SANE_In
+   else
+     time (&(s->time0));
+ 
+-  DBG (11, "sane_read: time0 = %ld\n", s->time0);
++  DBG (11, "sane_read: time0 = %lld\n", s->time0);
+   s->switch_preview = s->val[OPT_PREVIEW].w;
+   return (status);
+ }

graphics/sane-backends/pkg/DESCR

@@ -2,5 +2,7 @@ SANE stands for Scanner Access Now Easy.
 This package contains the SANE libraries (this means backends and
 network scanning parts) and the command line frontend scanimage.
 
-Available FLAVOR:
+Available FLAVORS:
+	escl - build support for the eSCL protocol
+                (vendor-neutral network protocol for driverless scanning)
 	snmp - build with net-snmp support (SNMP scanner autodiscovery)

graphics/sane-backends/pkg/PFRAG.escl

@@ -0,0 +1,5 @@
+@comment $OpenBSD: PFRAG.escl,v 1.1 2021/04/25 06:54:52 ajacoutot Exp $
+@so lib/sane/libsane-escl.so
+@man man/man5/sane-escl.5
+share/examples/sane-backends/sane.d/escl.conf
+@sample ${SYSCONFDIR}/sane.d/escl.conf

graphics/sane-backends/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.28 2020/08/23 15:52:11 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.29 2021/04/25 06:54:52 ajacoutot Exp $
 @newgroup _saned:553
 @newuser _saned:553:_saned:daemon:SANE Scanner Daemon:/var/empty:/sbin/nologin
 @extraunexec rm -rf /var/spool/lock/sane/*
@@ -542,3 +542,6 @@ share/sane/snapscan/
 @mode 775
 @group _saned
 @sample /var/spool/lock/sane/
+@mode
+@group
+%%escl%%