* [PR PATCH] imagescan: update to 3.65.0.
@ 2021-09-03 20:54 jbenden
2021-09-04 7:44 ` [PR PATCH] [Updated] " jbenden
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: jbenden @ 2021-09-03 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
There is a new pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages imagescan-3.65.0
https://github.com/void-linux/void-packages/pull/32825
imagescan: update to 3.65.0.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### Additional Information
I purchased a new EPSON printer and could not get it to completely work (mostly scanning). So I underwent the process to upgrade the components (this PR). Afterwards all printer functionality is working (print, scan, etc.).
I want to point out it was NOT trivial to make the scanner functionality work. I'd recommend that a documentation page be added to cover the additional bits that I've placed in the `INSTALL.msg` file; unless you think it is sufficient. Please advise.
A patch file from https://github.com/void-linux/void-packages/pull/32825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imagescan-3.65.0-32825.patch --]
[-- Type: text/x-diff, Size: 4638 bytes --]
From c231158484a97b53ea4ee1201f5d81fd86736380 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Fri, 3 Sep 2021 13:30:42 -0700
Subject: [PATCH] imagescan: update to 3.65.0.
Signed-off-by: Joseph Benden <joe@benden.us>
---
.../imagescan-plugin-networkscan/INSTALL.msg | 23 +++++++++++++++++++
srcpkgs/imagescan-plugin-networkscan/template | 8 +++----
srcpkgs/imagescan/patches/fix-iostream.patch | 20 ----------------
srcpkgs/imagescan/template | 10 ++++----
4 files changed, 32 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/imagescan/patches/fix-iostream.patch
diff --git a/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg b/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
index 56865d74a9ec..7a3147e7a253 100644
--- a/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
+++ b/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
@@ -1 +1,24 @@
Please read /usr/share/doc/imagescan-plugin-networkscan/README
+
+CRITICAL: The documentation all mention the use of:
+
+ /etc/imagescan/imagescan.conf
+
+But this is incorrect. The correct path is:
+
+ /etc/utsushi/utsushi.conf
+
+The discrepancy stems from the difference in use of software
+provided from EPSON(TM) verses the downstream open-source
+project.
+
+An example of a working configuration is:
+```
+[devices]
+
+net.udi = networkscan:esci://192.168.1.98:1865
+net.vendor = Epson
+net.model = ET-2760
+net.name = Epson Network Scanner
+```
+
diff --git a/srcpkgs/imagescan-plugin-networkscan/template b/srcpkgs/imagescan-plugin-networkscan/template
index b36c8c2c59d6..1b9d1494b53e 100644
--- a/srcpkgs/imagescan-plugin-networkscan/template
+++ b/srcpkgs/imagescan-plugin-networkscan/template
@@ -1,9 +1,9 @@
# Template file for 'imagescan-plugin-networkscan'
pkgname=imagescan-plugin-networkscan
-version=1.1.3
+version=1.1.4
revision=1
archs="i686 x86_64"
-_bversion=3.63.0
+_bversion=3.65.0
_dst=ubuntu
_rel=18.04
build_style=fetch
@@ -17,12 +17,12 @@ case "${XBPS_TARGET_MACHINE}" in
x86_64)
_type=x64
_arch=amd64
- _hash=318372a594fdff4d0f1d5dbe4d7d818036ee7f78edbb6d14ed1ad49b1c057c51
+ _hash=bbc171780e079ba65ef7817b3eb7bed419faa1b09080f6ac72cd3731bc3dc930
;;
i686)
_type=x86
_arch=i386
- _hash=412430d264fb3c3e80e5a22ecacec774b8a52d95b26db0930a17e4e58bd7e52c
+ _hash=aa7c67a8b6a513bb7f5d0fb952c8bd3cf7d2dfe7fe26c87b745d5f99f5187d49
;;
esac
diff --git a/srcpkgs/imagescan/patches/fix-iostream.patch b/srcpkgs/imagescan/patches/fix-iostream.patch
deleted file mode 100644
index 11ac322741df..000000000000
--- a/srcpkgs/imagescan/patches/fix-iostream.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/utsushi/string.hpp 2019-04-02 02:01:37.000000000 +0200
-+++ b/utsushi/string.hpp 2021-01-19 00:58:03.102000070 +0100
-@@ -23,6 +23,7 @@
-
- #include <iosfwd>
-+#include <iostream>
- #include <string>
-
- #include <boost/operators.hpp>
-
---- a/utsushi/toggle.hpp 2019-04-02 02:01:36.000000000 +0200
-+++ b/utsushi/toggle.hpp 2021-01-19 01:00:34.884821885 +0100
-@@ -22,6 +22,7 @@
- #define utsushi_toggle_hpp_
-
- #include <iosfwd>
-+#include <iostream>
- #include <boost/operators.hpp>
-
- namespace utsushi {
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index 0a0cb5e2b3f8..5e351a808240 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,22 +1,22 @@
# Template file for 'imagescan'
pkgname=imagescan
-version=3.55.0
-revision=2
-wrksrc=utsushi-0.55.0
+version=3.65.0
+revision=1
+wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-gtkmm --enable-sane-config --with-sane-confdir=/etc/sane.d --enable-udev-config
--with-udev-confdir=/usr/lib/udev --with-jpeg --with-magick --with-sane --with-tiff"
conf_files="/etc/utsushi/combo.conf"
hostmakedepends="ImageMagick pkg-config sane"
-makedepends="boost-devel eudev-libudev-devel gtkmm2-devel libusb-devel sane-devel"
+makedepends="boost-devel eudev-libudev-devel gtkmm2-devel pango-devel libusb-devel sane-devel"
depends="ImageMagick"
short_desc="EPSON Image Scan v3 front-end and backend for scanners and all-in-ones"
maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/utsushi/imagescan/"
distfiles="http://support.epson.net/linux/src/scanner/imagescanv3/debian/${pkgname}_${version}.orig.tar.gz"
-checksum=9440b103b8218863ab08e891d2a9dc9ef52db51485e11017d52fb2036e279477
+checksum=e83704398c51a3166fd62c25b89e95cf6262e52f3dc6e627db3e7556e2220d64
mutable_files="/etc/sane.d/dll.d/utsushi"
CFLAGS="-Wno-error"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
@ 2021-09-04 7:44 ` jbenden
2021-09-04 20:25 ` jbenden
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-04 7:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]
There is an updated pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages imagescan-3.65.0
https://github.com/void-linux/void-packages/pull/32825
imagescan: update to 3.65.0.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### Additional Information
I purchased a new EPSON printer and could not get it to completely work (mostly scanning). So I underwent the process to upgrade the components (this PR). Afterwards all printer functionality is working (print, scan, etc.).
I want to point out it was NOT trivial to make the scanner functionality work. I'd recommend that a documentation page be added to cover the additional bits that I've placed in the `INSTALL.msg` file; unless you think it is sufficient. Please advise.
A patch file from https://github.com/void-linux/void-packages/pull/32825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imagescan-3.65.0-32825.patch --]
[-- Type: text/x-diff, Size: 33242 bytes --]
From 11dea6f063de0f7217365675187ece9b01a6daba Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Fri, 3 Sep 2021 13:30:42 -0700
Subject: [PATCH] imagescan: update to 3.65.0.
Signed-off-by: Joseph Benden <joe@benden.us>
---
.../imagescan-plugin-networkscan/INSTALL.msg | 23 +++
srcpkgs/imagescan-plugin-networkscan/template | 16 +-
.../drivers-esci-tests-Makefile_in.patch | 67 +++++++
.../filters-get_text_orientation.patch | 31 ++++
.../patches/filters-reorient_cpp.patch | 29 +++
.../patches/filters-tests-makefile_am.patch | 86 +++++++++
srcpkgs/imagescan/patches/fix-iostream.patch | 20 ---
.../patches/lib-tests-makefile_am.patch | 170 ++++++++++++++++++
.../patches/lib-tests-memory_cpp.patch | 11 ++
.../patches/sane-tests-Makefile_in.patch | 26 +++
srcpkgs/imagescan/template | 14 +-
11 files changed, 456 insertions(+), 37 deletions(-)
create mode 100644 srcpkgs/imagescan/patches/drivers-esci-tests-Makefile_in.patch
create mode 100644 srcpkgs/imagescan/patches/filters-get_text_orientation.patch
create mode 100644 srcpkgs/imagescan/patches/filters-reorient_cpp.patch
create mode 100644 srcpkgs/imagescan/patches/filters-tests-makefile_am.patch
delete mode 100644 srcpkgs/imagescan/patches/fix-iostream.patch
create mode 100644 srcpkgs/imagescan/patches/lib-tests-makefile_am.patch
create mode 100644 srcpkgs/imagescan/patches/lib-tests-memory_cpp.patch
create mode 100644 srcpkgs/imagescan/patches/sane-tests-Makefile_in.patch
diff --git a/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg b/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
index 56865d74a9ec..7a3147e7a253 100644
--- a/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
+++ b/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
@@ -1 +1,24 @@
Please read /usr/share/doc/imagescan-plugin-networkscan/README
+
+CRITICAL: The documentation all mention the use of:
+
+ /etc/imagescan/imagescan.conf
+
+But this is incorrect. The correct path is:
+
+ /etc/utsushi/utsushi.conf
+
+The discrepancy stems from the difference in use of software
+provided from EPSON(TM) verses the downstream open-source
+project.
+
+An example of a working configuration is:
+```
+[devices]
+
+net.udi = networkscan:esci://192.168.1.98:1865
+net.vendor = Epson
+net.model = ET-2760
+net.name = Epson Network Scanner
+```
+
diff --git a/srcpkgs/imagescan-plugin-networkscan/template b/srcpkgs/imagescan-plugin-networkscan/template
index b36c8c2c59d6..ea53672032ca 100644
--- a/srcpkgs/imagescan-plugin-networkscan/template
+++ b/srcpkgs/imagescan-plugin-networkscan/template
@@ -1,9 +1,9 @@
# Template file for 'imagescan-plugin-networkscan'
pkgname=imagescan-plugin-networkscan
-version=1.1.3
+version=1.1.4
revision=1
archs="i686 x86_64"
-_bversion=3.63.0
+_bversion=3.65.0
_dst=ubuntu
_rel=18.04
build_style=fetch
@@ -17,12 +17,12 @@ case "${XBPS_TARGET_MACHINE}" in
x86_64)
_type=x64
_arch=amd64
- _hash=318372a594fdff4d0f1d5dbe4d7d818036ee7f78edbb6d14ed1ad49b1c057c51
+ _hash=bbc171780e079ba65ef7817b3eb7bed419faa1b09080f6ac72cd3731bc3dc930
;;
i686)
_type=x86
_arch=i386
- _hash=412430d264fb3c3e80e5a22ecacec774b8a52d95b26db0930a17e4e58bd7e52c
+ _hash=aa7c67a8b6a513bb7f5d0fb952c8bd3cf7d2dfe7fe26c87b745d5f99f5187d49
;;
esac
@@ -36,12 +36,8 @@ do_extract() {
}
do_install() {
- vmkdir usr/share/licenses/imagescan-plugin-networkscan
- zcat usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.en.txt.gz \
- > ${DESTDIR}/usr/share/licenses/imagescan-plugin-networkscan/COPYING.EPSON.en.txt
- zcat usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.ja.txt.gz \
- > ${DESTDIR}/usr/share/licenses/imagescan-plugin-networkscan/COPYING.EPSON.ja.txt
-
+ vlicense usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.en.txt.gz
+ vlicense usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.ja.txt.gz
rm usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.en.txt.gz
rm usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.ja.txt.gz
diff --git a/srcpkgs/imagescan/patches/drivers-esci-tests-Makefile_in.patch b/srcpkgs/imagescan/patches/drivers-esci-tests-Makefile_in.patch
new file mode 100644
index 000000000000..2c1534cffb29
--- /dev/null
+++ b/srcpkgs/imagescan/patches/drivers-esci-tests-Makefile_in.patch
@@ -0,0 +1,67 @@
+--- a/drivers/esci/tests/Makefile.in 2021-09-04 00:12:07.232127878 -0700
++++ b/drivers/esci/tests/Makefile.in.orig 2021-09-04 00:14:24.968647413 -0700
+@@ -183,7 +183,8 @@ am__DEPENDENCIES_1 =
+ @enable_boost_unit_test_framework_TRUE@grammar_formats_utr_DEPENDENCIES = \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_2) \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -192,18 +193,21 @@ grammar_mechanics_utr_SOURCES = grammar-
+ grammar_mechanics_utr_OBJECTS = grammar-mechanics.$(OBJEXT)
+ @enable_boost_unit_test_framework_TRUE@grammar_mechanics_utr_DEPENDENCIES = \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_2) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ grammar_utr_SOURCES = grammar.cpp
+ grammar_utr_OBJECTS = grammar.$(OBJEXT)
+ @enable_boost_unit_test_framework_TRUE@grammar_utr_DEPENDENCIES = \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_2) \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ setter_utr_SOURCES = setter.cpp
+ setter_utr_OBJECTS = setter.$(OBJEXT)
+ @enable_boost_unit_test_framework_TRUE@setter_utr_DEPENDENCIES = \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_2) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ udev_rules_utr_SOURCES = udev-rules.cpp
+ udev_rules_utr_OBJECTS = udev-rules.$(OBJEXT)
+ @enable_boost_unit_test_framework_TRUE@udev_rules_utr_DEPENDENCIES = \
+@@ -692,12 +696,14 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@grammar_formats_utr_LDADD = \
+ @enable_boost_unit_test_framework_TRUE@ $(LDADD) \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_FILESYSTEM_LIB) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ @enable_boost_unit_test_framework_TRUE@grammar_utr_LDADD = $(LDADD) \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_FILESYSTEM_LIB) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
+-@enable_boost_unit_test_framework_TRUE@setter_utr_LDADD = $(LDADD) ../../../connexions/libcnx-usb.la
+-@enable_boost_unit_test_framework_TRUE@grammar_mechanics_utr_LDADD = $(LDADD) ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
++@enable_boost_unit_test_framework_TRUE@setter_utr_LDADD = $(LDADD) ../../../connexions/libcnx-usb.la ../../../connexions/libcnx-hexdump.la
++@enable_boost_unit_test_framework_TRUE@grammar_mechanics_utr_LDADD = $(LDADD) ../../../connexions/libcnx-usb.la ../../../connexions/libcnx-hexdump.la
+ @enable_boost_unit_test_framework_TRUE@udev_rules_utr_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LIB) \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_FILESYSTEM_LIB) \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_REGEX_LIB)
+--- a/drivers/esci/tests/Makefile.in.orig2 2021-09-04 00:16:04.036515288 -0700
++++ b/drivers/esci/tests/Makefile.in 2021-09-04 00:34:42.479547250 -0700
+@@ -692,6 +692,8 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@ $(am__append_10)
+ @enable_boost_unit_test_framework_TRUE@LDADD = ../libdrv-esci.la \
+ @enable_boost_unit_test_framework_TRUE@ $(LIBUTSUSHI_LIBS) \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+ @enable_boost_unit_test_framework_TRUE@grammar_formats_utr_LDADD = \
+ @enable_boost_unit_test_framework_TRUE@ $(LDADD) \
diff --git a/srcpkgs/imagescan/patches/filters-get_text_orientation.patch b/srcpkgs/imagescan/patches/filters-get_text_orientation.patch
new file mode 100644
index 000000000000..155820ce5588
--- /dev/null
+++ b/srcpkgs/imagescan/patches/filters-get_text_orientation.patch
@@ -0,0 +1,31 @@
+--- a/filters/get-text-orientation.orig 2020-12-21 23:44:15.000000000 -0700
++++ b/filters/get-text-orientation 2021-09-03 22:11:53.401409017 -0700
+@@ -48,7 +48,8 @@ if test $? != 0; then
+ fi
+
+ tmpfile=$(mktemp -q .reorient.XXX)
+-trap "rm -f $tmpfile" 0 1 2 15
++tmpout=$(mktemp -q .reorient.XXX)
++trap "rm -f $tmpfile $tmpout.osd $tmpout.txt $tmpout" 0 1 2 15
+
+ case "$engine" in
+ */tesseract*|tesseract*)
+@@ -51,7 +51,7 @@ tmpfile=$(mktemp -q .reorient.XXX)
+ trap "rm -f $tmpfile" 0 1 2 15
+
+ case "$engine" in
+- */tesseract|tesseract)
++ */tesseract*|tesseract*)
+
+ # Notwithstanding what the manual page says, tesseract
+ # doesn't support reading from standard input with the
+@@ -66,7 +67,8 @@ case "$engine" in
+ # about ends up on standard error, but our caller looks
+ # for it on standard output. Redirect to handle that.
+
+- $engine $tmpfile /dev/null -psm 0 -l osd 2>&1
++ $engine $tmpfile $tmpout --psm 0 -l osd >/dev/null 2>/dev/null
++ cat $tmpout.osd
+ ;;
+
+ */ocr-engine-getrotate)
diff --git a/srcpkgs/imagescan/patches/filters-reorient_cpp.patch b/srcpkgs/imagescan/patches/filters-reorient_cpp.patch
new file mode 100644
index 000000000000..c0a4233782aa
--- /dev/null
+++ b/srcpkgs/imagescan/patches/filters-reorient_cpp.patch
@@ -0,0 +1,29 @@
+--- a/filters/reorient.cpp.orig 2020-12-21 23:44:16.000000000 -0700
++++ b/filters/reorient.cpp 2021-09-03 16:33:08.078102032 -0700
+@@ -96,7 +96,7 @@ chomp (char *str)
+ bool
+ tesseract_version_before_(const char *cutoff)
+ {
+- FILE *fp = popen ("tesseract --version 2>&1"
++ FILE *fp = popen ("tesseract-ocr --version 2>&1"
+ "| awk '/^tesseract/{ print $2 }'", "r");
+ int errc = errno;
+
+@@ -126,7 +126,7 @@ tesseract_version_before_(const char *cu
+ bool
+ have_tesseract_language_pack_(const char *lang)
+ {
+- std::string cmd("tesseract --list-langs 2>&1"
++ std::string cmd("tesseract-ocr --list-langs 2>&1"
+ "| sed -n '/^");
+ cmd += lang;
+ cmd += "$/p'";
+@@ -291,7 +291,7 @@ reorient::reorient ()
+
+ if (found)
+ {
+- if (have_tesseract_()) engine_ = "tesseract";
++ if (have_tesseract_()) engine_ = "tesseract-ocr";
+ if (have_ocr_engine_()) engine_ = abs_path_name;
+ }
+ freeze_options (); // initializes option tracking member variables
diff --git a/srcpkgs/imagescan/patches/filters-tests-makefile_am.patch b/srcpkgs/imagescan/patches/filters-tests-makefile_am.patch
new file mode 100644
index 000000000000..c49c792e898c
--- /dev/null
+++ b/srcpkgs/imagescan/patches/filters-tests-makefile_am.patch
@@ -0,0 +1,86 @@
+--- a/filters/tests/Makefile.in.orig 2020-12-21 23:45:00.000000000 -0700
++++ b/filters/tests/Makefile.in 2021-09-03 15:23:00.176666819 -0700
+@@ -188,6 +188,7 @@ am__DEPENDENCIES_1 =
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -200,6 +201,7 @@ jpeg_utr_OBJECTS = jpeg_utr-jpeg.$(OBJEX
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@@have_libmagic_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@jpeg_utr_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@@ -216,6 +218,7 @@ magick_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ padding_utr_SOURCES = padding.cpp
+ padding_utr_OBJECTS = padding.$(OBJEXT)
+@@ -225,6 +228,7 @@ padding_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ pdf_utr_SOURCES = pdf.cpp
+ pdf_utr_OBJECTS = pdf_utr-pdf.$(OBJEXT)
+@@ -242,6 +246,7 @@ pnm_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ reorient_utr_SOURCES = reorient.cpp
+ reorient_utr_OBJECTS = reorient.$(OBJEXT)
+@@ -251,6 +256,7 @@ reorient_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ shell_pipe_utr_SOURCES = shell-pipe.cpp
+ shell_pipe_utr_OBJECTS = shell-pipe.$(OBJEXT)
+@@ -260,6 +266,7 @@ shell_pipe_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ threshold_utr_SOURCES = threshold.cpp
+ threshold_utr_OBJECTS = threshold.$(OBJEXT)
+@@ -269,6 +276,7 @@ threshold_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -751,6 +759,7 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(LIBUTSUSHI_LIBS) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@jpeg_utr_CXXFLAGS = $(AM_CXXFLAGS) \
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@ $(LIBJPEG_CFLAGS) \
+--- a/filters/tests/Makefile.in.orig 2021-09-03 23:50:57.264964743 -0700
++++ b/filters/tests/Makefile.in 2021-09-03 23:53:56.426210579 -0700
+@@ -88,8 +88,7 @@ host_triplet = @host@
+ @enable_boost_unit_test_framework_TRUE@ image-skip.utr$(EXEEXT) \
+ @enable_boost_unit_test_framework_TRUE@ shell-pipe.utr$(EXEEXT) \
+ @enable_boost_unit_test_framework_TRUE@ $(am__EXEEXT_1) \
+-@enable_boost_unit_test_framework_TRUE@ $(am__EXEEXT_2) \
+-@enable_boost_unit_test_framework_TRUE@ reorient.utr$(EXEEXT)
++@enable_boost_unit_test_framework_TRUE@ $(am__EXEEXT_2)
+ @enable_boost_unit_test_framework_TRUE@@have_magick_TRUE@am__append_1 = magick.utr
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@am__append_2 = jpeg.utr \
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@ pdf.utr
diff --git a/srcpkgs/imagescan/patches/fix-iostream.patch b/srcpkgs/imagescan/patches/fix-iostream.patch
deleted file mode 100644
index 11ac322741df..000000000000
--- a/srcpkgs/imagescan/patches/fix-iostream.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/utsushi/string.hpp 2019-04-02 02:01:37.000000000 +0200
-+++ b/utsushi/string.hpp 2021-01-19 00:58:03.102000070 +0100
-@@ -23,6 +23,7 @@
-
- #include <iosfwd>
-+#include <iostream>
- #include <string>
-
- #include <boost/operators.hpp>
-
---- a/utsushi/toggle.hpp 2019-04-02 02:01:36.000000000 +0200
-+++ b/utsushi/toggle.hpp 2021-01-19 01:00:34.884821885 +0100
-@@ -22,6 +22,7 @@
- #define utsushi_toggle_hpp_
-
- #include <iosfwd>
-+#include <iostream>
- #include <boost/operators.hpp>
-
- namespace utsushi {
diff --git a/srcpkgs/imagescan/patches/lib-tests-makefile_am.patch b/srcpkgs/imagescan/patches/lib-tests-makefile_am.patch
new file mode 100644
index 000000000000..d0ff876b65da
--- /dev/null
+++ b/srcpkgs/imagescan/patches/lib-tests-makefile_am.patch
@@ -0,0 +1,170 @@
+--- a/lib/tests/Makefile.in.orig 2020-12-21 23:45:00.000000000 -0700
++++ b/lib/tests/Makefile.in 2021-09-03 15:10:58.763604642 -0700
+@@ -200,6 +200,7 @@ am__DEPENDENCIES_1 =
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -212,6 +213,7 @@ connexion_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ descriptor_utr_SOURCES = descriptor.cpp
+ descriptor_utr_OBJECTS = descriptor.$(OBJEXT)
+@@ -220,6 +222,7 @@ descriptor_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ device_utr_SOURCES = device.cpp
+ device_utr_OBJECTS = device.$(OBJEXT)
+@@ -228,6 +231,7 @@ device_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ file_utr_SOURCES = file.cpp
+ file_utr_OBJECTS = file.$(OBJEXT)
+@@ -236,6 +240,7 @@ file_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ ipc_cnx_SOURCES = ipc-cnx.cpp
+ ipc_cnx_OBJECTS = ipc-cnx.$(OBJEXT)
+@@ -244,6 +249,7 @@ ipc_cnx_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ am__log_checking_utr_SOURCES_DIST = log.cpp
+ @enable_boost_unit_test_framework_TRUE@am_log_checking_utr_OBJECTS = log_checking_utr-log.$(OBJEXT)
+@@ -253,6 +259,7 @@ log_checking_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ am__log_no_check_utr_SOURCES_DIST = log.cpp
+ @enable_boost_unit_test_framework_TRUE@am_log_no_check_utr_OBJECTS = log_no_check_utr-log.$(OBJEXT)
+@@ -262,6 +269,7 @@ log_no_check_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ memory_utr_SOURCES = memory.cpp
+ memory_utr_OBJECTS = memory.$(OBJEXT)
+@@ -270,6 +278,7 @@ memory_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ monitor_utr_SOURCES = monitor.cpp
+ monitor_utr_OBJECTS = monitor.$(OBJEXT)
+@@ -278,6 +287,7 @@ monitor_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ null_utr_SOURCES = null.cpp
+ null_utr_OBJECTS = null.$(OBJEXT)
+@@ -286,6 +296,7 @@ null_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ octet_utr_SOURCES = octet.cpp
+ octet_utr_OBJECTS = octet.$(OBJEXT)
+@@ -294,6 +305,7 @@ octet_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ option_utr_SOURCES = option.cpp
+ option_utr_OBJECTS = option.$(OBJEXT)
+@@ -302,6 +314,7 @@ option_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ quantity_utr_SOURCES = quantity.cpp
+ quantity_utr_OBJECTS = quantity.$(OBJEXT)
+@@ -310,6 +323,7 @@ quantity_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ run_time_utr_SOURCES = run-time.cpp
+ run_time_utr_OBJECTS = run-time.$(OBJEXT)
+@@ -318,6 +332,7 @@ run_time_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ scanner_utr_SOURCES = scanner.cpp
+ scanner_utr_OBJECTS = scanner.$(OBJEXT)
+@@ -326,6 +341,7 @@ scanner_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ stream_utr_SOURCES = stream.cpp
+ stream_utr_OBJECTS = stream.$(OBJEXT)
+@@ -334,6 +350,7 @@ stream_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ string_utr_SOURCES = string.cpp
+ string_utr_OBJECTS = string.$(OBJEXT)
+@@ -342,6 +359,7 @@ string_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ tiff_utr_SOURCES = tiff.cpp
+ tiff_utr_OBJECTS = tiff_utr-tiff.$(OBJEXT)
+@@ -349,6 +367,7 @@ tiff_utr_OBJECTS = tiff_utr-tiff.$(OBJEX
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ @enable_boost_unit_test_framework_TRUE@@have_libmagic_TRUE@@have_libtiff_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+ @enable_boost_unit_test_framework_TRUE@@have_libtiff_TRUE@tiff_utr_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@@ -364,6 +383,7 @@ value_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -872,6 +892,7 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@LDADD = ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(LIBUTSUSHI_LIBS) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+ @enable_boost_unit_test_framework_TRUE@@have_libtiff_TRUE@tiff_utr_CXXFLAGS = $(AM_CXXFLAGS) \
+ @enable_boost_unit_test_framework_TRUE@@have_libtiff_TRUE@ $(LIBTIFF_CFLAGS) \
diff --git a/srcpkgs/imagescan/patches/lib-tests-memory_cpp.patch b/srcpkgs/imagescan/patches/lib-tests-memory_cpp.patch
new file mode 100644
index 000000000000..902b95531333
--- /dev/null
+++ b/srcpkgs/imagescan/patches/lib-tests-memory_cpp.patch
@@ -0,0 +1,11 @@
+--- a/lib/tests/memory.cpp.orig 2020-12-21 23:44:15.000000000 -0700
++++ b/lib/tests/memory.cpp 2021-09-03 15:16:25.323531622 -0700
+@@ -145,7 +145,7 @@ constant_octets (octet value)
+ const streamsize margin = 10;
+ const octet nul = 0x00;
+ traits::assign (buffer, size, nul);
+- BOOST_MESSAGE ("value: " << value );
++ BOOST_TEST_MESSAGE ("value: " << value );
+
+ setmem_idevice dev (shared_ptr<setmem_idevice::generator>
+ (new const_generator (value)));
diff --git a/srcpkgs/imagescan/patches/sane-tests-Makefile_in.patch b/srcpkgs/imagescan/patches/sane-tests-Makefile_in.patch
new file mode 100644
index 000000000000..32c699d0e976
--- /dev/null
+++ b/srcpkgs/imagescan/patches/sane-tests-Makefile_in.patch
@@ -0,0 +1,26 @@
+--- a/sane/tests/Makefile.in.orig 2020-12-21 23:45:00.000000000 -0700
++++ b/sane/tests/Makefile.in 2021-09-04 00:42:29.756027426 -0700
+@@ -176,6 +176,7 @@ am__DEPENDENCIES_1 =
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../filters/libflt-all.la \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -188,6 +189,7 @@ value_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../filters/libflt-all.la \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -669,6 +671,7 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@ $(LIBUTSUSHI_LIBS) \
+ @enable_boost_unit_test_framework_TRUE@ ../../filters/libflt-all.la \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+ EXTRA_DIST = sane-api.ipp
+ CLEANFILES = $(am__append_7) $(am__append_9)
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index 0a0cb5e2b3f8..161d521d80c2 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,22 +1,22 @@
# Template file for 'imagescan'
pkgname=imagescan
-version=3.55.0
-revision=2
-wrksrc=utsushi-0.55.0
+version=3.65.0
+revision=1
+wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-gtkmm --enable-sane-config --with-sane-confdir=/etc/sane.d --enable-udev-config
--with-udev-confdir=/usr/lib/udev --with-jpeg --with-magick --with-sane --with-tiff"
conf_files="/etc/utsushi/combo.conf"
-hostmakedepends="ImageMagick pkg-config sane"
-makedepends="boost-devel eudev-libudev-devel gtkmm2-devel libusb-devel sane-devel"
-depends="ImageMagick"
+hostmakedepends="dejavu-fonts-ttf ImageMagick pkg-config sane tesseract-ocr tesseract-ocr-tools tesseract-ocr-eng"
+makedepends="boost-devel eudev-libudev-devel gtkmm2-devel pango-devel libusb-devel sane-devel"
+depends="ImageMagick tesseract-ocr"
short_desc="EPSON Image Scan v3 front-end and backend for scanners and all-in-ones"
maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/utsushi/imagescan/"
distfiles="http://support.epson.net/linux/src/scanner/imagescanv3/debian/${pkgname}_${version}.orig.tar.gz"
-checksum=9440b103b8218863ab08e891d2a9dc9ef52db51485e11017d52fb2036e279477
+checksum=e83704398c51a3166fd62c25b89e95cf6262e52f3dc6e627db3e7556e2220d64
mutable_files="/etc/sane.d/dll.d/utsushi"
CFLAGS="-Wno-error"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
2021-09-04 7:44 ` [PR PATCH] [Updated] " jbenden
@ 2021-09-04 20:25 ` jbenden
2021-09-04 21:29 ` jbenden
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-04 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]
There is an updated pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages imagescan-3.65.0
https://github.com/void-linux/void-packages/pull/32825
imagescan: update to 3.65.0.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### Additional Information
I purchased a new EPSON printer and could not get it to completely work (mostly scanning). So I underwent the process to upgrade the components (this PR). Afterwards all printer functionality is working (print, scan, etc.).
I want to point out it was NOT trivial to make the scanner functionality work. I'd recommend that a documentation page be added to cover the additional bits that I've placed in the `INSTALL.msg` file; unless you think it is sufficient. Please advise.
A patch file from https://github.com/void-linux/void-packages/pull/32825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imagescan-3.65.0-32825.patch --]
[-- Type: text/x-diff, Size: 34691 bytes --]
From 43906265e45a643ace05641e768206a0256d621a Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Fri, 3 Sep 2021 13:30:42 -0700
Subject: [PATCH] imagescan: update to 3.65.0.
Signed-off-by: Joseph Benden <joe@benden.us>
---
.../imagescan-plugin-networkscan/INSTALL.msg | 23 +++
srcpkgs/imagescan-plugin-networkscan/template | 16 +-
.../drivers-esci-tests-Makefile_in.patch | 67 +++++++
.../filters-get_text_orientation.patch | 31 ++++
.../patches/filters-reorient_cpp.patch | 29 +++
.../patches/filters-tests-makefile_am.patch | 86 +++++++++
srcpkgs/imagescan/patches/fix-iostream.patch | 20 ---
.../patches/lib-tests-makefile_am.patch | 170 ++++++++++++++++++
.../patches/lib-tests-memory_cpp.patch | 11 ++
.../patches/sane-tests-Makefile_in.patch | 26 +++
.../patches/sane-tests-backend_cpp.patch | 28 +++
srcpkgs/imagescan/template | 14 +-
12 files changed, 484 insertions(+), 37 deletions(-)
create mode 100644 srcpkgs/imagescan/patches/drivers-esci-tests-Makefile_in.patch
create mode 100644 srcpkgs/imagescan/patches/filters-get_text_orientation.patch
create mode 100644 srcpkgs/imagescan/patches/filters-reorient_cpp.patch
create mode 100644 srcpkgs/imagescan/patches/filters-tests-makefile_am.patch
delete mode 100644 srcpkgs/imagescan/patches/fix-iostream.patch
create mode 100644 srcpkgs/imagescan/patches/lib-tests-makefile_am.patch
create mode 100644 srcpkgs/imagescan/patches/lib-tests-memory_cpp.patch
create mode 100644 srcpkgs/imagescan/patches/sane-tests-Makefile_in.patch
create mode 100644 srcpkgs/imagescan/patches/sane-tests-backend_cpp.patch
diff --git a/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg b/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
index 56865d74a9ec..7a3147e7a253 100644
--- a/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
+++ b/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
@@ -1 +1,24 @@
Please read /usr/share/doc/imagescan-plugin-networkscan/README
+
+CRITICAL: The documentation all mention the use of:
+
+ /etc/imagescan/imagescan.conf
+
+But this is incorrect. The correct path is:
+
+ /etc/utsushi/utsushi.conf
+
+The discrepancy stems from the difference in use of software
+provided from EPSON(TM) verses the downstream open-source
+project.
+
+An example of a working configuration is:
+```
+[devices]
+
+net.udi = networkscan:esci://192.168.1.98:1865
+net.vendor = Epson
+net.model = ET-2760
+net.name = Epson Network Scanner
+```
+
diff --git a/srcpkgs/imagescan-plugin-networkscan/template b/srcpkgs/imagescan-plugin-networkscan/template
index b36c8c2c59d6..ea53672032ca 100644
--- a/srcpkgs/imagescan-plugin-networkscan/template
+++ b/srcpkgs/imagescan-plugin-networkscan/template
@@ -1,9 +1,9 @@
# Template file for 'imagescan-plugin-networkscan'
pkgname=imagescan-plugin-networkscan
-version=1.1.3
+version=1.1.4
revision=1
archs="i686 x86_64"
-_bversion=3.63.0
+_bversion=3.65.0
_dst=ubuntu
_rel=18.04
build_style=fetch
@@ -17,12 +17,12 @@ case "${XBPS_TARGET_MACHINE}" in
x86_64)
_type=x64
_arch=amd64
- _hash=318372a594fdff4d0f1d5dbe4d7d818036ee7f78edbb6d14ed1ad49b1c057c51
+ _hash=bbc171780e079ba65ef7817b3eb7bed419faa1b09080f6ac72cd3731bc3dc930
;;
i686)
_type=x86
_arch=i386
- _hash=412430d264fb3c3e80e5a22ecacec774b8a52d95b26db0930a17e4e58bd7e52c
+ _hash=aa7c67a8b6a513bb7f5d0fb952c8bd3cf7d2dfe7fe26c87b745d5f99f5187d49
;;
esac
@@ -36,12 +36,8 @@ do_extract() {
}
do_install() {
- vmkdir usr/share/licenses/imagescan-plugin-networkscan
- zcat usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.en.txt.gz \
- > ${DESTDIR}/usr/share/licenses/imagescan-plugin-networkscan/COPYING.EPSON.en.txt
- zcat usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.ja.txt.gz \
- > ${DESTDIR}/usr/share/licenses/imagescan-plugin-networkscan/COPYING.EPSON.ja.txt
-
+ vlicense usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.en.txt.gz
+ vlicense usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.ja.txt.gz
rm usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.en.txt.gz
rm usr/share/doc/imagescan-plugin-networkscan/COPYING.EPSON.ja.txt.gz
diff --git a/srcpkgs/imagescan/patches/drivers-esci-tests-Makefile_in.patch b/srcpkgs/imagescan/patches/drivers-esci-tests-Makefile_in.patch
new file mode 100644
index 000000000000..9162939b832d
--- /dev/null
+++ b/srcpkgs/imagescan/patches/drivers-esci-tests-Makefile_in.patch
@@ -0,0 +1,67 @@
+--- a/drivers/esci/tests/Makefile.in 2021-09-04 00:12:07.232127878 -0700
++++ b/drivers/esci/tests/Makefile.in.orig 2021-09-04 00:14:24.968647413 -0700
+@@ -183,7 +183,8 @@ am__DEPENDENCIES_1 =
+ @enable_boost_unit_test_framework_TRUE@grammar_formats_utr_DEPENDENCIES = \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_2) \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -192,18 +193,21 @@ grammar_mechanics_utr_SOURCES = grammar-
+ grammar_mechanics_utr_OBJECTS = grammar-mechanics.$(OBJEXT)
+ @enable_boost_unit_test_framework_TRUE@grammar_mechanics_utr_DEPENDENCIES = \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_2) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ grammar_utr_SOURCES = grammar.cpp
+ grammar_utr_OBJECTS = grammar.$(OBJEXT)
+ @enable_boost_unit_test_framework_TRUE@grammar_utr_DEPENDENCIES = \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_2) \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ setter_utr_SOURCES = setter.cpp
+ setter_utr_OBJECTS = setter.$(OBJEXT)
+ @enable_boost_unit_test_framework_TRUE@setter_utr_DEPENDENCIES = \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_2) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ udev_rules_utr_SOURCES = udev-rules.cpp
+ udev_rules_utr_OBJECTS = udev-rules.$(OBJEXT)
+ @enable_boost_unit_test_framework_TRUE@udev_rules_utr_DEPENDENCIES = \
+@@ -692,12 +696,14 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@grammar_formats_utr_LDADD = \
+ @enable_boost_unit_test_framework_TRUE@ $(LDADD) \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_FILESYSTEM_LIB) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
+ @enable_boost_unit_test_framework_TRUE@grammar_utr_LDADD = $(LDADD) \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_FILESYSTEM_LIB) \
+-@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la
+-@enable_boost_unit_test_framework_TRUE@setter_utr_LDADD = $(LDADD) ../../../connexions/libcnx-usb.la
+-@enable_boost_unit_test_framework_TRUE@grammar_mechanics_utr_LDADD = $(LDADD) ../../../connexions/libcnx-usb.la
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la
++@enable_boost_unit_test_framework_TRUE@setter_utr_LDADD = $(LDADD) ../../../connexions/libcnx-usb.la ../../../connexions/libcnx-hexdump.la
++@enable_boost_unit_test_framework_TRUE@grammar_mechanics_utr_LDADD = $(LDADD) ../../../connexions/libcnx-usb.la ../../../connexions/libcnx-hexdump.la
+ @enable_boost_unit_test_framework_TRUE@udev_rules_utr_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LIB) \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_FILESYSTEM_LIB) \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_REGEX_LIB)
+--- a/drivers/esci/tests/Makefile.in.orig2 2021-09-04 00:16:04.036515288 -0700
++++ b/drivers/esci/tests/Makefile.in 2021-09-04 00:34:42.479547250 -0700
+@@ -692,6 +692,8 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@ $(am__append_10)
+ @enable_boost_unit_test_framework_TRUE@LDADD = ../libdrv-esci.la \
+ @enable_boost_unit_test_framework_TRUE@ $(LIBUTSUSHI_LIBS) \
++@enable_boost_unit_test_framework_TRUE@ -Wl,--no-as-needed ../../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+ @enable_boost_unit_test_framework_TRUE@grammar_formats_utr_LDADD = \
+ @enable_boost_unit_test_framework_TRUE@ $(LDADD) \
diff --git a/srcpkgs/imagescan/patches/filters-get_text_orientation.patch b/srcpkgs/imagescan/patches/filters-get_text_orientation.patch
new file mode 100644
index 000000000000..155820ce5588
--- /dev/null
+++ b/srcpkgs/imagescan/patches/filters-get_text_orientation.patch
@@ -0,0 +1,31 @@
+--- a/filters/get-text-orientation.orig 2020-12-21 23:44:15.000000000 -0700
++++ b/filters/get-text-orientation 2021-09-03 22:11:53.401409017 -0700
+@@ -48,7 +48,8 @@ if test $? != 0; then
+ fi
+
+ tmpfile=$(mktemp -q .reorient.XXX)
+-trap "rm -f $tmpfile" 0 1 2 15
++tmpout=$(mktemp -q .reorient.XXX)
++trap "rm -f $tmpfile $tmpout.osd $tmpout.txt $tmpout" 0 1 2 15
+
+ case "$engine" in
+ */tesseract*|tesseract*)
+@@ -51,7 +51,7 @@ tmpfile=$(mktemp -q .reorient.XXX)
+ trap "rm -f $tmpfile" 0 1 2 15
+
+ case "$engine" in
+- */tesseract|tesseract)
++ */tesseract*|tesseract*)
+
+ # Notwithstanding what the manual page says, tesseract
+ # doesn't support reading from standard input with the
+@@ -66,7 +67,8 @@ case "$engine" in
+ # about ends up on standard error, but our caller looks
+ # for it on standard output. Redirect to handle that.
+
+- $engine $tmpfile /dev/null -psm 0 -l osd 2>&1
++ $engine $tmpfile $tmpout --psm 0 -l osd >/dev/null 2>/dev/null
++ cat $tmpout.osd
+ ;;
+
+ */ocr-engine-getrotate)
diff --git a/srcpkgs/imagescan/patches/filters-reorient_cpp.patch b/srcpkgs/imagescan/patches/filters-reorient_cpp.patch
new file mode 100644
index 000000000000..c0a4233782aa
--- /dev/null
+++ b/srcpkgs/imagescan/patches/filters-reorient_cpp.patch
@@ -0,0 +1,29 @@
+--- a/filters/reorient.cpp.orig 2020-12-21 23:44:16.000000000 -0700
++++ b/filters/reorient.cpp 2021-09-03 16:33:08.078102032 -0700
+@@ -96,7 +96,7 @@ chomp (char *str)
+ bool
+ tesseract_version_before_(const char *cutoff)
+ {
+- FILE *fp = popen ("tesseract --version 2>&1"
++ FILE *fp = popen ("tesseract-ocr --version 2>&1"
+ "| awk '/^tesseract/{ print $2 }'", "r");
+ int errc = errno;
+
+@@ -126,7 +126,7 @@ tesseract_version_before_(const char *cu
+ bool
+ have_tesseract_language_pack_(const char *lang)
+ {
+- std::string cmd("tesseract --list-langs 2>&1"
++ std::string cmd("tesseract-ocr --list-langs 2>&1"
+ "| sed -n '/^");
+ cmd += lang;
+ cmd += "$/p'";
+@@ -291,7 +291,7 @@ reorient::reorient ()
+
+ if (found)
+ {
+- if (have_tesseract_()) engine_ = "tesseract";
++ if (have_tesseract_()) engine_ = "tesseract-ocr";
+ if (have_ocr_engine_()) engine_ = abs_path_name;
+ }
+ freeze_options (); // initializes option tracking member variables
diff --git a/srcpkgs/imagescan/patches/filters-tests-makefile_am.patch b/srcpkgs/imagescan/patches/filters-tests-makefile_am.patch
new file mode 100644
index 000000000000..c49c792e898c
--- /dev/null
+++ b/srcpkgs/imagescan/patches/filters-tests-makefile_am.patch
@@ -0,0 +1,86 @@
+--- a/filters/tests/Makefile.in.orig 2020-12-21 23:45:00.000000000 -0700
++++ b/filters/tests/Makefile.in 2021-09-03 15:23:00.176666819 -0700
+@@ -188,6 +188,7 @@ am__DEPENDENCIES_1 =
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -200,6 +201,7 @@ jpeg_utr_OBJECTS = jpeg_utr-jpeg.$(OBJEX
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@@have_libmagic_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@jpeg_utr_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@@ -216,6 +218,7 @@ magick_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ padding_utr_SOURCES = padding.cpp
+ padding_utr_OBJECTS = padding.$(OBJEXT)
+@@ -225,6 +228,7 @@ padding_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ pdf_utr_SOURCES = pdf.cpp
+ pdf_utr_OBJECTS = pdf_utr-pdf.$(OBJEXT)
+@@ -242,6 +246,7 @@ pnm_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ reorient_utr_SOURCES = reorient.cpp
+ reorient_utr_OBJECTS = reorient.$(OBJEXT)
+@@ -251,6 +256,7 @@ reorient_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ shell_pipe_utr_SOURCES = shell-pipe.cpp
+ shell_pipe_utr_OBJECTS = shell-pipe.$(OBJEXT)
+@@ -260,6 +266,7 @@ shell_pipe_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ threshold_utr_SOURCES = threshold.cpp
+ threshold_utr_OBJECTS = threshold.$(OBJEXT)
+@@ -269,6 +276,7 @@ threshold_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -751,6 +759,7 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@ ../../lib/libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(LIBUTSUSHI_LIBS) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@jpeg_utr_CXXFLAGS = $(AM_CXXFLAGS) \
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@ $(LIBJPEG_CFLAGS) \
+--- a/filters/tests/Makefile.in.orig 2021-09-03 23:50:57.264964743 -0700
++++ b/filters/tests/Makefile.in 2021-09-03 23:53:56.426210579 -0700
+@@ -88,8 +88,7 @@ host_triplet = @host@
+ @enable_boost_unit_test_framework_TRUE@ image-skip.utr$(EXEEXT) \
+ @enable_boost_unit_test_framework_TRUE@ shell-pipe.utr$(EXEEXT) \
+ @enable_boost_unit_test_framework_TRUE@ $(am__EXEEXT_1) \
+-@enable_boost_unit_test_framework_TRUE@ $(am__EXEEXT_2) \
+-@enable_boost_unit_test_framework_TRUE@ reorient.utr$(EXEEXT)
++@enable_boost_unit_test_framework_TRUE@ $(am__EXEEXT_2)
+ @enable_boost_unit_test_framework_TRUE@@have_magick_TRUE@am__append_1 = magick.utr
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@am__append_2 = jpeg.utr \
+ @enable_boost_unit_test_framework_TRUE@@have_libjpeg_TRUE@ pdf.utr
diff --git a/srcpkgs/imagescan/patches/fix-iostream.patch b/srcpkgs/imagescan/patches/fix-iostream.patch
deleted file mode 100644
index 11ac322741df..000000000000
--- a/srcpkgs/imagescan/patches/fix-iostream.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/utsushi/string.hpp 2019-04-02 02:01:37.000000000 +0200
-+++ b/utsushi/string.hpp 2021-01-19 00:58:03.102000070 +0100
-@@ -23,6 +23,7 @@
-
- #include <iosfwd>
-+#include <iostream>
- #include <string>
-
- #include <boost/operators.hpp>
-
---- a/utsushi/toggle.hpp 2019-04-02 02:01:36.000000000 +0200
-+++ b/utsushi/toggle.hpp 2021-01-19 01:00:34.884821885 +0100
-@@ -22,6 +22,7 @@
- #define utsushi_toggle_hpp_
-
- #include <iosfwd>
-+#include <iostream>
- #include <boost/operators.hpp>
-
- namespace utsushi {
diff --git a/srcpkgs/imagescan/patches/lib-tests-makefile_am.patch b/srcpkgs/imagescan/patches/lib-tests-makefile_am.patch
new file mode 100644
index 000000000000..d0ff876b65da
--- /dev/null
+++ b/srcpkgs/imagescan/patches/lib-tests-makefile_am.patch
@@ -0,0 +1,170 @@
+--- a/lib/tests/Makefile.in.orig 2020-12-21 23:45:00.000000000 -0700
++++ b/lib/tests/Makefile.in 2021-09-03 15:10:58.763604642 -0700
+@@ -200,6 +200,7 @@ am__DEPENDENCIES_1 =
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -212,6 +213,7 @@ connexion_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ descriptor_utr_SOURCES = descriptor.cpp
+ descriptor_utr_OBJECTS = descriptor.$(OBJEXT)
+@@ -220,6 +222,7 @@ descriptor_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ device_utr_SOURCES = device.cpp
+ device_utr_OBJECTS = device.$(OBJEXT)
+@@ -228,6 +231,7 @@ device_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ file_utr_SOURCES = file.cpp
+ file_utr_OBJECTS = file.$(OBJEXT)
+@@ -236,6 +240,7 @@ file_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ ipc_cnx_SOURCES = ipc-cnx.cpp
+ ipc_cnx_OBJECTS = ipc-cnx.$(OBJEXT)
+@@ -244,6 +249,7 @@ ipc_cnx_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ am__log_checking_utr_SOURCES_DIST = log.cpp
+ @enable_boost_unit_test_framework_TRUE@am_log_checking_utr_OBJECTS = log_checking_utr-log.$(OBJEXT)
+@@ -253,6 +259,7 @@ log_checking_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ am__log_no_check_utr_SOURCES_DIST = log.cpp
+ @enable_boost_unit_test_framework_TRUE@am_log_no_check_utr_OBJECTS = log_no_check_utr-log.$(OBJEXT)
+@@ -262,6 +269,7 @@ log_no_check_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ memory_utr_SOURCES = memory.cpp
+ memory_utr_OBJECTS = memory.$(OBJEXT)
+@@ -270,6 +278,7 @@ memory_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ monitor_utr_SOURCES = monitor.cpp
+ monitor_utr_OBJECTS = monitor.$(OBJEXT)
+@@ -278,6 +287,7 @@ monitor_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ null_utr_SOURCES = null.cpp
+ null_utr_OBJECTS = null.$(OBJEXT)
+@@ -286,6 +296,7 @@ null_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ octet_utr_SOURCES = octet.cpp
+ octet_utr_OBJECTS = octet.$(OBJEXT)
+@@ -294,6 +305,7 @@ octet_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ option_utr_SOURCES = option.cpp
+ option_utr_OBJECTS = option.$(OBJEXT)
+@@ -302,6 +314,7 @@ option_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ quantity_utr_SOURCES = quantity.cpp
+ quantity_utr_OBJECTS = quantity.$(OBJEXT)
+@@ -310,6 +323,7 @@ quantity_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ run_time_utr_SOURCES = run-time.cpp
+ run_time_utr_OBJECTS = run-time.$(OBJEXT)
+@@ -318,6 +332,7 @@ run_time_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ scanner_utr_SOURCES = scanner.cpp
+ scanner_utr_OBJECTS = scanner.$(OBJEXT)
+@@ -326,6 +341,7 @@ scanner_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ stream_utr_SOURCES = stream.cpp
+ stream_utr_OBJECTS = stream.$(OBJEXT)
+@@ -334,6 +350,7 @@ stream_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ string_utr_SOURCES = string.cpp
+ string_utr_OBJECTS = string.$(OBJEXT)
+@@ -342,6 +359,7 @@ string_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ tiff_utr_SOURCES = tiff.cpp
+ tiff_utr_OBJECTS = tiff_utr-tiff.$(OBJEXT)
+@@ -349,6 +367,7 @@ tiff_utr_OBJECTS = tiff_utr-tiff.$(OBJEX
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ @enable_boost_unit_test_framework_TRUE@@have_libmagic_TRUE@@have_libtiff_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+ @enable_boost_unit_test_framework_TRUE@@have_libtiff_TRUE@tiff_utr_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@@ -364,6 +383,7 @@ value_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -872,6 +892,7 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@LDADD = ../libutsushi.la \
+ @enable_boost_unit_test_framework_TRUE@ $(LIBUTSUSHI_LIBS) \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+ @enable_boost_unit_test_framework_TRUE@@have_libtiff_TRUE@tiff_utr_CXXFLAGS = $(AM_CXXFLAGS) \
+ @enable_boost_unit_test_framework_TRUE@@have_libtiff_TRUE@ $(LIBTIFF_CFLAGS) \
diff --git a/srcpkgs/imagescan/patches/lib-tests-memory_cpp.patch b/srcpkgs/imagescan/patches/lib-tests-memory_cpp.patch
new file mode 100644
index 000000000000..902b95531333
--- /dev/null
+++ b/srcpkgs/imagescan/patches/lib-tests-memory_cpp.patch
@@ -0,0 +1,11 @@
+--- a/lib/tests/memory.cpp.orig 2020-12-21 23:44:15.000000000 -0700
++++ b/lib/tests/memory.cpp 2021-09-03 15:16:25.323531622 -0700
+@@ -145,7 +145,7 @@ constant_octets (octet value)
+ const streamsize margin = 10;
+ const octet nul = 0x00;
+ traits::assign (buffer, size, nul);
+- BOOST_MESSAGE ("value: " << value );
++ BOOST_TEST_MESSAGE ("value: " << value );
+
+ setmem_idevice dev (shared_ptr<setmem_idevice::generator>
+ (new const_generator (value)));
diff --git a/srcpkgs/imagescan/patches/sane-tests-Makefile_in.patch b/srcpkgs/imagescan/patches/sane-tests-Makefile_in.patch
new file mode 100644
index 000000000000..32c699d0e976
--- /dev/null
+++ b/srcpkgs/imagescan/patches/sane-tests-Makefile_in.patch
@@ -0,0 +1,26 @@
+--- a/sane/tests/Makefile.in.orig 2020-12-21 23:45:00.000000000 -0700
++++ b/sane/tests/Makefile.in 2021-09-04 00:42:29.756027426 -0700
+@@ -176,6 +176,7 @@ am__DEPENDENCIES_1 =
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../filters/libflt-all.la \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -188,6 +189,7 @@ value_utr_LDADD = $(LDADD)
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1) \
+ @enable_boost_unit_test_framework_TRUE@ ../../filters/libflt-all.la \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -669,6 +671,7 @@ top_srcdir = @top_srcdir@
+ @enable_boost_unit_test_framework_TRUE@ $(LIBUTSUSHI_LIBS) \
+ @enable_boost_unit_test_framework_TRUE@ ../../filters/libflt-all.la \
+ @enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-usb.la \
++@enable_boost_unit_test_framework_TRUE@ ../../connexions/libcnx-hexdump.la \
+ @enable_boost_unit_test_framework_TRUE@ $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+ EXTRA_DIST = sane-api.ipp
+ CLEANFILES = $(am__append_7) $(am__append_9)
diff --git a/srcpkgs/imagescan/patches/sane-tests-backend_cpp.patch b/srcpkgs/imagescan/patches/sane-tests-backend_cpp.patch
new file mode 100644
index 000000000000..f56bd465f3e5
--- /dev/null
+++ b/srcpkgs/imagescan/patches/sane-tests-backend_cpp.patch
@@ -0,0 +1,28 @@
+--- a/sane/tests/backend.cpp.orig 2020-12-21 23:44:15.000000000 -0700
++++ b/sane/tests/backend.cpp 2021-09-04 13:19:28.313713508 -0700
+@@ -26,6 +26,7 @@
+ #include <cstring>
+
+ #include <boost/test/unit_test.hpp>
++#include <boost/test/included/unit_test.hpp>
+ #include <boost/preprocessor/cat.hpp>
+
+ #include <ltdl.h>
+@@ -755,7 +756,7 @@ drop_test_suite (const std::string& name
+ but::traverse_test_tree (tuid, tcc);
+
+ master.remove (tuid);
+- BOOST_MESSAGE ("Disabled \"" << name << "\" test suite for lack of "
++ BOOST_TEST_MESSAGE ("Disabled \"" << name << "\" test suite for lack of "
+ "a mock device (" << tcc.p_count << " test cases)");
+ }
+
+@@ -766,7 +767,7 @@ init_test_runner ()
+
+ but::master_test_suite_t& master (but::framework::master_test_suite ());
+
+- BOOST_MESSAGE ("Initializing \"" << master.p_name << "\" test suite");
++ BOOST_TEST_MESSAGE ("Initializing \"" << master.p_name << "\" test suite");
+
+ utsushi::monitor mon; // to discover devices
+
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index 0a0cb5e2b3f8..161d521d80c2 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,22 +1,22 @@
# Template file for 'imagescan'
pkgname=imagescan
-version=3.55.0
-revision=2
-wrksrc=utsushi-0.55.0
+version=3.65.0
+revision=1
+wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-gtkmm --enable-sane-config --with-sane-confdir=/etc/sane.d --enable-udev-config
--with-udev-confdir=/usr/lib/udev --with-jpeg --with-magick --with-sane --with-tiff"
conf_files="/etc/utsushi/combo.conf"
-hostmakedepends="ImageMagick pkg-config sane"
-makedepends="boost-devel eudev-libudev-devel gtkmm2-devel libusb-devel sane-devel"
-depends="ImageMagick"
+hostmakedepends="dejavu-fonts-ttf ImageMagick pkg-config sane tesseract-ocr tesseract-ocr-tools tesseract-ocr-eng"
+makedepends="boost-devel eudev-libudev-devel gtkmm2-devel pango-devel libusb-devel sane-devel"
+depends="ImageMagick tesseract-ocr"
short_desc="EPSON Image Scan v3 front-end and backend for scanners and all-in-ones"
maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/utsushi/imagescan/"
distfiles="http://support.epson.net/linux/src/scanner/imagescanv3/debian/${pkgname}_${version}.orig.tar.gz"
-checksum=9440b103b8218863ab08e891d2a9dc9ef52db51485e11017d52fb2036e279477
+checksum=e83704398c51a3166fd62c25b89e95cf6262e52f3dc6e627db3e7556e2220d64
mutable_files="/etc/sane.d/dll.d/utsushi"
CFLAGS="-Wno-error"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
2021-09-04 7:44 ` [PR PATCH] [Updated] " jbenden
2021-09-04 20:25 ` jbenden
@ 2021-09-04 21:29 ` jbenden
2021-09-04 21:30 ` jbenden
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-04 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913043643
Comment:
I really do not have a simple route to fix the i686 test failure. Is this a huge problem that prevents a merge?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (2 preceding siblings ...)
2021-09-04 21:29 ` jbenden
@ 2021-09-04 21:30 ` jbenden
2021-09-05 18:43 ` [PR REVIEW] " ericonr
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-04 21:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913043742
Comment:
The recent changes also fix and now have working OCR when scanning...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (3 preceding siblings ...)
2021-09-04 21:30 ` jbenden
@ 2021-09-05 18:43 ` ericonr
2021-09-05 18:43 ` ericonr
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-09-05 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#discussion_r702461722
Comment:
IMO we should try to patch the documentation instead of adding a warning for it. And I'm against increasing the size of `INSTALL.msg`, we don't want this printed for every update.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (4 preceding siblings ...)
2021-09-05 18:43 ` [PR REVIEW] " ericonr
@ 2021-09-05 18:43 ` ericonr
2021-09-05 18:51 ` jbenden
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-09-05 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913204980
Comment:
Also i686 failures are probably because of floating point behavior and can be left as is, IMO.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (5 preceding siblings ...)
2021-09-05 18:43 ` ericonr
@ 2021-09-05 18:51 ` jbenden
2021-09-05 18:53 ` [PR REVIEW] " jbenden
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-05 18:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913205975
Comment:
Many of the fixes are present in the upstream repository, but not all. I started installing a 32-bit void VM a bit ago, to run through repairing that test-case. I figured no one would look at the PR until all is green. :)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (6 preceding siblings ...)
2021-09-05 18:51 ` jbenden
@ 2021-09-05 18:53 ` jbenden
2021-09-05 18:54 ` ahesford
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-05 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New review comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#discussion_r702462957
Comment:
Ok, I'll remove the notes and figure out how to PR against docs...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (7 preceding siblings ...)
2021-09-05 18:53 ` [PR REVIEW] " jbenden
@ 2021-09-05 18:54 ` ahesford
2021-09-05 19:01 ` jbenden
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2021-09-05 18:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913206369
Comment:
Welp, didn't think to check before I bumped `imagescan` on my own. I'm in the same boat as you; I just bought an Epson all-in-one printer today and wanted to get scanning working on Void.
In general I agree with @ericonr that these patches are too extensive to support in Void without pushing them upstream. Also, the `tesseract-ocr` dependency really ought to be optional, and if it requires build-time support, then it probably ought to be a non-default option.
I also agree that an `INSTALL.msg` isn't desirable to fix documentation issues. I was able to get my network scanner working in this fashion with a quick web search, so I don't think it merits special attention here. Patching the configuration path in any documentation we ship would be OK, but since our `imagescan` only ships a single `conf_file` at `/etc/utsushi/utsushi.conf`, it's not difficult to make the leap.
Because our `imagescan` is not at `3.65.0` and your changes there amount to modifying some default configuration and dependency options that merit discussion, please move the `imagescan-plugin-networkscan` changes to a separate PR.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (8 preceding siblings ...)
2021-09-05 18:54 ` ahesford
@ 2021-09-05 19:01 ` jbenden
2021-09-05 19:03 ` jbenden
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-05 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913207132
Comment:
@ahesford Oh, you patch the version already?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (9 preceding siblings ...)
2021-09-05 19:01 ` jbenden
@ 2021-09-05 19:03 ` jbenden
2021-09-05 19:03 ` [PR PATCH] [Closed]: " jbenden
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-05 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913207439
Comment:
@ahesford nvm, I see you did.
Screw it, I'll locally maintain these changes.
Thanks!
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Closed]: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (10 preceding siblings ...)
2021-09-05 19:03 ` jbenden
@ 2021-09-05 19:03 ` jbenden
2021-09-05 20:00 ` ahesford
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-05 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
There's a closed pull request on the void-packages repository
imagescan: update to 3.65.0.
https://github.com/void-linux/void-packages/pull/32825
Description:
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### Additional Information
I purchased a new EPSON printer and could not get it to completely work (mostly scanning). So I underwent the process to upgrade the components (this PR). Afterwards all printer functionality is working (print, scan, etc.). Further revisions brought working OCR.
I want to point out it was NOT trivial to make the scanner functionality work. I'd recommend that a documentation page be added to cover the additional bits that I've placed in the `INSTALL.msg` file; unless you think it is sufficient. Please advise.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (11 preceding siblings ...)
2021-09-05 19:03 ` [PR PATCH] [Closed]: " jbenden
@ 2021-09-05 20:00 ` ahesford
2021-09-05 20:10 ` jbenden
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2021-09-05 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913218667
Comment:
FYI, I just discovered our `sane-airscan` package, and it works flawlessly with my Epson all-in-one without `imagescan` and `imagescan-plugin-networkscan`. You might want to give it a look; I'm curious whether it will work with your OCR flow.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (12 preceding siblings ...)
2021-09-05 20:00 ` ahesford
@ 2021-09-05 20:10 ` jbenden
2021-09-05 20:15 ` ahesford
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-05 20:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913220305
Comment:
Thanks for the reference. That's only a SANE driver for mimic of Apple's protocol. Performing all printer functionality would then need replaced with other tools. Which I'm sure can be done! But I've spent enough time on the darn thing! Thanks again, though! -Joe
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (13 preceding siblings ...)
2021-09-05 20:10 ` jbenden
@ 2021-09-05 20:15 ` ahesford
2021-09-05 21:32 ` jbenden
2021-09-05 21:34 ` jbenden
16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2021-09-05 20:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913220846
Comment:
Yes, but I've been able to print with CUPS using the "driverless" IPP Everywhere setup without anything extra. My needs are pretty basic; double-sided printing and the ability to scan from the flatbed or document feeder are all I demand.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (14 preceding siblings ...)
2021-09-05 20:15 ` ahesford
@ 2021-09-05 21:32 ` jbenden
2021-09-05 21:34 ` jbenden
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-05 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913231058
Comment:
That's excellent! Thanks!
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: imagescan: update to 3.65.0.
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
` (15 preceding siblings ...)
2021-09-05 21:32 ` jbenden
@ 2021-09-05 21:34 ` jbenden
16 siblings, 0 replies; 18+ messages in thread
From: jbenden @ 2021-09-05 21:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/32825#issuecomment-913231268
Comment:
Maybe deprecate this package and/or add a note somewhere?
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2021-09-05 21:34 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-03 20:54 [PR PATCH] imagescan: update to 3.65.0 jbenden
2021-09-04 7:44 ` [PR PATCH] [Updated] " jbenden
2021-09-04 20:25 ` jbenden
2021-09-04 21:29 ` jbenden
2021-09-04 21:30 ` jbenden
2021-09-05 18:43 ` [PR REVIEW] " ericonr
2021-09-05 18:43 ` ericonr
2021-09-05 18:51 ` jbenden
2021-09-05 18:53 ` [PR REVIEW] " jbenden
2021-09-05 18:54 ` ahesford
2021-09-05 19:01 ` jbenden
2021-09-05 19:03 ` jbenden
2021-09-05 19:03 ` [PR PATCH] [Closed]: " jbenden
2021-09-05 20:00 ` ahesford
2021-09-05 20:10 ` jbenden
2021-09-05 20:15 ` ahesford
2021-09-05 21:32 ` jbenden
2021-09-05 21:34 ` jbenden
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).