From 76048759bcabf6b46932b6e9e8d1b5f229ca6bc8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 9 May 2018 15:54:21 +0200 Subject: [PATCH] - up to 1.0.27 --- sane-backends-link.patch | 28 ++++++++++------------------ sane-backends.spec | 17 ++++++++--------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/sane-backends-link.patch b/sane-backends-link.patch index df1be15..46b21ca 100644 --- a/sane-backends-link.patch +++ b/sane-backends-link.patch @@ -1,6 +1,6 @@ --- sane-backends-1.0.21/backend/Makefile.am.orig 2010-11-06 21:29:14.551101613 +0100 +++ sane-backends-1.0.21/backend/Makefile.am 2010-11-07 10:26:58.167102452 +0100 -@@ -293,7 +293,7 @@ +@@ -271,7 +271,7 @@ libartec_eplus48u_la_CPPFLAGS = $(AM_CPP nodist_libsane_artec_eplus48u_la_SOURCES = artec_eplus48u-s.c libsane_artec_eplus48u_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=artec_eplus48u libsane_artec_eplus48u_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) @@ -9,23 +9,15 @@ EXTRA_DIST += artec_eplus48u.conf.in libas6e_la_SOURCES = as6e.c as6e.h -@@ -1120,7 +1120,7 @@ - nodist_libsane_la_SOURCES = dll-s.c - libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll - libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS) --libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS) -+libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS) - - # WARNING: Automake is getting this wrong so have to do it ourselves. - libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo @SANEI_SANEI_JPEG_LO@ ---- sane-backends-1.0.21/tools/Makefile.am.orig 2010-04-05 15:18:06.000000000 +0200 -+++ sane-backends-1.0.21/tools/Makefile.am 2010-11-07 11:59:31.659094909 +0100 -@@ -32,7 +32,7 @@ - sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \ - ../backend/sane_strstatus.c + +--- a/tools/Makefile.am~ 2016-10-09 02:54:58.000000000 +0200 ++++ b/tools/Makefile.am 2018-05-09 15:43:07.450971874 +0200 +@@ -39,7 +39,7 @@ if have_usblib + sane_find_scanner_SOURCES += check-usb-chip.c + endif sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \ -- @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@ -+ @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@ @RESMGR_LIBS@ +- $(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) \ ++ $(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) $(RESMGR_LIBS) \ + ../backend/sane_strstatus.lo gamma4scanimage_SOURCES = gamma4scanimage.c - gamma4scanimage_LDADD = @MATH_LIB@ diff --git a/sane-backends.spec b/sane-backends.spec index 327b684..66c003b 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -2,7 +2,7 @@ # Conditional build: %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 +%bcond_without avahi # Avahi support for saned and net backend %bcond_with libusb0 # libusb 0.1.x API instead of libusb 1.0 # Summary: SANE - easy local and networked scanner access @@ -11,19 +11,19 @@ Summary(ko.UTF-8): 스캐너를 다루는 소프트웨어 Summary(pl.UTF-8): SANE - prosta obsługa skanerów lokalnych i sieciowych Summary(pt_BR.UTF-8): SANE - acesso a scanners locais e em rede Name: sane-backends -Version: 1.0.25 +Version: 1.0.27 Release: 1 License: relaxed GPL v2+ (libraries), Public Domain (docs) Group: Libraries -Source0: https://alioth.debian.org/frs/download.php/file/4146/%{name}-%{version}.tar.bz2 -# Source0-md5: f9ed5405b3c12f07c6ca51ee60225fe7 +Source0: https://alioth.debian.org/frs/download.php/file/4224/%{name}-%{version}.tar.bz2 +# Source0-md5: b10a08785f92a4c07ad961f4d843c934 Source1: %{name}.rc-inetd Source2: %{name}.m4 Patch0: %{name}-lockpath_group.patch Patch1: %{name}-mustek-path.patch Patch2: %{name}-spatc.patch -Patch4: %{name}-link.patch -Patch5: %{name}-1.0.23-sane-config-multilib.patch +Patch3: %{name}-link.patch +Patch4: %{name}-1.0.23-sane-config-multilib.patch URL: http://www.sane-project.org/ BuildRequires: autoconf >= 2.54 BuildRequires: automake @@ -252,8 +252,8 @@ mv -f acinclude.m4.tmp acinclude.m4 %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 -%patch5 -p1 %build %{__libtoolize} @@ -263,11 +263,9 @@ mv -f acinclude.m4.tmp acinclude.m4 %{__automake} %configure \ %{?with_avahi:--enable-avahi} \ - %{!?with_libusb0:--enable-libusb_1_0} \ --enable-pnm-backend \ --enable-pthread \ --enable-static \ - --enable-translations \ %{?with_gphoto:--with-gphoto2} \ --disable-locking @@ -366,6 +364,7 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/ibm.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/kodak.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/kodakaio.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/kvs1025.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/leo.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/lexmark.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/ma1509.conf -- 2.44.0