Thierry HUCHARD
85f7c87070
Fix build
2021-01-29 21:54:28 +01:00
Thierry HUCHARD
c7b313ad1e
The adf return status is wrong on the HP M578 model, this should get around this error.
2021-01-29 21:35:25 +01:00
Olaf Meeuwissen
ab945b1a89
Merge branch 'ci-bump-alpine-fedora-versions' into 'master'
...
CI: Bump alpine fedora versions
See merge request sane-project/backends!579
2021-01-25 11:09:24 +00:00
Olaf Meeuwissen
a7a8cb44d4
CI: Bump Fedora from 32 to 33
2021-01-24 21:22:34 +09:00
Olaf Meeuwissen
8462b2d75a
CI: Bump Alpine from 3.12 to 3.13
2021-01-24 21:22:07 +09:00
Olaf Meeuwissen
b90ecabf8c
Merge branch 'update_uk1' into 'master'
...
Update Ukrainian translation
See merge request sane-project/backends!576
2021-01-24 11:42:36 +00:00
Olaf Meeuwissen
63d938de61
Merge branch 'fix-udev-rules' into 'master'
...
Trigger udev rules parsing on all kernel events except of "remove".
See merge request sane-project/backends!541
2021-01-24 08:24:47 +00:00
Ordissimo
420e09214a
Merge branch 'escl-fix-sleep-mode' into 'master'
...
Fix sleep mode
See merge request sane-project/backends!577
2021-01-24 07:17:36 +00:00
Ordissimo
6f90442641
Fix sleep mode
2021-01-24 07:17:36 +00:00
Olaf Meeuwissen
c3a29fb984
Merge branch 'readme1' into 'master'
...
Add Ubuntu pre-built section to README
See merge request sane-project/backends!518
2021-01-24 06:24:53 +00:00
Yuri Chornoivan
a057082801
Update Ukrainian translation
2021-01-18 13:36:37 +02:00
Ordissimo
fc74de7c5e
Merge branch 'escl-complete-hack-scanjob-request' into 'master'
...
Use MakeAndModel to apply the hack to the device
See merge request sane-project/backends!575
2021-01-17 16:52:58 +00:00
Thierry HUCHARD
9dd8319a01
Utilise MakeAndModel pour le device au hack.
2021-01-17 17:23:56 +01:00
Ordissimo
ece6d7d5e7
Merge branch 'escl-hack-scanjob-request' into 'master'
...
Escl hack scanjob request
See merge request sane-project/backends!574
2021-01-16 22:27:14 +00:00
Ordissimo
af445c2e9c
Fix syntax in escl.conf.in
2021-01-16 22:11:36 +00:00
Thierry HUCHARD
4b6418476e
Allows to activate the hack from the configuration file, only the first form supports it.
2021-01-16 23:01:31 +01:00
Thierry HUCHARD
cb8b6d2ace
Fixed variable initialization.
2021-01-16 09:06:01 +01:00
Thierry HUCHARD
b24907c8a9
Fix scanjob for LaserJet FlowMFP M578 and LaserJet MFP M630.
2021-01-16 09:03:14 +01:00
Olaf Meeuwissen
7b602c1d6b
Merge branch 'sync-utsushi-desc-with-upstream' into 'master'
...
utsushi.desc: Sync with upstream
See merge request sane-project/backends!573
2021-01-16 06:30:56 +00:00
Olaf Meeuwissen
957a4fcb8f
utsushi.desc: Sync with upstream
2021-01-16 15:14:22 +09:00
Ordissimo
c26e9acd79
Merge branch 'escl-fix-alloc' into 'master'
...
escl: fix char_to_array memory allocation calculations
Closes #425
See merge request sane-project/backends!571
2021-01-15 15:16:45 +00:00
Timo Teräs
891ccac3b6
escl: fix char_to_array memory allocation calculations
...
Too little memory allocated due to incorrect calculation.
Fixes #425
2021-01-15 16:46:12 +02:00
Ordissimo
d46fbd9d79
Merge branch 'escl-check-poppler-glib' into 'master'
...
Fix check poppler-glib, (see issue #422 ).
See merge request sane-project/backends!570
2021-01-14 12:46:22 +00:00
thierry1970
0293e662cf
Fix check poppler-glib, (see issue #422 ).
2021-01-14 13:20:17 +01:00
Gerhard Jaeger
b0655dc03e
Fix issue with '--enable-locking': Do not require sub-directory for locking.
2021-01-07 12:34:34 +01:00
Ordissimo
f0f7e43d7f
Merge branch 'escl-fix-orders' into 'master'
...
The order of the parameters does not change the result.
See merge request sane-project/backends!568
2021-01-04 19:07:25 +00:00
Thierry HUCHARD
fefc6f1818
The order of the parameters does not change the result.
2021-01-04 19:47:08 +01:00
Ordissimo
adbfcd1696
Merge branch 'escl-devices-list-properties' into 'master'
...
Adds to the list of detected devices the different supported trays
See merge request sane-project/backends!564
2021-01-04 18:40:43 +00:00
Olaf Meeuwissen
2e41482e01
Merge branch '409-autoconf-2.70-causes-resulting-configure-file-to-fail' into 'master'
...
Drop use of obsoleted autoconf AC_HEADER_STDC macro. Fixes #409
Closes #409
See merge request sane-project/backends!566
2021-01-01 07:19:07 +00:00
Olaf Meeuwissen
445b5bd7e1
Drop use of obsoleted autoconf AC_HEADER_STDC macro. Fixes #409
...
Use of the STDC_HEADER pre-processor macro that the autoconf macro
used to define has been removed. Conditionalized code is now used
unconditionally. This should be fine as the macro checks for ANSI
C, i.e. C89 (ISO C90), compliant headers. We already require C99.
2021-01-01 16:02:52 +09:00
Thierry HUCHARD
17023afb99
Get device informations with avahi.
2020-12-29 11:33:55 +01:00
Povilas Kanapickas
0c2fa6bea6
Merge branch 'fix_crash' into 'master'
...
Fix crash in scanimage when must_buffer is true
Closes #408
See merge request sane-project/backends!563
2020-12-26 22:19:45 +00:00
James Ring
b4be10c5a2
Fix crash in scanimage when must_buffer is true
...
Fixes https://gitlab.com/sane-project/backends/-/issues/408 .
2020-12-26 14:04:26 -08:00
Povilas Kanapickas
422425d740
Merge branch 'port' into 'master'
...
allow saned to listen on specified port, or an ephemeral port
See merge request sane-project/backends!549
2020-12-26 17:26:42 +00:00
James Ring
ea50fb683c
allow saned to listen on specified port, or an ephemeral port
2020-12-26 09:10:55 -08:00
Povilas Kanapickas
5af7850ba6
Merge branch 'sanei-usb-configure-record-open-clear' into 'master'
...
sanei_usb: Allow backends to specify when USB recording is cleared
See merge request sane-project/backends!392
2020-12-26 14:16:19 +00:00
Povilas Kanapickas
e9d2cdf67b
sanei_usb: Allow backends to modify when USB recording is cleared
2020-12-26 16:01:04 +02:00
Povilas Kanapickas
ee7f913974
Merge branch 'pixma-add-models' into 'master'
...
Add models
See merge request sane-project/backends!553
2020-12-26 13:56:49 +00:00
Povilas Kanapickas
9c00d111e6
Merge branch 'fix_leak' into 'master'
...
fix small memory leak in scanimage option processing
See merge request sane-project/backends!551
2020-12-26 13:41:52 +00:00
Thierry HUCHARD
ffc2bbb1ff
pixma: Add models
2020-12-26 15:40:07 +02:00
Olaf Meeuwissen
e0be6fc892
Merge branch '395-add-epson-et-2600-support' into 'master'
...
Resolve "Epson ET-2600 works with libusb configuration"
Closes #395
See merge request sane-project/backends!562
2020-12-26 05:17:54 +00:00
Olaf Meeuwissen
4d347512eb
epson2.desc: Fix formatting error
2020-12-26 13:44:42 +09:00
Olaf Meeuwissen
be8b841057
utsushi.desc: Sync with upstream
2020-12-26 12:04:11 +09:00
Olaf Meeuwissen
77a3173e90
epson2: Add ET-2600 as supported
...
See https://gitlab.com/sane-project/backends/-/issues/395
2020-12-26 12:03:15 +09:00
Ordissimo
1ae3197f00
Merge branch 'escl-fix-messages-and-variable' into 'master'
...
Fix messages and variable.
See merge request sane-project/backends!561
2020-12-22 15:58:19 +00:00
thierry1970
1dbc316327
Fix messages and variable.
2020-12-22 16:14:44 +01:00
Ordissimo
87d9a86742
Merge branch 'escl-fix-documentformat' into 'master'
...
Choose the format according to availability and options.
See merge request sane-project/backends!560
2020-12-21 20:54:27 +00:00
Ordissimo
4aa767327d
Choose the format according to availability and options.
2020-12-21 20:17:03 +00:00
Ordissimo
ae06e017f4
Merge branch 'remotes/origin/escl-fix-adv-options' into 'master'
...
refactoring options code
See merge request sane-project/backends!559
2020-12-21 19:42:45 +00:00
thierry1970
c0dae7e8f5
refactoring options code
2020-12-21 18:16:31 +01:00