git.iko.soy/typeable/nixpkgs
on master help sign in
utsushi: init at 3.57.0 (#65223)
commit757ac88383eafdce101b892f8177bb34cc93b80b authorsymphorien <symphorien@users.noreply.github.com> dateWed 14 Aug 2019, 08:37 (7 years ago) parent90f6578
6 files changed+396
pkgs/misc/drivers/utsushi/default.nix+154 pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch+166 pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch+56 pkgs/misc/drivers/utsushi/patches/print-errors.patch+15 pkgs/misc/drivers/utsushi/patches/series+3 pkgs/top-level/all-packages.nix+2
pkgs/misc/drivers/utsushi/default.nixnew file+154
@@ -0,0 +1,154 @@
1+{ stdenv, fetchurl, autoreconfHook, boost, gtkmm2
2+, pkg-config, libtool, udev, libjpeg, file, texlive
3+, libusb, libtiff, imagemagick, sane-backends, tesseract }:
4+
5+/*
6+Alternatively, this package could use the "community source" at
7+https://gitlab.com/utsushi/utsushi/
8+Epson provides proprietary plugins for networking, ocr and some more
9+scanner models. Those are not (yet ?) packaged here.
10+*/
11+
12+stdenv.mkDerivation rec {
13+ pname = "utsushi";
14+ version = "3.57.0";
15+
16+ src = fetchurl {
17+ url = "http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${version}.orig.tar.gz";
18+ sha256 = "0qy6n6nbisbvy0q3idj7hpmj9i85cd0a18klfd8nsqsa2nkg57ny";
19+ };
20+
21+ nativeBuildInputs = [
22+ pkg-config
23+ autoreconfHook
24+ libtool
25+ ];
26+
27+ buildInputs = [
28+ boost
29+ libusb
30+ libtiff
31+ libjpeg
32+ udev
33+ imagemagick
34+ sane-backends
35+ gtkmm2
36+ file
37+ tesseract
38+ ];
39+
40+ patches = [
41+ ./patches/absolute-path-to-convert.patch
42+ ./patches/print-errors.patch
43+ ./patches/absolute_path_for_tesseract.patch
44+ ];
45+
46+ postPatch = ''
47+ # remove vendored dependencies
48+ rm -r upstream/boost
49+ # create fake udev and sane config
50+ mkdir -p $out/etc/{sane.d,udev/rules.d}
51+ touch $out/etc/sane.d/dll.conf
52+ '';
53+
54+ configureFlags = [
55+ "--with-boost-libdir=${boost}/lib"
56+ "--with-sane-confdir=${placeholder "out"}/etc/sane.d"
57+ "--with-udev-confdir=${placeholder "out"}/etc/udev"
58+ "--with-sane"
59+ "--with-gtkmm"
60+ "--with-jpeg"
61+ "--with-magick"
62+ "--with-sane"
63+ "--with-tiff"
64+ ];
65+
66+ installFlags = [ "SANE_BACKENDDIR=${placeholder "out"}/lib/sane" ];
67+
68+ enableParallelBuilding = true;
69+
70+ meta = {
71+ description = "SANE utsushi backend for some Epson scanners";
72+ longDescription = ''
73+ ImageScanV3 (aka utsushi) scanner driver.
74+ Non-free plugins are not included so no network support.
75+ To use the SANE backend, in /etc/nixos/configuration.nix:
76+
77+ hardware.sane = {
78+ enable = true;
79+ extraBackends = [ pkgs.utsushi ];
80+ };
81+ services.udev.packages = [ pkgs.utsushi ];
82+
83+ Supported hardware:
84+ - DS-40
85+ - DS-70
86+ - DS-80W
87+ - DS-410
88+ - DS-510
89+ - DS-520
90+ - DS-530
91+ - DS-535
92+ - DS-535H
93+ - DS-560
94+ - DS-575W
95+ - DS-760
96+ - DS-775
97+ - DS-780N
98+ - DS-860
99+ - DS-1630
100+ - DS-5500
101+ - DS-6500
102+ - DS-7500
103+ - DS-50000
104+ - DS-60000
105+ - DS-70000
106+ - EP-10VA Series
107+ - EP-808A Series
108+ - EP-978A3 Series
109+ - ES-50
110+ - ES-55R
111+ - ES-60W
112+ - ES-65WR
113+ - ES-300WR
114+ - ES-400
115+ - ES-500WR
116+ - ES-8500
117+ - ET-2500 Series
118+ - ET-2550 Series
119+ - ET-4500 Series
120+ - ET-4550 Series
121+ - Expression 1640XL
122+ - FF-680W
123+ - L220/L360 Series
124+ - L365/L366 Series
125+ - L380 Series
126+ - L455 Series
127+ - L565/L566 Series
128+ - L655 Series
129+ - PX-M840FX
130+ - PX-M860F
131+ - PX-M884F
132+ - PX-M7050 Series
133+ - PX-M7050FX Series
134+ - WF-4720
135+ - WF-6530 Series
136+ - WF-6590 Series
137+ - WF-8510/8590 Series
138+ - WF-R8590 Series
139+ - XP-220 Series
140+ - XP-230 Series
141+ - XP-235 Series
142+ - XP-332 335 Series
143+ - XP-430 Series
144+ - XP-432 435 Series
145+ - XP-530 Series
146+ - XP-540
147+ - XP-630 Series
148+ - XP-640
149+ - XP-830 Series
150+ - XP-960 Series
151+ '';
152+ license = stdenv.lib.licenses.gpl3Plus;
153+ };
154+}
pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patchnew file+166
@@ -0,0 +1,166 @@
1+Index: utsushi-0.57.0/configure.ac
2+===================================================================
3+--- utsushi-0.57.0.orig/configure.ac
4++++ utsushi-0.57.0/configure.ac
5+@@ -221,6 +221,9 @@ AS_IF([test xno != x$enable_code_coverag
6+ [AC_MSG_ERROR([code coverage support requires a GNU C/C++ compiler])])
7+ ])
8+ AM_PROG_AR
9++AC_PATH_PROG([AWK],[awk])
10++AC_DEFINE_UNQUOTED([AWK], ["$AWK"],
11++ [Path to awk.])
12+
13+ PKG_PROG_PKG_CONFIG
14+
15+@@ -379,27 +382,31 @@ AM_CONDITIONAL([have_libmagick_pp], [tes
16+ AS_IF([test xno != "x$with_magick"],
17+ AS_CASE("x$with_magick",
18+ [xGraphicsMagick],
19+- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm])
20+- AS_IF([test xgm != x$MAGICK_CONVERT],
21++ [[AC_PATH_PROG(MAGICK_CONVERT, gm)]
22++ AS_IF([test x == x$MAGICK_CONVERT],
23+ [AC_MSG_ERROR([$with_magick requested but not found])])
24+ AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1])
25+- MAGICK_CONVERT="gm convert"
26++ HAVE_MAGICK=1
27++ MAGICK_CONVERT="$MAGICK_CONVERT convert"
28+ ],
29+ [xImageMagick],
30+- [AC_CHECK_PROGS([MAGICK_CONVERT], [convert])
31+- AS_IF([test xconvert != x$MAGICK_CONVERT],
32++ [[AC_PATH_PROG(MAGICK_CONVERT, convert)]
33++ AS_IF([test x == x$MAGICK_CONVERT],
34+ [AC_MSG_ERROR([$with_magick requested but not found])])
35+ AC_DEFINE([HAVE_IMAGE_MAGICK], [1])
36++ HAVE_MAGICK=1
37+ ],
38+ [xyes|xcheck],
39+- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm convert])
40++ [[AC_PATH_PROGS([MAGICK_CONVERT], [gm convert])]
41+ AS_CASE(x$MAGICK_CONVERT,
42+- [xgm],
43++ [x*gm],
44+ [AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1])
45+- MAGICK_CONVERT="gm convert"
46++ HAVE_MAGICK=1
47++ MAGICK_CONVERT="$MAGICK_CONVERT convert"
48+ ],
49+- [xconvert],
50++ [x*convert],
51+ [AC_DEFINE([HAVE_IMAGE_MAGICK], [1])
52++ HAVE_MAGICK=1
53+ ],
54+ [dnl default case
55+ AS_IF([test xcheck != "x$with_magick"],
56+@@ -410,7 +417,7 @@ AS_IF([test xno != "x$with_magick"],
57+ AC_MSG_ERROR([unknown value: --with-magick=$with_magick])
58+ ]))
59+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
60+-AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"])
61++AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"])
62+
63+ AS_IF([test xno != "x$with_gtkmm"],
64+ [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20],
65+Index: utsushi-0.57.0/filters/magick.cpp
66+===================================================================
67+--- utsushi-0.57.0.orig/filters/magick.cpp
68++++ utsushi-0.57.0/filters/magick.cpp
69+@@ -81,19 +81,18 @@ chomp (char *str)
70+ }
71+
72+ bool
73+-magick_version_before_(const char *magick, const char *cutoff)
74++magick_version_before_(const char *cutoff)
75+ {
76+ FILE *fp = NULL;
77+ int errc = 0;
78+
79+- if (0 == strcmp ("GraphicsMagick", magick))
80+- fp = popen ("gm convert -version"
81+- "| awk '/^GraphicsMagick/{print $2}'", "r");
82+- if (fp) errc = errno;
83+-
84+- if (0 == strcmp ("ImageMagick", magick))
85+- fp = popen ("convert -version"
86+- "| awk '/^Version:/{print $3}'", "r");
87++#if HAVE_GRAPHICS_MAGICK
88++ fp = popen (MAGICK_CONVERT " -version"
89++ "| " AWK " '/^GraphicsMagick/{print $2}'", "r");
90++#elif HAVE_IMAGE_MAGICK
91++ fp = popen (MAGICK_CONVERT " -version"
92++ "| " AWK " '/^Version:/{print $3}'", "r");
93++#endif
94+ if (fp) errc = errno;
95+
96+ if (fp)
97+@@ -106,42 +105,32 @@ magick_version_before_(const char *magic
98+
99+ if (version)
100+ {
101+- log::debug ("found %1%-%2%") % magick % version;
102++ log::debug ("found " MAGICK_CONVERT "version %1%") % version;
103+ return (0 > strverscmp (version, cutoff));
104+ }
105+ }
106+
107+ if (errc)
108+- log::alert ("failure checking %1% version: %2%")
109+- % magick
110++ log::alert ("failure checking " MAGICK_CONVERT " version: %1%")
111+ % strerror (errc);
112+
113+ return false;
114+ }
115+
116+ bool
117+-graphics_magick_version_before_(const char *cutoff)
118+-{
119+- return magick_version_before_("GraphicsMagick", cutoff);
120+-}
121+-
122+-bool
123+-image_magick_version_before_(const char *cutoff)
124+-{
125+- return magick_version_before_("ImageMagick", cutoff);
126+-}
127+-
128+-bool
129+ auto_orient_is_usable ()
130+ {
131+ static int usable = -1;
132+
133+ if (-1 == usable)
134+ {
135+- if (HAVE_GRAPHICS_MAGICK) // version -auto-orient was added
136+- usable = !graphics_magick_version_before_("1.3.18");
137+- if (HAVE_IMAGE_MAGICK) // version known to work
138+- usable = !image_magick_version_before_("6.7.8-9");
139++#if HAVE_GRAPHICS_MAGICK
140++ // version -auto-orient was added
141++ usable = !magick_version_before_("1.3.18");
142++#elif HAVE_IMAGE_MAGICK
143++ // version known to work
144++ usable = !magick_version_before_("6.7.8-9");
145++#endif
146+ if (-1 == usable)
147+ usable = false;
148+ usable = (usable ? 1 : 0);
149+@@ -392,7 +381,7 @@ magick::arguments (const context& ctx)
150+ if (color_correction_)
151+ {
152+ if (HAVE_IMAGE_MAGICK
153+- && !image_magick_version_before_("6.6.1-0"))
154++ && !magick_version_before_("6.6.1-0"))
155+ argv += " -color-matrix";
156+ else
157+ argv += " -recolor";
158+@@ -416,7 +405,7 @@ magick::arguments (const context& ctx)
159+ size_t mat_size = ((HAVE_IMAGE_MAGICK) ? 6 : 5);
160+
161+ if (HAVE_IMAGE_MAGICK
162+- && !image_magick_version_before_("6.6.1-0"))
163++ && !magick_version_before_("6.6.1-0"))
164+ argv += " -color-matrix";
165+ else
166+ argv += " -recolor";
pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patchnew file+56
@@ -0,0 +1,56 @@
1+Index: utsushi-0.57.0/filters/reorient.cpp
2+===================================================================
3+--- utsushi-0.57.0.orig/filters/reorient.cpp
4++++ utsushi-0.57.0/filters/reorient.cpp
5+@@ -96,8 +96,8 @@ chomp (char *str)
6+ bool
7+ tesseract_version_before_(const char *cutoff)
8+ {
9+- FILE *fp = popen ("tesseract --version 2>&1"
10+- "| awk '/^tesseract/{ print $2 }'", "r");
11++ FILE *fp = popen (TESSERACT " --version 2>&1"
12++ "| " AWK " '/^tesseract/{ print $2 }'", "r");
13+ int errc = errno;
14+
15+ if (fp)
16+@@ -126,7 +126,7 @@ tesseract_version_before_(const char *cu
17+ bool
18+ have_tesseract_language_pack_(const char *lang)
19+ {
20+- std::string cmd("tesseract --list-langs 2>&1"
21++ std::string cmd(TESSERACT " --list-langs 2>&1"
22+ "| sed -n '/^");
23+ cmd += lang;
24+ cmd += "$/p'";
25+@@ -291,7 +291,7 @@ reorient::reorient ()
26+
27+ if (found)
28+ {
29+- if (have_tesseract_()) engine_ = "tesseract";
30++ if (have_tesseract_()) engine_ = TESSERACT;
31+ if (have_ocr_engine_()) engine_ = abs_path_name;
32+ }
33+ freeze_options (); // initializes option tracking member variables
34+Index: utsushi-0.57.0/configure.ac
35+===================================================================
36+--- utsushi-0.57.0.orig/configure.ac
37++++ utsushi-0.57.0/configure.ac
38+@@ -196,6 +196,8 @@ AC_DEFINE([HAVE_IMAGE_MAGICK_PP],
39+ [0], [Define to 1 if ImageMagick's C++ API is usable])
40+ AC_DEFINE([MAGICK_CONVERT],
41+ [], [Define to an appropriate command-line invocation for convert])
42++AC_DEFINE([TESSERACT],
43++ [], [Define to an appropriate command-line invocation for tesseract])
44+ AC_DEFINE([WITH_INCLUDED_BOOST],
45+ [0], [Define to 1 if using the included Boost sources])
46+
47+@@ -419,6 +421,9 @@ AS_IF([test xno != "x$with_magick"],
48+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
49+ AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"])
50+
51++AC_PATH_PROG([TESSERACT], [tesseract], [tesseract])
52++AC_DEFINE_UNQUOTED([TESSERACT], ["$TESSERACT"])
53++
54+ AS_IF([test xno != "x$with_gtkmm"],
55+ [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20],
56+ [AC_DEFINE([HAVE_LIBGTKMM], [1])],
pkgs/misc/drivers/utsushi/patches/print-errors.patchnew file+15
@@ -0,0 +1,15 @@
1+Index: utsushi-0.57.0/lib/log.cpp
2+===================================================================
3+--- utsushi-0.57.0.orig/lib/log.cpp
4++++ utsushi-0.57.0/lib/log.cpp
5+@@ -26,8 +26,8 @@
6+
7+ namespace utsushi {
8+
9+-log::priority log::threshold = log::FATAL;
10+-log::category log::matching = log::NOTHING;
11++log::priority log::threshold = log::ERROR;
12++log::category log::matching = log::ALL;
13+
14+ template<>
15+ std::basic_ostream< char >&
pkgs/misc/drivers/utsushi/patches/seriesnew file+3
@@ -0,0 +1,3 @@
1+absolute-path-to-convert.patch
2+print-errors.patch
3+absolute_path_for_tesseract.patch
pkgs/top-level/all-packages.nix+2
@@ -23714,6 +23714,8 @@ in
2371423714
2371523715 epkowa = callPackage ../misc/drivers/epkowa { };
2371623716
23717+ utsushi = callPackage ../misc/drivers/utsushi { };
23718+
2371723719 idsk = callPackage ../tools/filesystems/idsk { };
2371823720
2371923721 igraph = callPackage ../development/libraries/igraph { };