From 7d3dd917343a955ac80b6cb84febb4e2dbee7c0f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 17 Oct 2019 11:31:27 +0200 Subject: [PATCH] 1758886 - CanoScan LiDE scanners supported by genesys backend are not detected --- ...ke-sure-calib_reg-are-available-before-wri.patch | 13 +++++++++++++ sane-backends.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 0001-genesys-Make-sure-calib_reg-are-available-before-wri.patch diff --git a/0001-genesys-Make-sure-calib_reg-are-available-before-wri.patch b/0001-genesys-Make-sure-calib_reg-are-available-before-wri.patch new file mode 100644 index 0000000..4687a24 --- /dev/null +++ b/0001-genesys-Make-sure-calib_reg-are-available-before-wri.patch @@ -0,0 +1,13 @@ +diff -up sane-backends-1.0.28/backend/genesys_gl841.cc.genesys-regression sane-backends-1.0.28/backend/genesys_gl841.cc +--- sane-backends-1.0.28/backend/genesys_gl841.cc.genesys-regression 2019-10-14 13:11:10.772763713 +0200 ++++ sane-backends-1.0.28/backend/genesys_gl841.cc 2019-10-14 13:11:57.602389188 +0200 +@@ -5042,6 +5042,9 @@ gl841_init (Genesys_Device * dev) + /* Set analog frontend */ + RIE (gl841_set_fe(dev, sensor, AFE_INIT)); + ++ // FIXME: slow_back_home modifies dev->calib_reg and requires it to be filled ++ dev->calib_reg = dev->reg; ++ + /* Move home */ + RIE (gl841_slow_back_home (dev, SANE_TRUE)); + diff --git a/sane-backends.spec b/sane-backends.spec index 502c564..a3814f4 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -55,6 +55,8 @@ Patch1: sane-backends-1.0.23-soname.patch Patch2: sane-backends-1.0.23-sane-config-multilib.patch # saned manpage incomplete and exists when saned is not installed (#1515762) Patch3: sane-backends-saned-manpage.patch +# several canoscan models did not work due genesys backend rewritten, taken from upstream +Patch4: 0001-genesys-Make-sure-calib_reg-are-available-before-wri.patch URL: http://www.sane-project.org @@ -190,6 +192,7 @@ access image acquisition devices available on the local host. %patch1 -p1 -b .soname %patch2 -p1 -b .sane-config-multilib %patch3 -p1 -b .saned-manpage +%patch4 -p1 -b .genesys-regression %build CFLAGS="%optflags -fno-strict-aliasing" @@ -448,8 +451,9 @@ exit 0 %{_unitdir}/saned@.service %changelog -* Mon Oct 14 2019 Zdenek Dohnal - 1.0.28-2 +* Thu Oct 17 2019 Zdenek Dohnal - 1.0.28-2 - 1761145, 1761001, 1761051, 1761234 - genesys backend now needs gcc-c++, it is not built otherwise +- 1758886 - CanoScan LiDE scanners supported by genesys backend are not detected * Mon Sep 30 2019 Zdenek Dohnal - 1.0.28-1 - 1.0.28