diff --git a/.gitignore b/.gitignore index bdd49bc..3c8582d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ sane-backends-1.0.21.tar.gz /sane-backends-1.0.28.tar.gz /sane-backends-1.0.29.tar.gz /sane-backends-1.0.30.tar.gz +/sane-backends-1.0.31.tar.gz diff --git a/genesys-slope-assert.patch b/genesys-slope-assert.patch deleted file mode 100644 index 9ed4e46..0000000 --- a/genesys-slope-assert.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp -index 470f9ba..1c9cbe7 100644 ---- a/backend/genesys/gl841.cpp -+++ b/backend/genesys/gl841.cpp -@@ -944,7 +944,7 @@ HOME_FREE: 3 - r->value |= REG_0x02_MTRREV; - } - -- gl841_send_slope_table(dev, 3, fast_table.table, 256); -+ gl841_send_slope_table(dev, 3, fast_table.table, 255); - - r = sanei_genesys_get_address(reg, 0x67); - r->value = 0x3f; -@@ -1165,18 +1165,18 @@ HOME_FREE: 3 - r->value &= ~0x40; - } - -- gl841_send_slope_table(dev, 0, slow_table.table, 256); -+ gl841_send_slope_table(dev, 0, slow_table.table, 255); - -- gl841_send_slope_table(dev, 1, back_table.table, 256); -+ gl841_send_slope_table(dev, 1, back_table.table, 255); - -- gl841_send_slope_table(dev, 2, slow_table.table, 256); -+ gl841_send_slope_table(dev, 2, slow_table.table, 255); - - if (use_fast_fed) { -- gl841_send_slope_table(dev, 3, fast_table.table, 256); -+ gl841_send_slope_table(dev, 3, fast_table.table, 255); - } - - if (has_flag(flags, MotorFlag::AUTO_GO_HOME)) { -- gl841_send_slope_table(dev, 4, fast_table.table, 256); -+ gl841_send_slope_table(dev, 4, fast_table.table, 255); - } - - /* now reg 0x21 and 0x24 are available, we can calculate reg 0x22 and 0x23, diff --git a/sane-backends.spec b/sane-backends.spec index 834be2a..92e7100 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -13,14 +13,14 @@ Summary: Scanner access software Name: sane-backends -Version: 1.0.30 -Release: 4%{?dist} +Version: 1.0.31 +Release: 1%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details License: GPLv2+ and GPLv2+ with exceptions and Public Domain and IJG and LGPLv2+ and MIT # GitLab Download URLs are amazing. But the source code link has different name and doesnt have generated autotools stuff -Source0: https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/%%{name}-%%{version}.tar.gz +Source0: https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/%{name}-%{version}.tar.gz Source1: sane.png Source2: saned.socket @@ -37,11 +37,6 @@ 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 -# undeclared variable on s390x, from upstream -# https://gitlab.com/sane-project/backends/-/merge_requests/329 -Patch4: sane-genesys-s390x-ftbfs.patch -# reported upstream https://gitlab.com/sane-project/backends/-/merge_requests/346 -Patch5: genesys-slope-assert.patch URL: http://www.sane-project.org @@ -124,6 +119,8 @@ Easy (SANE) modules. %package drivers-scanners Summary: SANE backend drivers for scanners +# pixma backend now requires libxml2 +BuildRequires: libxml2-devel Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?fedora} >= 32 || 0%{?rhel} > 8 @@ -158,8 +155,6 @@ 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-s390x-ftbfs -%patch5 -p1 -b .genesys-slope-assert %build CFLAGS="%optflags -fno-strict-aliasing" @@ -304,7 +299,7 @@ exit 0 %files libs %{_libdir}/libsane.so.1 -%{_libdir}/libsane.so.1.0.30 +%{_libdir}/libsane.so.1.0.31 %files devel %{_bindir}/sane-config @@ -329,6 +324,7 @@ exit 0 %{_libdir}/sane/libsane-canon.so %{_libdir}/sane/libsane-canon630u.so %{_libdir}/sane/libsane-canon_dr.so +%{_libdir}/sane/libsane-canon_lide70.so %{_libdir}/sane/libsane-canon_pp.so %{_libdir}/sane/libsane-cardscan.so %{_libdir}/sane/libsane-coolscan.so @@ -415,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.30 +%{_libdir}/sane/*.so.1.0.31 %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.30 +%{_libdir}/sane/libsane-gphoto2.so.1.0.31 %files daemon %{_sbindir}/saned @@ -432,6 +428,9 @@ exit 0 %{_unitdir}/saned@.service %changelog +* Mon Aug 24 2020 Zdenek Dohnal - 1.0.31-1 +- 1.0.31, backend cannon_lide70 added + * Mon Aug 03 2020 Zdenek Dohnal - 1.0.30-4 - get libsane-airscan backend as one of backends diff --git a/sane-genesys-s390x-ftbfs.patch b/sane-genesys-s390x-ftbfs.patch deleted file mode 100644 index 407e52d..0000000 --- a/sane-genesys-s390x-ftbfs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/backend/genesys/low.cpp b/backend/genesys/low.cpp -index 7937fcc..4020456 100644 ---- a/backend/genesys/low.cpp -+++ b/backend/genesys/low.cpp -@@ -539,7 +539,7 @@ Image read_unshuffled_image_from_scanner(Genesys_Device* dev, const ScanSession& - } - - #ifdef WORDS_BIGENDIAN -- if (depth == 16) { -+ if (session.params.depth == 16) { - dev->pipeline.push_node(); - } - #endif diff --git a/sources b/sources index d1997e4..b92f7d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sane-backends-1.0.30.tar.gz) = e9f4ab1f21d5ab0e09b101389c325947824945af968f08b307485f79d4dc4c134b8a1979fb0cf0cfa72435abffe70d0060748a2c2ec46514eb15a0442ee181a5 +SHA512 (sane-backends-1.0.31.tar.gz) = 5d49ca698af38a30a3d23349f2fe82a4a21262b014ca38407d5ea0b3fe7cec72860a39c8651c8a5e2f561a9a740008658a36ed6bd96324be84646dbcf1461bfb