Accepting request 836293 from graphics
Version upgrade to sane-backends 1.0.31 (forwarded request 836292 from jsmeix) OBS-URL: https://build.opensuse.org/request/show/836293 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=90
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
7a88f44317
@ -1,6 +1,6 @@
|
||||
--- doc/descriptions-external/epkowa.desc.orig 2015-09-09 04:23:23.000000000 +0200
|
||||
+++ doc/descriptions-external/epkowa.desc 2015-10-05 14:50:31.000000000 +0200
|
||||
@@ -47,7 +47,7 @@
|
||||
--- doc/descriptions-external/epkowa.desc.orig 2020-08-23 13:59:20.000000000 +0200
|
||||
+++ doc/descriptions-external/epkowa.desc 2020-09-23 11:40:27.359784224 +0200
|
||||
@@ -48,7 +48,7 @@
|
||||
;; Device and manufacturer information.
|
||||
;;
|
||||
:devicetype :scanner
|
||||
@ -9,7 +9,7 @@
|
||||
:url "http://www.epson.com/"
|
||||
:comment ""
|
||||
|
||||
@@ -84,3456 +84,3362 @@
|
||||
@@ -85,979 +85,953 @@
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x08ac"
|
||||
:status :complete
|
||||
@ -173,6 +173,12 @@
|
||||
-:comment "requires DFSG non-free iscan-plugin-ds-30"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>requires DFSG non-free iscan-plugin-ds-30"
|
||||
|
||||
:model "DS-G20000"
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x015b"
|
||||
:status :good
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson"
|
||||
|
||||
:model "EP-702A"
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x0850"
|
||||
@ -672,6 +678,13 @@
|
||||
:usbid "0x04b8" "0x014b"
|
||||
:status :good
|
||||
-:comment "overseas version of the ES-G11000"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>overseas version of the ES-G11000"
|
||||
|
||||
:model "Expression 12000XL"
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x015b"
|
||||
:status :good
|
||||
-:comment "overseas version of the DS-G20000"
|
||||
-
|
||||
-:model "F-3200" ; product spec (JP)
|
||||
-:interface "USB IEEE1394"
|
||||
@ -688,7 +701,7 @@
|
||||
-:status :unsupported
|
||||
-:comment "A better backend for the FilmScan 200 can be found at <A HREF=\"http://www.vjet.demon.co.uk/scanner/\">http://www.vjet.demon.co.uk/scanner/</A>."
|
||||
-:url "http://www.vjet.demon.co.uk/scanner/"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>overseas version of the ES-G11000"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>overseas version of the DS-G20000"
|
||||
|
||||
:model "GT-1500"
|
||||
:interface "USB"
|
||||
@ -1140,11 +1153,7 @@
|
||||
|
||||
:model "GT-X980"
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x0151"
|
||||
:status :good
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson"
|
||||
|
||||
:model "K200 Series"
|
||||
@@ -1068,2490 +1042,2422 @@
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x0871"
|
||||
:status :complete
|
||||
@ -1317,22 +1326,29 @@
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x08ad"
|
||||
:status :good
|
||||
-:comment "network interface not supported<br>business all-in-one"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>network interface not supported<br>business all-in-one"
|
||||
-:comment "network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
|
||||
|
||||
:model "LP-M8040A"
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x08ad"
|
||||
:status :good
|
||||
-:comment "network interface not supported<br>business all-in-one"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>network interface not supported<br>business all-in-one"
|
||||
-:comment "network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
|
||||
|
||||
:model "LP-M8040F"
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x08ad"
|
||||
:status :good
|
||||
-:comment "network interface not supported<br>business all-in-one"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>network interface not supported<br>business all-in-one"
|
||||
-:comment "network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
|
||||
|
||||
:model "LP-M8170"
|
||||
:interface "USB"
|
||||
:usbid "0x04b8" "0x1111"
|
||||
:status :good
|
||||
-:comment "network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
|
||||
+:comment "requires DFSG non-free Image Scan software from Epson<br>network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
|
||||
|
||||
:model "M200 Series"
|
||||
:interface "USB"
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3f5d96a9c47f6124a46bb577c776bbc4896dd17b9203d8bfbc7fe8cbbcf279a3
|
||||
size 7204519
|
||||
3
sane-backends-1.0.31.tar.gz
Normal file
3
sane-backends-1.0.31.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa
|
||||
size 7301484
|
||||
@ -1,85 +0,0 @@
|
||||
From 8d9536a24cb7f4a21fb35326819b292e8f87fc20 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
||||
Date: Thu, 20 Feb 2020 18:46:48 +0100
|
||||
Subject: [PATCH] Make timestamps reproducible
|
||||
|
||||
https://gitlab.com/sane-project/backends/issues/228
|
||||
---
|
||||
tools/sane-desc.c | 24 ++++++++++++------------
|
||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
|
||||
index 890e754..ba85e84 100644
|
||||
--- a/tools/sane-desc.c
|
||||
+++ b/tools/sane-desc.c
|
||||
@@ -2816,8 +2816,8 @@ html_print_footer (void)
|
||||
"<address>\n"
|
||||
"<a href=\"imprint.html\"\n"
|
||||
">Contact</a>\n" "</address>\n" "<font size=-1>\n");
|
||||
- printf ("This page was last updated on %s by sane-desc %s from %s\n",
|
||||
- asctime (localtime (¤t_time)), SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
+ printf ("This page was last updated by sane-desc %s from %s\n",
|
||||
+ SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
printf ("</font>\n");
|
||||
printf ("</body> </html>\n");
|
||||
}
|
||||
@@ -3326,10 +3326,10 @@ print_usermap_header (void)
|
||||
|
||||
printf
|
||||
("# This file was automatically created based on description files (*.desc)\n"
|
||||
- "# by sane-desc %s from %s on %s"
|
||||
+ "# by sane-desc %s from %s"
|
||||
"#\n"
|
||||
,
|
||||
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
+ SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
|
||||
printf
|
||||
("# The entries below are used to detect a USB device and change owner\n"
|
||||
@@ -3398,8 +3398,8 @@ print_db_header (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
printf ("# This file was automatically created based on description files (*.desc)\n"
|
||||
- "# by sane-desc %s from %s on %s",
|
||||
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
+ "# by sane-desc %s from %s",
|
||||
+ SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
printf
|
||||
("#\n"
|
||||
"# The entries below are used to detect a USB device when it's plugged in\n"
|
||||
@@ -3463,8 +3463,8 @@ print_udev_header (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
printf ("# This file was automatically created based on description files (*.desc)\n"
|
||||
- "# by sane-desc %s from %s on %s",
|
||||
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
+ "# by sane-desc %s from %s",
|
||||
+ SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
|
||||
printf
|
||||
("#\n"
|
||||
@@ -3656,8 +3656,8 @@ print_udevhwdb_header (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
printf ("# This file was automatically created based on description files (*.desc)\n"
|
||||
- "# by sane-desc %s from %s on %s",
|
||||
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
+ "# by sane-desc %s from %s",
|
||||
+ SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
|
||||
printf
|
||||
("#\n"
|
||||
@@ -3766,8 +3766,8 @@ print_hwdb_header (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
printf ("# This file was automatically created based on description files (*.desc)\n"
|
||||
- "# by sane-desc %s from %s on %s",
|
||||
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
+ "# by sane-desc %s from %s",
|
||||
+ SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
|
||||
printf
|
||||
("#\n"
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -1,3 +1,73 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 23 11:56:03 CEST 2020 - jsmeix@suse.de
|
||||
|
||||
- Upgraded to sane-backends version 1.0.31
|
||||
Changes since 1.0.30
|
||||
see https://gitlab.com/sane-project/backends/-/blob/master/NEWS
|
||||
Backends
|
||||
* adds the canon_lide70 backend
|
||||
* avision: adds support for the KODAK i1120,
|
||||
fixes thread cancellation issues,
|
||||
disables exposure option for non-filmscanners
|
||||
* canon_dr: improves error reporting
|
||||
* dmc: fixes compiler warnings on the scan area options
|
||||
* epsonds: rewrites the network I/O following changes
|
||||
made to the epson2 backend in 1.0.30 to fix security issues.
|
||||
Network support is still unsupported.
|
||||
* escl: adds ADF support, fixes many minor issues and improves
|
||||
error handling. Now also supports devices behind a proxy
|
||||
(needs explicit configuration).
|
||||
* fujitsu: adds support for the fi-800R and a card scanning
|
||||
slot, fixes a bug when reading hardware sensors on the first
|
||||
invocation. Adds USB IDs for fi-7800 and fi-7900.
|
||||
* genesys: adds support for the Canon 5600F, Canon LiDE 90,
|
||||
Plustek OpticFilm 7200 and 7200 (v2), 7400, 7600i, 8100
|
||||
and 8200i. Fixes several issues with the Canon 8600F.
|
||||
Adds 4800dpi support for the Canon LiDE 210 and fixes 3200dpi
|
||||
flatbed support on the Canon 8400F. Adds an option to fill
|
||||
dark calibration with a constant. Adds transparency support
|
||||
for gl847 chipset based devices. Fixes CIS scanner support
|
||||
for gl842 chipset based devices. Removes lineart and image
|
||||
enhancement emulation support.
|
||||
* gphoto: supports the PLANon DocuPen RC800 (with a recent
|
||||
enough version of gphoto2)
|
||||
* gt68xx: modifies scan cancellation behaviour
|
||||
* hp5400: adds button support, fixes a scan cancellation
|
||||
crash issue
|
||||
* pixma: add supports for the i-SENSYS MF440 Series and untested
|
||||
support for the PIXMMA G7000 Series and GM4000 Series as well
|
||||
as the i-SENSYS MF720 Series.
|
||||
* plustek: fixes a potential buffer overrun
|
||||
* test: adds gamma options
|
||||
Documentation
|
||||
* removes the SANE Standard. This is now maintained
|
||||
as a separate project at
|
||||
https://gitlab.com/sane-project/standard
|
||||
HTML and PDF versions can be found at
|
||||
https://sane-project.gitlab.io/standard/
|
||||
* adds and updates information for multiple supported and
|
||||
unsupported devices
|
||||
* translation updates for British English, French, German,
|
||||
Italian and Ukranian
|
||||
* scanimage: documents the JPEG compression level
|
||||
* minor improvements documenting build requirements
|
||||
Build
|
||||
* removes the --with-api-spec option from configure
|
||||
* replaces the --enable-avahi option with an --with-avahi
|
||||
that defaults to enabling if possible. If the option is given
|
||||
and the required support is not available, configure will
|
||||
exit with an error.
|
||||
* improves checking for libjpeg version dependent requirements
|
||||
* has been made reproducable (upstream issue 228)
|
||||
* fixes build issues on MinGW
|
||||
Miscellaneous
|
||||
* various fixes and improvements in the USB record/replay support
|
||||
* fixes a file descriptor validation test in sanei_pio
|
||||
* adds missing include in sanei_usb
|
||||
- sane-backends.builttime.patch is no longer needed because the
|
||||
issue https://gitlab.com/sane-project/backends/-/issues/228
|
||||
is fixed in the upstream sources
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 18 15:15:05 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
|
||||
@ -16,8 +16,11 @@
|
||||
#
|
||||
|
||||
|
||||
# Enable support for PWG eSCL network backend
|
||||
# Cf. https://rpm.org/user_doc/conditional_builds.html
|
||||
# by default enable support for PWG eSCL network backend
|
||||
%bcond_without escl
|
||||
# by default disable support for PWG eSCL network backend
|
||||
#bcond_with escl
|
||||
|
||||
Name: sane-backends
|
||||
BuildRequires: gcc-c++
|
||||
@ -30,9 +33,13 @@ BuildRequires: pkgconfig
|
||||
%if %{with escl}
|
||||
BuildRequires: pkgconfig(avahi-client) >= 0.6.24
|
||||
BuildRequires: pkgconfig(libcurl)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
# since sane-backends 1.0.31 the escl backend requires libpoppler-glib-devel
|
||||
# cf. https://gitlab.com/sane-project/backends/-/blob/master/INSTALL.linux
|
||||
BuildRequires: libpoppler-glib-devel
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libusb-1.0)
|
||||
# The pixma backend requires libxml2
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
%systemd_requires
|
||||
|
||||
@ -43,15 +50,19 @@ BuildRequires: pkgconfig(systemd)
|
||||
Summary: SANE (Scanner Access Now Easy) Scanner Drivers
|
||||
License: GPL-2.0-or-later AND SUSE-GPL-2.0+-with-sane-exception AND SUSE-Public-Domain
|
||||
Group: Hardware/Scanner
|
||||
Version: 1.0.30
|
||||
Version: 1.0.31
|
||||
Release: 0
|
||||
URL: http://www.sane-project.org/
|
||||
# Unfortunately, the first version does not build, as it does not contain a prebuilt configure,
|
||||
# and autoconf fails as it requires a complete git clone:
|
||||
# https://gitlab.com/sane-project/backends/issues/248
|
||||
# Use the version including a semi-random hash instead, which is a dist tarball
|
||||
# Source0: https://gitlab.com/sane-project/backends/-/archive/%%{version}/backends-%%{version}.tar.gz#/sane-backends-%%{version}.tar.gz
|
||||
Source0: https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-1.0.30.tar.gz
|
||||
# On https://gitlab.com/sane-project/backends/-/releases
|
||||
# there are two links, the first one is called "Source code (tar.gz)" that pints to
|
||||
# https://gitlab.com/sane-project/backends/-/archive/1.0.31/backends-1.0.31.tar.gz
|
||||
# and the second one is called "sane-backends-1.0.31.tar.gz" that pints to
|
||||
# https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/sane-backends-1.0.31.tar.gz
|
||||
# The first one "backends-1.0.31.tar.gz" does not build, as it does not contain a prebuilt configure script,
|
||||
# and autoconf fails as it requires a complete git clone, see https://gitlab.com/sane-project/backends/issues/248
|
||||
# We use the second one "sane-backends-1.0.31.tar.gz" that is a dist tarball with a prebuilt configure script via
|
||||
# wget https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/sane-backends-1.0.31.tar.gz
|
||||
Source0: sane-backends-1.0.31.tar.gz
|
||||
# Source100... is SUSE specific stuff:
|
||||
# Source102 is the OpenSLP registration file for the saned:
|
||||
Source102: sane.reg
|
||||
@ -76,11 +87,9 @@ Source201: create_sane-backends-autoconfig.rules
|
||||
# Sources 202 and 203 are files to enable socket based service activation which replaced xinetd
|
||||
Source202: saned@.service
|
||||
Source203: saned.socket
|
||||
# PATCH-FIX-OPENSUSE - Make timestamps reproducible, https://gitlab.com/sane-project/backends/issues/228
|
||||
Patch2: sane-backends.builttime.patch
|
||||
# Patch100... is SUSE specific stuff:
|
||||
# Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner
|
||||
# (see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14).
|
||||
# (see https://bugzilla.opensuse.org/show_bug.cgi?id=788756#c14).
|
||||
# It adds "requires DFSG non-free Image Scan software from Avasys" to all comments
|
||||
# (or adds such a comment if there is not yet a comment) so that yast2-scanner
|
||||
# (via "requires DFSG non-free" string match in create_scanner_database)
|
||||
@ -179,11 +188,9 @@ Saned allows access to locally attached scanners over the network.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# Patch2 sane-backends.builttime.patch avoids build-compare noise
|
||||
%patch2 -p1
|
||||
# Patch100... is SUSE specific stuff:
|
||||
# Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14
|
||||
# see https://bugzilla.opensuse.org/show_bug.cgi?id=788756#c14
|
||||
%patch102
|
||||
|
||||
# Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
|
||||
@ -210,13 +217,6 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE -DGIMP_ENABLE_COMPAT_CRUFT=1 -fno-stric
|
||||
export LDFLAGS="-L/%_lib $LDFLAGS"
|
||||
# Enable pthread instead of fork (used in Debian since Feb 2009 and no issues so far),
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=633780
|
||||
#
|
||||
# Without converting API spec to supported output formats PostScript, PDF, HTML
|
||||
# i.e. use none of --with_api_ps --with_api_pdf --with_api_html cf. configure.ac
|
||||
# because converting the API spec needs tons of stuff in the build system
|
||||
# like LaTeX, Ghostscript, PDF tools and all what those require and
|
||||
# the API spec is not for users but for developers who could get
|
||||
# the "Programmer's Documentation" at http://www.sane-project.org/docs.html
|
||||
# Disable locking because /var/lock/sane/ would be a world-writable directory.
|
||||
./configure --prefix=/usr \
|
||||
--exec-prefix=/usr \
|
||||
@ -229,9 +229,8 @@ export LDFLAGS="-L/%_lib $LDFLAGS"
|
||||
--enable-pthread \
|
||||
--with-usb \
|
||||
%if %{with escl}
|
||||
--enable-avahi \
|
||||
--with-avahi \
|
||||
%endif
|
||||
--without-api-spec \
|
||||
--disable-locking
|
||||
# Enable locking for backends where "99" is the group of the lockfile path (LOCKPATH_GROUP)
|
||||
# because "99" is the group of the user who runs the build when norootforbuild is used
|
||||
|
||||
Loading…
Reference in New Issue
Block a user