David Ward
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
Ralph Little
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
David Ward
108716c840
CI: Bump to Ubuntu 22.04 LTS and Fedora 36
2022-05-12 21:51:28 -04:00
Ordissimo
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
thierry1970
df048b16f0
escl: fix version job.
2022-05-11 15:23:34 +02:00
Ordissimo
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
Ordissimo
7431b65974
Escl: set option if necessary
2022-05-11 13:18:17 +00:00
Ordissimo
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
Ordissimo
024ae3b5fa
Escl: normalize spec
2022-05-11 09:59:20 +00:00
Ordissimo
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
thierry1970
aa032f458d
escl : Remove obselete tag.
2022-05-11 08:28:35 +02:00
Ralph Little
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
Christian Theis
1d502a288a
set correct minimum dpi for AV_ASIC_C6 on avision
2022-05-08 15:08:16 +01:00
Ralph Little
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
Ralph Little
f85e2fb9c2
Resolve "Fix `mkstemp` error handling"
2022-05-01 22:02:55 +00:00
Ralph Little
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
David Ward
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
David Ward
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
David Ward
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
Ralph Little
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
David Ward
76aa009316
backend/Makefile: Include dll-preload.h in sources
2022-04-24 23:13:26 -04:00
David Ward
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
David Ward
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
Ralph Little
ac42d6e684
Merge branch 'sp30' into 'master'
...
Fujitsu / PFU SP30
See merge request sane-project/backends!716
2022-04-24 17:10:18 +00:00
Ralph Little
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
Ralph Little
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
Ralph Little
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
Ralph Little
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
Ralph Little
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
David Ward
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
Ralph Little
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
David Ward
0286b132b7
CI: Do not allow build job failures for Debian 11
...
With the changes in commit a519a3529a
,
the CI build jobs targeting Debian 11 pass (without compiler warnings).
Enforce this going forward.
2022-04-21 00:57:24 -04:00
Ralph Little
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
David Ward
944bb49e56
CI: Use Debian stable again to build docs and run "make distcheck"
...
This reverts commit b458cb14c6
, now that
the CI build jobs targeting Debian 11 pass (without compiler warnings).
2022-04-21 00:48:22 -04:00
Ralph Little
cc0d729e1f
Merge branch 'pixma-add-TS3400' into 'master'
...
pixma:Add TS3400.
See merge request sane-project/backends!704
2022-04-21 04:40:26 +00:00
Ralph Little
71152f0171
Merge branch 'make-silent-rules-output' into 'master'
...
Utilize Automake macros for silent rules output
See merge request sane-project/backends!718
2022-04-21 01:23:44 +00:00
Ralph Little
33f0751670
Merge branch 'ci-bump-versions' into 'master'
...
CI: Bump all distributions to stable versions
See merge request sane-project/backends!705
2022-04-21 01:22:50 +00:00
Ralph Little
f1e3a41037
Merge branch 'mustek-usb2-status' into 'master'
...
mustek_usb2: Replace STATUS type with SANE_Status
See merge request sane-project/backends!720
2022-04-21 01:22:09 +00:00
Ordissimo
f71b32c632
Merge branch 'escl-pdf-mmap' into 'master'
...
escl: convert get_PDF_data() to use GMappedFile and GBytes
See merge request sane-project/backends!719
2022-04-19 12:11:24 +00:00
David Ward
b2c2b74858
escl: convert get_PDF_data() to use GMappedFile and GBytes
2022-04-19 12:11:24 +00:00
David Ward
03bfd4232c
Makefile: Utilize Automake macros for silent rules output
...
Building with --enable-silent-rules makes it easier to identify errors
or warnings in the build output. Automake provides macros for custom
rules to use, so that they will print a similar message to rules which
run the compiler or linker:
...
CC libpieusb_la-pieusb.lo
CCLD libpieusb.la
CCLD libsane-pieusb.la
CC libsane_pixma_la-pixma-s.lo
GEN pixma/pixma_sane_options.h
GEN pixma/pixma_sane_options.c
CC pixma/libpixma_la-pixma.lo
...
This does not change the current output if silent rules are disabled.
2022-04-17 20:16:19 -04:00
David Ward
939d62f836
backend/Makefile: Remove unneeded references to $(srcdir)
...
Adjust these rules to use relative pathnames, like the other rules.
2022-04-17 20:14:15 -04:00
Ralph Little
602b4f8d3d
genesys: add full button support for the Canon 5600F
...
This model spreads their GPIO buttons lines over 3 different registers:
0x6c, 0xa6 and 0x6d
2022-04-15 11:50:56 -07:00
Aaron Jackson
a1fbbae636
Update fujitsu description to include SP30 as good
2022-04-14 22:25:29 +01:00
Aaron Jackson
140100bb23
Fujitsu / PFU SP30
...
Tested and working against the Fujitsu driver.
2022-04-14 22:13:20 +01:00
Ordissimo
785a935e9e
Merge branch 'FixEsclTiffSupport' into 'master'
...
Fix inversed logic in escl_tiff.c:get_TIFF_data
See merge request sane-project/backends!715
2022-04-14 13:50:58 +00:00
Raphael Isemann
877871443d
Fix inversed logic in escl_tiff.c:get_TIFF_data
...
malloc returns NULL on error, but this code errors out on the non-NULL pointer
indicating success (which essentially makes this function always fail).
Signed-off-by: Raphael Isemann <teemperor@gmail.com>
2022-04-14 08:29:43 +02:00
Ralph Little
ea8d0eb91e
Merge branch 'genesys_8400f_sensors' into 'master'
...
Genesys 8400f sensors
See merge request sane-project/backends!712
2022-04-13 18:24:57 +00:00
Ralph Little
b3a04eae1a
genesys: added special PDF function definitions for Canon 4400f
2022-04-13 11:07:45 -07:00
Ralph Little
54766358b5
genesys: corrections for 4400f buttons.
...
Additional special PDF buttons not yet included.
We need a strategy to deal with them.
2022-04-13 11:06:02 -07:00