[packages/sane-backends] up to 1.0.32

[atler]

commit dfa6a47659a75d78bddddba954504a0138fca78b
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Oct 7 17:06:58 2021 +0200

    up to 1.0.32
    
    - BR: autoconf-archive for AX_CXX_COMPILE_STDCXX_11
    - require libjpeg-turbo (escl backend requires
      jpeg_crop_scanline/jpeg_skip_scanlines)
    - require python3 (python 2.7 is sufficient but let's settle on python3
      where possible)

 sane-backends-mustek-path.patch |  4 ++--
 sane-backends-spatc.patch       | 10 +++++-----
 sane-backends.spec              | 13 ++++++++-----
 3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/sane-backends.spec b/sane-backends.spec
index 7f5d4e3..818d65c 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -18,14 +18,14 @@ 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.31
-Release:	2
+Version:	1.0.32
+Release:	1
 License:	relaxed GPL v2+ (libraries), Public Domain (docs)
 Group:		Libraries
 # http://www.sane-project.org/source.html is out of date atm. (20180902)
 #Source0Download: https://gitlab.com/sane-project/backends/-/tags [URLs from //gitlab.com/sane-project/backends/-/releases with JS support]
-Source0:	https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/%{name}-%{version}.tar.gz
-# Source0-md5:	9c79ed2f9af7ac9b1204c9ac7e377f2b
+Source0:	https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/%{name}-%{version}.tar.gz
+# Source0-md5:	51ff581b911fc9b7b6b5ae6959f9089b
 Source1:	%{name}.rc-inetd
 Source2:	%{name}.m4
 Patch0:		%{name}-lockpath_group.patch
@@ -35,6 +35,7 @@ Patch3:		%{name}-link.patch
 Patch4:		%{name}-1.0.23-sane-config-multilib.patch
 URL:		http://www.sane-project.org/
 BuildRequires:	autoconf >= 2.69
+BuildRequires:	autoconf-archive
 BuildRequires:	automake >= 1:1.15
 %{?with_avahi:BuildRequires:	avahi-devel >= 0.6.24}
 BuildRequires:	cups-devel
@@ -44,7 +45,7 @@ BuildRequires:	gettext-tools >= 0.19.8
 BuildRequires:	ghostscript
 %{?with_gphoto:BuildRequires:	libgphoto2-devel >= 2.5.0}
 %{?with_lpt:BuildRequires:	libieee1284-devel >= 0.1.5}
-BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 2:2.4.6
@@ -54,6 +55,8 @@ BuildRequires:	libv4l-devel
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	net-snmp-devel >= 5.6
 BuildRequires:	pkgconfig
+BuildRequires:	python3
+BuildRequires:	python3-modules
 %{?with_resmgr:BuildRequires:	resmgr-devel}
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
diff --git a/sane-backends-mustek-path.patch b/sane-backends-mustek-path.patch
index 95284a3..252db24 100644
--- a/sane-backends-mustek-path.patch
+++ b/sane-backends-mustek-path.patch
@@ -1,8 +1,8 @@
 --- sane-backends-1.0.4/tools/mustek600iin-off.c.orig	Mon Aug  9 20:06:01 1999
 +++ sane-backends-1.0.4/tools/mustek600iin-off.c	Sat Feb 10 20:29:19 2001
 @@ -28,7 +28,7 @@
- #include <sane/config.h>
- #include <sane/sanei.h>
+ #include "../include/sane/config.h"
+ #include "../include/sane/sanei.h"
  
 -#define MUSTEK_CONF	STRINGIFY(PATH_SANE_CONFIG_DIR) "/mustek.conf"
 +#define MUSTEK_CONF	"/etc/sane.d/mustek.conf"
diff --git a/sane-backends-spatc.patch b/sane-backends-spatc.patch
index 28e54e5..4ea3048 100644
--- a/sane-backends-spatc.patch
+++ b/sane-backends-spatc.patch
@@ -10,7 +10,7 @@
 +
  #ifdef HAVE_SYS_IO_H
  # include <sys/io.h>	/* use where available (glibc 2.x, for example) */
- #elif HAVE_ASM_IO_H
+ # ifndef SANE_HAVE_SYS_IO_H_WITH_INB_OUTB
 @@ -72,6 +76,8 @@
  
  #else
@@ -19,12 +19,12 @@
 +
  #endif
  
- #include <sane/sane.h>
+ #include "../include/sane/sane.h"
 --- sane-1.0.2/sanei/sanei_pio.c.orig	Thu May 18 18:24:42 2000
 +++ sane-1.0.2/sanei/sanei_pio.c	Thu May 18 18:25:31 2000
 @@ -58,6 +58,10 @@
- # include <unistd.h>
  #endif
+ #include <sys/types.h>
  
 +#ifdef __sparc__
 +#define IO_SUPPORT_MISSING
@@ -32,7 +32,7 @@
 +
  #ifdef HAVE_SYS_IO_H
  # include <sys/io.h>	/* use where available (glibc 2.x, for example) */
- #elif HAVE_ASM_IO_H
+ # ifndef SANE_HAVE_SYS_IO_H_WITH_INB_OUTB
 @@ -83,6 +87,7 @@
  
  #else
@@ -40,4 +40,4 @@
 +#endif
  #endif
  
- #include <sane/sane.h>
+ #include "../include/sane/sane.h"
================================================================

---- gitweb:

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