svn commit: r546055 - in head/graphics/sane-backends: . files

Tobias Kortkamp tobik at FreeBSD.org
Mon Aug 24 07:47:20 UTC 2020 

Author: tobik
Date: Mon Aug 24 07:47:16 2020
New Revision: 546055
URL: https://svnweb.freebsd.org/changeset/ports/546055

Log:
  graphics/sane-backends: Update to 1.0.31
  
  Enable more desktop friendly options by default which adds support
  for cameras, AirScan/eSCL devices.
  
  Changes:	https://gitlab.com/sane-project/backends/-/tags/1.0.31

Deleted:
  head/graphics/sane-backends/files/patch-backend_epsonds.c
  head/graphics/sane-backends/files/patch-backend_genesys_low.cpp
  head/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c
  head/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c
  head/graphics/sane-backends/files/patch-backend_umax__pp__low.c
  head/graphics/sane-backends/files/patch-backend_v4l.c
  head/graphics/sane-backends/files/patch-tools_sane-desc.c
Modified:
  head/graphics/sane-backends/Makefile
  head/graphics/sane-backends/distinfo
  head/graphics/sane-backends/files/patch-backend_Makefile.in
  head/graphics/sane-backends/files/patch-configure
  head/graphics/sane-backends/pkg-plist

Modified: head/graphics/sane-backends/Makefile
==============================================================================
--- head/graphics/sane-backends/Makefile	Mon Aug 24 07:47:08 2020	(r546054)
+++ head/graphics/sane-backends/Makefile	Mon Aug 24 07:47:16 2020	(r546055)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.30
+PORTVERSION=	1.0.31
 CATEGORIES=	graphics
-MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/
+MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/
 
 MAINTAINER=	tobik at FreeBSD.org
 COMMENT=	API for accessing scanners, digital cameras, frame grabbers, etc
@@ -15,8 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-USES=		compiler:c++11-lang gmake gnome jpeg libtool localbase pathfix \
-		pkgconfig
+USES=		compiler:c++11-lang gmake gnome jpeg libtool localbase:ldflags \
+		pathfix pkgconfig
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	saned
@@ -24,7 +24,6 @@ USE_RC_SUBR=	saned
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-locking \
 		--enable-pthread \
-		--without-api-spec \
 		--without-systemd
 INSTALL_TARGET=	install-strip
 
@@ -36,18 +35,19 @@ GROUPS=		saned
 PLIST_SUB=	SOVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=		AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
-OPTIONS_DEFAULT=	USB
+OPTIONS_DEFAULT=	AVAHI GPHOTO USB
 OPTIONS_SUB=		yes
 
 IEEE1284_DESC=	Parallel port support via libieee1284
 USB_DESC=	USB support
 
 AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app \
-				libcurl.so:ftp/curl
-AVAHI_CONFIGURE_ENABLE=		avahi
-AVAHI_CONFIGURE_WITH=		libcurl
+				libcurl.so:ftp/curl \
+				libpoppler-glib.so:graphics/poppler-glib
+AVAHI_USE=			GNOME=cairo,glib20
+AVAHI_CONFIGURE_WITH=		avahi libcurl
 GPHOTO_LIB_DEPENDS=		libgphoto2.so:graphics/libgphoto2
-GPHOTO_CONFIGURE_OFF=		--with-gphoto2=no
+GPHOTO_CONFIGURE_WITH=		gphoto2
 IEEE1284_LIB_DEPENDS=		libieee1284.so:sysutils/libieee1284
 IEEE1284_CONFIGURE_ENV_OFF=	sane_cv_use_libieee1284=no
 IPV6_CONFIGURE_ENABLE=		ipv6
@@ -55,8 +55,7 @@ NLS_USES=			gettext
 NLS_CONFIGURE_ENABLE=		nls
 SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=		snmp
-USB_CONFIGURE_OFF=		--with-usb=no
-USB_CONFIGURE_ON=		--with-usb
+USB_CONFIGURE_WITH=		usb
 V4L_LIB_DEPENDS=		libv4l1.so:multimedia/libv4l
 V4L_CONFIGURE_WITH=		v4l
 

Modified: head/graphics/sane-backends/distinfo
==============================================================================
--- head/graphics/sane-backends/distinfo	Mon Aug 24 07:47:08 2020	(r546054)
+++ head/graphics/sane-backends/distinfo	Mon Aug 24 07:47:16 2020	(r546055)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589738297
-SHA256 (sane-backends-1.0.30.tar.gz) = 3f5d96a9c47f6124a46bb577c776bbc4896dd17b9203d8bfbc7fe8cbbcf279a3
-SIZE (sane-backends-1.0.30.tar.gz) = 7204519
+TIMESTAMP = 1598185199
+SHA256 (sane-backends-1.0.31.tar.gz) = 4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa
+SIZE (sane-backends-1.0.31.tar.gz) = 7301484

