[packages/sane-backends] - added cups patch (link only kodakaio backend with libcups) - use libusb 1.0 (gphoto2 already switc

qboosh qboosh at pld-linux.org
Tue May 28 18:30:10 CEST 2013 

commit f5c0b09ac3cc980c7602a2bfeb555ea7a4bcddac
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 28 18:30:42 2013 +0200

    - added cups patch (link only kodakaio backend with libcups)
    - use libusb 1.0 (gphoto2 already switched to this version)
    - added avahi support as bcond

 sane-backends-1.0.21-i18n.patch | 129 ----------------------------------------
 sane-backends-cups.patch        |  28 +++++++++
 sane-backends.spec              |  32 +++++-----
 3 files changed, 45 insertions(+), 144 deletions(-)
---
diff --git a/sane-backends.spec b/sane-backends.spec
index b50d3e3..5184344 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -1,7 +1,8 @@
 #
 # Conditional build:
-%bcond_without	gphoto	# no gphoto backend (which requires libgphoto2)
-%bcond_without	lpt	# no parallel port backends (which require libieee1284)
+%bcond_without	gphoto	# gphoto backend (which requires libgphoto2)
+%bcond_without	lpt	# parallel port backends (which require libieee1284)
+%bcond_with	avahi	# Avahi support for saned and net backend
 #
 Summary:	SANE - easy local and networked scanner access
 Summary(es.UTF-8):	SANE - acceso a scanners en red y locales
@@ -25,22 +26,21 @@ Patch4:		%{name}-link.patch
 Patch5:		sane-backends-1.0.23-sane-config-multilib.patch
 Patch6:		sane-backends-1.0.23-umax-init-error.patch
 Patch7:		%{name}-format.patch
+Patch8:		%{name}-cups.patch
 URL:		http://www.sane-project.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
+%{?with_avahi:BuildRequires:	avahi-devel >= 0.6.24}
+BuildRequires:	cups-devel
 BuildRequires:	gettext-devel
 %{?with_gphoto:BuildRequires:	libgphoto2-devel >= 2.0.1}
 %{?with_lpt:BuildRequires:	libieee1284-devel >= 0.1.5}
-BuildRequires:	libjpeg-devel
+BuildRequires:	libjpeg-devel >= 6a
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
-%if "%{pld_release}" == "ac"
-BuildRequires:	libusb-devel < 1.0
-%else
-BuildRequires:	libusb-compat-devel >= 0.1.0
-%endif
+BuildRequires:	libusb-devel >= 1.0
 BuildRequires:	libv4l-devel
-BuildRequires:	net-snmp-devel
+BuildRequires:	net-snmp-devel >= 5.6
 BuildRequires:	pkgconfig
 BuildRequires:	resmgr-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -50,6 +50,8 @@ BuildRequires:	tetex-latex-psnfss
 %if "%{pld_release}" != "ti" && "%{pld_release}" != "ac"
 BuildRequires:	texlive-latex-effects
 %endif
+%{?with_avahi:Requires:	avahi-libs >= 0.6.24}
+Requires:	net-snmp-libs >= 5.6
 Requires:	setup >= 2.4.10-1
 Obsoletes:	sane
 Obsoletes:	sane-backends-sm3600
@@ -99,8 +101,8 @@ Summary(pl.UTF-8):	Część SANE przeznaczona dla programistów
 Summary(pt_BR.UTF-8):	Arquivos necessários ao desenvolvimento de programas que usem o SANE
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libieee1284-devel
-Requires:	libusb-compat-devel >= 0.1.0
+%{?with_lpt:Requires:	libieee1284-devel}
+Requires:	libusb-devel >= 1.0
 Requires:	resmgr-devel
 Obsoletes:	sane-backends-sane-devel
 Obsoletes:	sane-backends-sane-static
@@ -254,6 +256,7 @@ mv -f acinclude.m4.tmp acinclude.m4
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %{__libtoolize}
@@ -262,15 +265,14 @@ mv -f acinclude.m4.tmp acinclude.m4
 %{__autoheader}
 %{__automake}
 %configure \
+	%{?with_avahi:--enable-avahi} \
+	--enable-libusb_1_0 \
+	--enable-pnm-backend \
 	--enable-pthread \
 	--enable-static \
-	--enable-pnm-backend \
 	--enable-translations \
 	%{?with_gphoto:--with-gphoto2}
 
-# --enable-avahi? (BR: avahi-devel >= 0.6.24, R: for net backend)
-# --enable-libusb_1_0 to use libusb 1.0 (but libgphoto2 still uses old libusb, so stick to this for now)
-
 %{__make}
 
 %ifarch %{ix86} %{x8664}
diff --git a/sane-backends-1.0.21-i18n.patch b/sane-backends-1.0.21-i18n.patch
deleted file mode 100644
index ae00d9a..0000000
--- a/sane-backends-1.0.21-i18n.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Nur sane-backends-1.0.21/po/LINGUAS sane-backends-1.0.21.mod/po/LINGUAS
---- sane-backends-1.0.21/po/LINGUAS	1969-12-31 19:00:00.000000000 -0500
-+++ sane-backends-1.0.21.mod/po/LINGUAS	2010-04-27 03:38:23.000000000 -0400
-@@ -0,0 +1,21 @@
-+# List of languages 
-+# try to keep this list ordered
-+bg
-+cs
-+da
-+de
-+en_GB
-+eo
-+es
-+fi
-+fr
-+gl
-+it
-+ja
-+nb
-+nl
-+pl
-+pt
-+ru
-+sv
-+uk
-diff -Nur sane-backends-1.0.21/po/POTFILES sane-backends-1.0.21.mod/po/POTFILES
---- sane-backends-1.0.21/po/POTFILES	1969-12-31 19:00:00.000000000 -0500
-+++ sane-backends-1.0.21.mod/po/POTFILES	2010-04-27 03:38:16.000000000 -0400
-@@ -0,0 +1,100 @@
-+# List of source files containing translatable strings
-+# paths relative to po
-+../include/sane/saneopts.h
-+../backend/sane_strstatus.c
-+
-+../backend/artec_eplus48u.c
-+
-+../backend/avision.h
-+
-+../backend/canon630u.c
-+../backend/canon.c
-+../backend/canon-sane.c
-+
-+../backend/canon_dr.c
-+../backend/canon_dr.h
-+
-+../backend/cardscan.c
-+../backend/cardscan.h
-+
-+../backend/epjitsu.c
-+../backend/epjitsu.h
-+
-+../backend/epson.c
-+../backend/epson.h
-+../backend/epson2.c
-+../backend/epson2.h
-+
-+../backend/fujitsu.c
-+../backend/fujitsu.h
-+
-+../backend/genesys.c
-+
-+../backend/kodak.c
-+../backend/kodak.h
-+
-+../backend/gt68xx.c
-+../backend/gt68xx_low.h
-+
-+../backend/hp3500.c
-+../backend/hp3900_sane.c
-+../backend/hp5400_sane.c
-+../backend/hp5590.c
-+../backend/hp-option.c
-+../backend/hp-option.h
-+
-+../backend/leo.c
-+../backend/leo.h
-+
-+../backend/lexmark.c
-+
-+../backend/ma1509.c
-+
-+../backend/matsushita.c
-+../backend/matsushita.h
-+
-+../backend/microtek2.c
-+../backend/microtek2.h
-+
-+../backend/mustek.c
-+../backend/mustek_usb.c
-+../backend/mustek_usb2.c
-+
-+../backend/niash.c
-+
-+../backend/pixma.c
-+../backend/pixma_sane_options.c
-+
-+../backend/plustek.c
-+../backend/plustek_pp.c
-+
-+../backend/pnm.c
-+
-+../backend/rts8891.c
-+
-+../backend/sceptre.c
-+../backend/sceptre.h
-+
-+../backend/sm3840.c
-+
-+../backend/snapscan.c
-+../backend/snapscan-options.c
-+
-+../backend/stv680.c
-+../backend/stv680.h
-+
-+../backend/teco1.c
-+../backend/teco1.h
-+../backend/teco2.c
-+../backend/teco2.h
-+../backend/teco3.c
-+../backend/teco3.h
-+
-+../backend/test.c
-+
-+../backend/u12.c
-+
-+../backend/umax1220u.c
-+../backend/umax.c
-+../backend/umax_pp.c
-+
diff --git a/sane-backends-cups.patch b/sane-backends-cups.patch
new file mode 100644
index 0000000..5721b48
--- /dev/null
+++ b/sane-backends-cups.patch
@@ -0,0 +1,28 @@
+--- sane-backends-1.0.23/configure.in.orig	2012-08-19 22:31:34.000000000 +0200
++++ sane-backends-1.0.23/configure.in	2013-05-28 18:03:13.483572312 +0200
+@@ -331,12 +331,13 @@
+ if test -e /usr/include/cups/cups.h ; then
+     AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
+ 	with_cups="yes"
+-	LIBS="-lcups  $LIBS"
++	CUPS_LIBS="-lcups"
+ else
+ 	$as_echo "cups.h not found, you may want to install a cups development package"
+ 	$as_echo "in order to autodetect network scanners in kodakaio."
+ 	with_cups="no"
+ fi
++AC_SUBST([CUPS_LIBS])
+ 
+ dnl ***********
+ dnl USB Support
+--- sane-backends-1.0.23/backend/Makefile.am.orig	2013-05-28 18:08:38.883558658 +0200
++++ sane-backends-1.0.23/backend/Makefile.am	2013-05-28 18:14:56.790209468 +0200
+@@ -627,7 +627,7 @@
+ nodist_libsane_kodakaio_la_SOURCES = kodakaio-s.c
+ libsane_kodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio
+ libsane_kodakaio_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+-libsane_kodakaio_la_LIBADD = $(COMMON_LIBS) libkodakaio.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo  ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo  $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
++libsane_kodakaio_la_LIBADD = $(COMMON_LIBS) libkodakaio.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo  ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo  $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS) $(CUPS_LIBS)
+ EXTRA_DIST += kodakaio.conf.in
+ 
+ libkvs1025_la_SOURCES = kvs1025.c kvs1025_low.c kvs1025_opt.c kvs1025_usb.c \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sane-backends.git/commitdiff/f5c0b09ac3cc980c7602a2bfeb555ea7a4bcddac

More information about the pld-cvs-commit mailing list