rpms/sane-backends
7
0
Fork 0
Code Issues Pull Requests Releases Activity

2042563 - sane-backends-1.1.1 is available

Browse Source
This commit is contained in:
Zdenek Dohnal 2022-01-20 15:48:02 +01:00
parent 5da3040a6b
commit b690f5f3a9
5 changed files with 10 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ sane-backends-1.0.21.tar.gz
/sane-backends-1.0.30.tar.gz
/sane-backends-1.0.31.tar.gz
/sane-backends-1.0.32.tar.gz
/sane-backends-1.1.1.tar.gz

13
genesys-600dpi-cropped.patch
View File

@ -1,13 +0,0 @@
diff --git a/backend/genesys/tables_motor.cpp b/backend/genesys/tables_motor.cpp
index e8e89c5..fa75bae 100644
--- a/backend/genesys/tables_motor.cpp
+++ b/backend/genesys/tables_motor.cpp
@@ -472,7 +472,7 @@ void genesys_init_motor_tables()
motor.base_ydpi = 4800;
motor.profiles.push_back({MotorSlope::create_from_steps(62496, 864, 127),
StepType::FULL, 4608});
- motor.profiles.push_back({MotorSlope::create_from_steps(62496, 2010, 63),
+ motor.profiles.push_back({MotorSlope::create_from_steps(62496, 1338, 63),
StepType::HALF, 5360});
motor.profiles.push_back({MotorSlope::create_from_steps(62464, 2632, 3),
StepType::QUARTER, 10528});

19
sane-backends.spec
View File

@ -13,8 +13,8 @@
Summary: Scanner access software
Name: sane-backends
Version: 1.0.32
Release: 5%{?dist}
Version: 1.1.1
Release: 1%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@ -35,10 +35,6 @@ Patch0: sane-backends-1.0.25-udev.patch
Patch1: sane-backends-1.0.23-soname.patch
# Fedora-specific (for now): make installed sane-config multi-lib aware again
Patch2: sane-backends-1.0.23-sane-config-multilib.patch
# 1934308 - Several Epson devices cannot scan because they fail to set focus
Patch3: sane-epson2-disable-focus.patch
# 1976507 - [genesys 600dpi only] Canon LiDE 120 produces zoomed-in image which doesn't fit into A4 size
Patch4: genesys-600dpi-cropped.patch
URL: http://www.sane-project.org
@ -159,8 +155,6 @@ access image acquisition devices available on the local host.
%patch0 -p1 -b .udev
%patch1 -p1 -b .soname
%patch2 -p1 -b .sane-config-multilib
%patch3 -p1 -b .disable-focus
%patch4 -p1 -b .genesys-600dpi-cropped
%build
CFLAGS="%optflags -fno-strict-aliasing"
@ -305,7 +299,7 @@ exit 0
%files libs
%{_libdir}/libsane.so.1
%{_libdir}/libsane.so.1.0.32
%{_libdir}/libsane.so.1.1.1
%files devel
%{_bindir}/sane-config
@ -417,14 +411,14 @@ exit 0
%{_libdir}/sane/libsane-v4l.so
%{_libdir}/sane/libsane-xerox_mfp.so
%{_libdir}/sane/*.so.1
%{_libdir}/sane/*.so.1.0.32
%{_libdir}/sane/*.so.1.1.1
%exclude %{_libdir}/sane/*gphoto2.so*
%files drivers-cameras
%{_libdir}/sane/libsane-gphoto2.so
%{_libdir}/sane/libsane-gphoto2.so.1
%{_libdir}/sane/libsane-gphoto2.so.1.0.32
%{_libdir}/sane/libsane-gphoto2.so.1.1.1
%files daemon
%{_sbindir}/saned
@ -434,6 +428,9 @@ exit 0
%{_unitdir}/saned@.service
%changelog
* Thu Jan 20 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-1
- 2042563 - sane-backends-1.1.1 is available
* Mon Jul 26 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1.0.32-5
- 1976507 - [genesys 600dpi only] Canon LiDE 120 produces zoomed-in image which doesn't fit into A4 size

36
sane-epson2-disable-focus.patch
View File

@ -1,36 +0,0 @@
diff --git a/backend/epson2-ops.c b/backend/epson2-ops.c
index 83a0169..573ebcf 100644
--- a/backend/epson2-ops.c
+++ b/backend/epson2-ops.c
@@ -291,14 +291,14 @@ e2_dev_post_init(struct Epson_Device *dev)
dev->need_reset_on_source_change = SANE_FALSE;
if (e2_dev_model(dev, "ES-9000H") || e2_dev_model(dev, "GT-30000")) {
- dev->cmd->set_focus_position = 0;
dev->cmd->feed = 0x19;
+ dev->focusSupport = SANE_FALSE;
}
if (e2_dev_model(dev, "GT-8200") || e2_dev_model(dev, "Perfection1650")
|| e2_dev_model(dev, "Perfection1640") || e2_dev_model(dev, "GT-8700")) {
dev->cmd->feed = 0;
- dev->cmd->set_focus_position = 0;
+ dev->focusSupport = SANE_FALSE;
dev->need_reset_on_source_change = SANE_TRUE;
}
@@ -825,12 +825,12 @@ e2_discover_capabilities(Epson_Scanner *s)
if (esci_request_focus_position(s, &s->currentFocusPosition) ==
SANE_STATUS_GOOD) {
- DBG(1, "setting focus is supported, current focus: %u\n", s->currentFocusPosition);
+ DBG(1, "getting focus is supported, current focus: %u\n", s->currentFocusPosition);
dev->focusSupport = SANE_TRUE;
s->opt[OPT_FOCUS_POS].cap &= ~SANE_CAP_INACTIVE;
s->val[OPT_FOCUS_POS].w = s->currentFocusPosition;
} else {
- DBG(1, "setting focus is not supported\n");
+ DBG(1, "getting focus is not supported\n");
dev->focusSupport = SANE_FALSE;
s->opt[OPT_FOCUS_POS].cap |= SANE_CAP_INACTIVE;
s->val[OPT_FOCUS_POS].w = FOCUS_ON_GLASS; /* just in case */

2
sources
View File

@ -1 +1 @@
SHA512 (sane-backends-1.0.32.tar.gz) = 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
SHA512 (sane-backends-1.1.1.tar.gz) = 25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d