97a0c90fd1
Merge branch 'umax_pp_tool_build' into 'master'
...
configure: corrected issue in Makefile.am and removed noinst build of umax_pp tool
See merge request sane-project/backends!741
2022-07-22 16:23:56 +00:00
c0e966b21e
configure: corrected issue in Makefile.am and removed noinst build of umax_pp tool
...
Currently, there is no way to disable the build of the umax_pp low level
sources because the tool umax_pp is *always* built. Some platforms
cannot build the umax_pp low level code so this causes problems.
2022-07-22 09:10:46 -07:00
409c23a745
Merge branch 'upstream_avision_AD345F_basic' into 'master'
...
avision: add AD345F support as "basic"
See merge request sane-project/backends!740
2022-07-15 04:09:23 +00:00
12f91442c0
avision: add AD345F support as "basic"
...
Tested with Avision AD345F model number DL-1802B.
Flatbed and ADF duplex scanning available.
Known limitation: ADF scanning is only capable to scan one sheet
at a time via automatic feeder. Providing 2+ sheets breaks backend
and scanner needs to be rebooted.
Signed-off-by: Nikolai Kostrigin <nickel@altlinux.org>
Tested-by: Mikhail Chernonog <snowmix@altlinux.org>
2022-07-11 14:28:03 +03:00
948c1c5a40
Merge branch 'escl-fix-segfault' into 'master'
...
Escl: fix segfault
See merge request sane-project/backends!739
2022-07-05 06:36:44 +00:00
a698f003fe
Escl: fix segfault
2022-07-05 06:36:44 +00:00
3f45d4d19e
test: fix type issue. proper type for usleep() is useconds_t.
2022-06-19 16:02:18 -07:00
1e68bfc7fe
Merge branch 'changelogs' into 'master'
...
ChangeLogs: Fix formatting issues, apply to 1.0.27 and 1.0.28, and add missing releases
See merge request sane-project/backends!736
2022-06-17 17:56:39 +00:00
adcbf249f9
avision: fix whitespace tool check problem
2022-06-01 20:48:55 -07:00
ba2c1f92f1
Merge branch 'test-high-res' into 'master'
...
Test backend - scanning high resolution images
See merge request sane-project/backends!737
2022-06-01 20:34:20 +00:00
999a52f691
discussed amendments
2022-06-01 18:04:29 +01:00
1aead16faf
enable test backend to scan high res images
2022-05-29 20:52:51 +01:00
39f9083deb
compile avision with -Wconversion -Wtype-limits
2022-05-21 17:28:21 +01:00
6ad2b593fe
ChangeLogs: Reformat 1.0.27 and 1.0.28, and add missing releases
...
Apply formatting changes to the existing ChangeLogs for the 1.0.27 and
1.0.28 releases. (This includes re-ordering some entries so that merge
requests always appear together.) Manual formatting changes to entries
in these ChangeLogs have been preserved.
Add missing ChangeLogs for later releases.
2022-05-14 17:47:08 -04:00
7ca518027b
tools: Determine starting commit when generating a new ChangeLog file
...
This was still hard-coded to 1.0.28. Detect this automatically instead
by finding the most recent release tag.
2022-05-14 17:35:43 -04:00
7467a9da22
tools: Use topological commit ordering when generating ChangeLog files
...
This means that commits from the same merge request will always appear
together in the ChangeLog, instead of appearing shuffled together with
other commits that were authored around the same time.
2022-05-14 17:35:43 -04:00
4dbfa03ec4
tools: Fix inconsistent formatting when generating ChangeLog files
...
Use 12-digit short hashes (which appear in merge commits). The number
of digits required to unambiguously identify a commit increases as the
Git repository grows. The ChangeLog for the 1.0.27 release has 7-digit
short hashes, which are no longer meaningful: 9 digits are needed now.
Forcing 12 digits to display here is the solution in the Linux kernel.
Do not "decorate" the log with branch or tag names. It is understood
that each file starts at a specific release tag (e.g. 1.0.27) and ends
at the next tag (1.0.28), or at HEAD for development snapshots. Topic
branch names, or the refs "master" and "HEAD", do not need labeling.
2022-05-14 17:35:43 -04:00
1d259c749a
Merge branch 'ci-bump-versions' into 'master'
...
CI: Bump to Ubuntu 22.04 LTS and Fedora 36
See merge request sane-project/backends!735
2022-05-13 20:58:05 +00:00
108716c840
CI: Bump to Ubuntu 22.04 LTS and Fedora 36
2022-05-12 21:51:28 -04:00
8daae197a0
Merge branch 'escl-fix-version-xml-job' into 'master'
...
escl: fix version job.
See merge request sane-project/backends!734
2022-05-11 13:42:52 +00:00
df048b16f0
escl: fix version job.
2022-05-11 15:23:34 +02:00
6b30245844
Merge branch 'escl-set-option-if-necessary' into 'master'
...
Escl: set option if necessary
See merge request sane-project/backends!733
2022-05-11 13:18:18 +00:00
7431b65974
Escl: set option if necessary
2022-05-11 13:18:17 +00:00
6acddfe7f0
Merge branch 'escl-normalize-spec' into 'master'
...
Escl: normalize spec
See merge request sane-project/backends!731
2022-05-11 09:59:20 +00:00
024ae3b5fa
Escl: normalize spec
2022-05-11 09:59:20 +00:00
f68b57378d
Merge branch 'escl-delete-obselete-tag' into 'master'
...
escl : Remove obselete tag.
See merge request sane-project/backends!730
2022-05-11 06:59:40 +00:00
aa032f458d
escl : Remove obselete tag.
2022-05-11 08:28:35 +02:00
f012ae84e5
Merge branch 'fix-scanjet-8250' into 'master'
...
set correct minimum dpi for AV_ASIC_C6 on avision
See merge request sane-project/backends!728
2022-05-08 17:41:51 +00:00
1d502a288a
set correct minimum dpi for AV_ASIC_C6 on avision
2022-05-08 15:08:16 +01:00
b8722a14ed
Merge branch '149-fix-mkstemp-error-handling' into 'master'
...
Resolve "Fix `mkstemp` error handling"
Closes #149
See merge request sane-project/backends!725
2022-05-01 22:02:55 +00:00
f85e2fb9c2
Resolve "Fix `mkstemp` error handling"
2022-05-01 22:02:55 +00:00
a45e79bce6
Merge branch 'clang-warnings' into 'master'
...
Fix Clang warnings
See merge request sane-project/backends!727
2022-05-01 21:56:52 +00:00
a13cc4c1ff
CI: Do not allow build job failures for Fedora 35
...
The CI build jobs targeting Fedora 35 pass (without compiler warnings).
Enforce this going forward.
2022-04-26 07:22:51 -04:00
9e1819c3f7
configure: Use PKG_CHECK_MODULES to detect Net-SNMP
...
The output of "net-snmp-config --cflags" can contain optimization flags.
These might not be applicable to the current compiler, causing warnings.
Use PKG_CHECK_MODULES to check for Net-SNMP and obtain the compiler and
linker flags instead, in the same way as for libcurl or poppler-glib.
2022-04-26 02:12:25 -04:00
4b15f35e75
mustek: Remove unused array variables
...
Introduce a CDB_SIZE() macro similar to that found in sanei/sanei_scsi.c.
This avoids warnings from Clang about unused variables.
2022-04-26 01:18:01 -04:00
e0aad8e814
Merge branch 'backend-built-sources' into 'master'
...
backend/Makefile: Fix handling of built sources
See merge request sane-project/backends!726
2022-04-25 14:17:15 +00:00
76aa009316
backend/Makefile: Include dll-preload.h in sources
2022-04-24 23:13:26 -04:00
adac4f23e6
backend/Makefile: Improve rules for pixma/pixma_sane_options.{c,h}
...
Ensure these files are updated after pixma/pixma.c is changed. Do not
remove them during "make clean" or "make distclean", because they are
part of the source distribution (generated with "make dist"). Display
the relative paths in the build output.
2022-04-24 22:52:55 -04:00
28b5aa7dee
Revert "backend/Makefile: Remove unneeded references to $(srcdir)"
...
This breaks "make dist" when run locally in the CI container.
2022-04-24 21:03:32 -04:00
ac42d6e684
Merge branch 'sp30' into 'master'
...
Fujitsu / PFU SP30
See merge request sane-project/backends!716
2022-04-24 17:10:18 +00:00
e0e9a614be
Merge branch 'avision-fixes' into 'master'
...
avision: Fix issues found by code inspection
See merge request sane-project/backends!710
2022-04-24 17:08:20 +00:00
5f27cc71c8
Merge branch '584-avision-reading-unexpected-length-is-not-handled-correctly' into 'master'
...
Resolve "avision: Reading unexpected length is not handled correctly"
Closes #584
See merge request sane-project/backends!724
2022-04-24 17:02:54 +00:00
b217e7b002
avision: enhance return size checks to generate an appropriate error code.
...
Some of the status code checks also check that the returned data is
of the expected size. However, if they are not, it is possible to
return SANE_STATUS_GOOD in error. We should generate an appropriate
error code other than SANE_STATUS_GOOD for this case.
2022-04-24 09:49:51 -07:00
dd822eda01
Merge branch 'thread-kvs40xx' into 'master'
...
kvs40xx: Return NULL from read_data()
See merge request sane-project/backends!722
2022-04-22 17:51:06 +00:00
137a8f88c7
Merge branch 'poll-header' into 'master'
...
Fix header file used for poll()
See merge request sane-project/backends!723
2022-04-22 17:48:42 +00:00
12560890a6
Fix header file used for poll()
...
POSIX specifies the header to include is <poll.h>, not <sys/poll.h>.
This results in a compiler warning with musl libc (on Alpine Linux).
2022-04-21 23:37:33 -04:00
31cefeb659
Merge branch 'ci-debian-11' into 'master'
...
CI: Do not allow build job failures for Debian 11
See merge request sane-project/backends!721
2022-04-21 14:24:31 +00:00
0286b132b7
CI: Do not allow build job failures for Debian 11
...
With the changes in commit a519a3529a
2022-04-21 00:57:24 -04:00
99dba99442
Merge branch 'lockpath-group-check' into 'master'
...
configure: Remove --with-group option for device locking
See merge request sane-project/backends!713
2022-04-21 04:52:28 +00:00
944bb49e56
CI: Use Debian stable again to build docs and run "make distcheck"
...
This reverts commit b458cb14c6
2022-04-21 00:48:22 -04:00
Ralph Little