Modified: head/graphics/sane-backends/files/patch-backend_Makefile.in
==============================================================================
--- head/graphics/sane-backends/files/patch-backend_Makefile.in	Mon Aug 24 07:47:08 2020	(r546054)
+++ head/graphics/sane-backends/files/patch-backend_Makefile.in	Mon Aug 24 07:47:16 2020	(r546055)
@@ -1,6 +1,6 @@
---- backend/Makefile.in.orig	2020-05-17 17:59:11 UTC
+--- backend/Makefile.in.orig	2020-08-23 12:27:20 UTC
 +++ backend/Makefile.in
-@@ -1645,7 +1645,7 @@ AM_V_at = $(am__v_at_ at AM_V@)
+@@ -1667,7 +1667,7 @@ AM_V_at = $(am__v_at_ at AM_V@)
  am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
  am__v_at_0 = @
  am__v_at_1 = 
@@ -9,7 +9,7 @@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__maybe_remake_depfiles = depfiles
  am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \
-@@ -7174,7 +7174,7 @@ install-becfg: becfg
+@@ -7276,7 +7276,7 @@ install-becfg: becfg
  	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
  	@# Having two libsane's can cause issues so get rid of it.
  	-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
@@ -18,7 +18,7 @@
  	test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
  	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
  	  if test ! -r $${cfg}; then continue; fi; \
-@@ -7182,7 +7182,7 @@ install-becfg: becfg
+@@ -7284,7 +7284,7 @@ install-becfg: becfg
  	  echo NOT overwriting $${cfg} in $(configdir)...; \
  	  else \
  	  echo installing $${cfg} in $(configdir)/$${cfg}...; \

Modified: head/graphics/sane-backends/files/patch-configure
==============================================================================
--- head/graphics/sane-backends/files/patch-configure	Mon Aug 24 07:47:08 2020	(r546054)
+++ head/graphics/sane-backends/files/patch-configure	Mon Aug 24 07:47:16 2020	(r546055)
@@ -1,6 +1,6 @@
---- configure.orig	2020-02-02 11:58:46 UTC
+--- configure.orig	2020-08-23 11:59:54 UTC
 +++ configure
-@@ -22138,7 +22138,7 @@ $as_echo_n "checking whether pthread_t is integer... "
+@@ -22134,7 +22134,7 @@ $as_echo_n "checking whether pthread_t is integer... "
  int
  main ()
  {
@@ -9,7 +9,7 @@
    ;
    return 0;
  }
-@@ -26130,7 +26130,7 @@ for be in ${BACKENDS}; do
+@@ -26279,7 +26279,7 @@ for be in ${BACKENDS}; do
      ;;
  
      v4l)
@@ -18,7 +18,7 @@
        || test "${have_libv4l1}" != "yes"; then
        echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
        backend_supported="no"
-@@ -26339,7 +26339,7 @@ for be in ${BACKENDS}; do
+@@ -26482,7 +26482,7 @@ for be in ${BACKENDS}; do
      ;;
  
      v4l)

Modified: head/graphics/sane-backends/pkg-plist
==============================================================================
--- head/graphics/sane-backends/pkg-plist	Mon Aug 24 07:47:08 2020	(r546054)
+++ head/graphics/sane-backends/pkg-plist	Mon Aug 24 07:47:16 2020	(r546055)
@@ -13,6 +13,7 @@ bin/umax_pp
 @sample etc/sane.d/dist/canon.conf etc/sane.d/canon.conf
 @sample etc/sane.d/dist/canon630u.conf etc/sane.d/canon630u.conf
 @sample etc/sane.d/dist/canon_dr.conf etc/sane.d/canon_dr.conf
+ at sample etc/sane.d/dist/canon_lide70.conf etc/sane.d/canon_lide70.conf
 %%IEEE1284%%@sample etc/sane.d/dist/canon_pp.conf etc/sane.d/canon_pp.conf
 @sample etc/sane.d/dist/cardscan.conf etc/sane.d/cardscan.conf
 @sample etc/sane.d/dist/coolscan.conf etc/sane.d/coolscan.conf
@@ -121,6 +122,9 @@ lib/sane/libsane-canon630u.so.%%SOVERSION%%
 lib/sane/libsane-canon_dr.so
 lib/sane/libsane-canon_dr.so.1
 lib/sane/libsane-canon_dr.so.%%SOVERSION%%
+lib/sane/libsane-canon_lide70.so
+lib/sane/libsane-canon_lide70.so.1
+lib/sane/libsane-canon_lide70.so.%%SOVERSION%%
 %%IEEE1284%%lib/sane/libsane-canon_pp.so
 %%IEEE1284%%lib/sane/libsane-canon_pp.so.1
 %%IEEE1284%%lib/sane/libsane-canon_pp.so.%%SOVERSION%%
@@ -371,6 +375,7 @@ man/man5/sane-bh.5.gz
 man/man5/sane-canon.5.gz
 man/man5/sane-canon630u.5.gz
 man/man5/sane-canon_dr.5.gz
+man/man5/sane-canon_lide70.5.gz
 %%IEEE1284%%man/man5/sane-canon_pp.5.gz
 man/man5/sane-cardscan.5.gz
 man/man5/sane-coolscan.5.gz

More information about the svn-ports-all mailing list