Wykres commitów

324 Commity (1c3ec28ab8951afe07f2b61d53eae56239ea9a70)

Autor SHA1 Wiadomość Data
m. allan noah 764aa7c6e1 add more generated files to .gitignore 2009-05-05 15:56:54 -04:00
Julien BLACHE 6e4ed52293 Add basic .gitignore files 2009-05-04 14:45:17 +02:00
Chris Bagwell 6b5973313c * Makefile.in, aclocal.m4, configure, */Makefile.in: Regenerated
with newer automake.
* backend/Makefile.am, tools/sane-config.in: Add missing
$GPHOTO2_LDFLAGS so library can be found.
* tools/Makefile.am: Add mising $SCSI_LIBS to sane-find-scanner.
2009-05-03 22:01:23 +00:00
m. allan noah 18e88c02a7 double counting untested scanners bug 2009-04-14 03:54:01 +00:00
m. allan noah 5718d5a4ed * tools/sane-desc.c: remove 8859-1 chars from string cleaner,
enforce only printable ASCII on output (bug 311539)
2009-03-13 13:48:44 +00:00
Chris Bagwell 191cde3dbd Add space mistakenly removed in last CVS update. 2009-03-04 01:22:01 +00:00
Chris Bagwell 9d1375fd7e * acinclude.m4, tools/sane-config.in: Add in missing libraries
to sane-config missed during fix to stop using LIBS to link everything.
Add back in code to move LDFLAGS out of $GPHOTO2_LIBS and into
GPHOTO2_LDFLAGS.
2009-03-03 02:53:42 +00:00
Chris Bagwell 70f3fdfba4 * acinclude.m4, backend/*.[ch], tools/*.[ch], frontend/*.[ch]:
Global replace of u_int??_t with C9x standard based uintxx_t
 in order to remove some tricky and overlapping portability logic
 from acinclude.m4 and leave it in only m4/stdint.m4.
2009-02-26 03:15:43 +00:00
Chris Bagwell be3f46204b * po/Makefile.am, configure.in: convert remaining directory,
po, to use automake.
2009-02-21 22:45:14 +00:00
Mattias Ellert 0827226249 Adding missing liblib dependencies 2009-02-20 16:51:09 +00:00
Chris Bagwell cb4fb37eca Have configure define configdir so all makefiles can use
it (fixes bug introduce with sanei converted to automake).
Enable running testsuite during distcheck.
2009-02-19 18:10:12 +00:00
Julien BLACHE 53e8821bd5 Fixup build. 2009-02-19 15:06:29 +00:00
Julien BLACHE ad1a44d92a Add support for libusb-1.0. 2009-02-19 13:57:45 +00:00
Chris Bagwell 54d462f461 Add missing clean-local. 2009-02-19 02:44:53 +00:00
Chris Bagwell e380729334 * configure.in, tools/Makefile.am: convert tools to automake.
Add tools/openbsd to distribution package.
* include/Makefile.am: include files should have been installed
under sane/ directory when converted to automake.
* doc/Makefile.am: Cleanup. Use automake's built in support to
install docs within subdirectories.
2009-02-19 02:17:45 +00:00
Chris Bagwell aef46252cc convert frontend, include, and sanei directories to use
automake.  Only reference libsanei.la now. Use am_conditional
to compile sanei_jpeg.lo.  distcheck now runs sanei/wire_test.
2009-02-15 03:31:36 +00:00
Chris Bagwell caba90c552 * configure.in, acinclude.ac: Cleanup autoconf 2.63 warnings.
add cv_ prefix to cached variable.  Remove AC_ARG_PROGRAM as
automake already invokes this. When prefered AC_USE_SYSTEM_EXTENSIONS
exists, use that instead of AC_GNU_SOURCE/AC_AIX/AC_MINUX.
Cleanup socket detection more by creating only a single
SOCKET_LIBS that contains list of all optional libraries
for any socket related funciton.  Make sure that checks
for socket related functions use SOCKET_LIBS when searching.
Check for getopt_long() and getopt.h.  Make OS/2 use
-no-undefined (same as windows).
* ltmain.sh, m4/libtool.m4: Upgrade to libtool 1.5.26.
* Makefile.am: Cleanups to match configure updates.
* frontend/scanimage.c, include/Makefile.in, lib/getopt.c
lib/getopt1.c, toosl/sane-desc.c, include/lgetopt.h:
Rename internal getopt.h to lgetopt.h to allow using
external getopt.h when it exists.  This allows to go
back to optionally compiling getopt()/getopt_long() and its
prototypes and not have conflicts with external headers/symbols.
2009-02-06 03:10:44 +00:00
Julien BLACHE be690a3d4e Remove debug code. 2009-02-03 12:07:20 +00:00
Julien BLACHE 9056460913 Filter out unsupported/unknown models from output (udev/hal). 2009-02-03 11:08:31 +00:00
Chris Bagwell 0330a4d416 * aclocalm4: fix prototype of internal strcasestr and usleep.
* configure.in: Group all USB logic together and all SCSI
logic together to aid understanding of whats no longer
valid.  Allow sharing enable/disable options between all
USB drivers on multiple platforms.  Combined CAM_LIBS and
SCSI_LIBS since they are mutually exclusive.
Skip some USB/SCSI checks when previous tests show it will always fail.
* backend/Makefile.am, tools/Makefile.in: Combine CAM_LIBS and
SCSI_LIBS. Add missing SOCKET_LIBS to epson2.  Add USB_LIB.
* saned.c: Add limits.h for PATH_MAX.
2009-02-02 03:17:32 +00:00
Chris Bagwell 23ff26f9a5 * acinclude.m4, configure.in: Put all libraries into their
own *_LIB variables instead of $LIB so that we do not have to
link in the world to all executables. Modified SANE_CHECK_U_TYPES
to be a little more portable to platforms that use #define
for u_* types. Create SANE_CHECK_BACKENDS macro so that
PRELOADABLE_BACKENDS can also be valided.  Auto-populated
PRELAODABLE_BACKENDS when detect dlopen() won't work.
Various protability cleanups.
* backend/dll.c: Make dll-preload.c a .h since its an include and
not compilable byitself.
* frontend/Makefile.in, frontend/scanimage.c, include/laaloca.h,
  lib/Makefile.am, lib/alloca.c, strcasestr.c, tools/Makefile.in,
  tools/sane-desc.c: Convert lib/ to automake.  Create a liblib.la
  for everyone to use and a libfelib.la for only frontend programs.
  Make all internal programs be prefixed with sanei_ as not to conflict
  with other programs libsane is linked in with that will also most
  likely create similar internal utils on problem platforms.
  * include/getopt.h, lib/getopt.c, lib/getopt1.c: Always compile
  and link in getopt_long() but prefix it with sanei_.  Its
  easier to always use internal version then try to figure out what
  platforms support getopt_long() and what header files to use.
  * backend/Makefile.am: Convert backend makefile to automake.
  Initial version that is feature parity with original but uses
  specific rules instead of wildcards and only links in libraries/objs
  really required. Room for more cleanup of whats linked in once
  all makefiles have been converted to automake.
2009-01-31 03:12:18 +00:00
Chris Bagwell c90e23a6d2 Updates to Makefiles to prepare for transition to automake.
Fix a few bugs with "all" and "uninstall" targets to work when
$(builddir) != $(srcdir).  Added $(DESTDIR) to uninstall target.
Made $(distdir) related to current directory to match automake.
2009-01-16 23:39:48 +00:00
Julien BLACHE acc2b0fccf Add a new :scsi keyword for SCSI devices, add support for SCSI devices
in the udev and HAL FDI outputs.
2009-01-13 21:17:16 +00:00
Julien BLACHE e91b604df7 Replace the obsolete SYSFS{} key by the newer ATTR{} key in the udev output. 2009-01-13 21:14:17 +00:00
Julien BLACHE 4cb1d28a35 Group USB devices by vendor in the HAL FDI output. 2009-01-13 21:11:28 +00:00
Julien BLACHE 59f6298630 Replace opencoded device permissions and ownership by proper definitions. 2009-01-13 20:58:55 +00:00
Julien BLACHE 95f01b7244 HAL 0.5.11-rc2 does not support the info.bus property anymore; superseded by
info.subsystem. Unfortunately, this is not backward-compatible, so add a new
"hal-new" mode to sane-desc.
2008-03-28 20:57:59 +00:00
Mattias Ellert 22efa538b7 Fix warnings about ignored --datarootdir 2008-02-03 06:59:36 +00:00
m. allan noah ba5639151d second try committing these 2008-01-18 01:47:47 +00:00
m. allan noah e7e161c6ee translation update from Yann E. MORIN 2008-01-15 01:13:59 +00:00
Jonathan Bravo Lopez 785f67981b Updated spanish translation. Fixed compilation warning in check-usb-chip.c 2007-12-19 14:25:43 +00:00
Mattias Ellert 71be983cdd use SCSITaskSGElement if available 2007-11-10 15:44:41 +00:00
Mattias Ellert 71f9081904 MacOS X updates 2007-11-10 11:35:34 +00:00
Mattias Ellert 93e856b53f Cross compilation fixes and libtool update 2007-11-10 07:12:55 +00:00
Stéphane Voltz 76b0c6d7e8 - added rts8801/rts8891 detection 2007-10-19 15:12:48 +00:00
Julien BLACHE 08f6df7b48 Add a RUN rule to the udev rules to automatically disable USB suspend for all known scanners.
This effectively works around the hardware bugs exposed by CONFIG_USB_SUSPEND.

Works only with kernels >= 2.6.22 where /sys/bus/usb/devices/*/power/level exists.
2007-07-29 18:39:54 +00:00
Julien BLACHE 734c0c1800 Comment out the node creation rule by default so as to not depend on a (documented) udev side effect.
(that is, the rule would be ignored by udev because a previous rule already set the NAME key)
2007-07-29 17:37:49 +00:00
Julien BLACHE d5d762f96e Revert my last commit and rework the one before to produce a backward compatible udev rules file. Yay. 2007-07-26 21:23:27 +00:00
Julien BLACHE 3958e52b1b Simplify previous modification. 2007-07-25 12:30:16 +00:00
Julien BLACHE 8dc1f4493c Update udev rules for use with Linux >= 2.6.22 and CONFIG_USB_DEVICE_CLASS=n. 2007-07-25 09:21:18 +00:00
Gerhard Jaeger 34ac88686f Try to distinguish the various
GenesysLogic GeneScan ASICS - GL841, GL842 and GL843
2007-07-11 20:54:28 +00:00
Ilia Sotnikov 50162dbce6 + Added HP ScanJet 5550/5590/7650 detection routine 2007-04-24 17:59:28 +00:00
Julien BLACHE a0fd0edb03 Use mode 0664 for usbfs device nodes; allows everybody on the system to use lsusb. 2007-04-17 19:21:13 +00:00
Jochen Eisinger d620d407bb 2007-04-5 Jochen Eisinger <jochen@penguin-breeder.org>
* README.openbsd, tools/README, tools/openbsd/attach,
	  tools/openbsd/detach: add notes about device permissions on
	  OpenBSD and provide some example scripts for hotplugd(8).
2007-04-05 07:41:02 +00:00
Julien BLACHE 7691b81b51 Remove leftovers from a previous experiment. 2007-03-21 16:10:29 +00:00
Julien BLACHE 17ca143dc2 Adding hal FDI output mode, from David Zeuthen <davidz@redhat.com> 2007-03-18 09:31:10 +00:00
Henning Geinitz d56df03942 Fixed compilation problem with newer tail programs which don't understand "-1"
(bug #303630).
2006-07-25 18:34:44 +00:00
Julien BLACHE 2d3f6ca6c9 Revert part of the previous commit (unwanted mods). 2006-07-16 11:15:14 +00:00
Julien BLACHE 08ebb3df15 Split very long comment lines in the udev rules file. 2006-07-16 11:05:15 +00:00
Julien BLACHE 587c25825c sane-desc.c: Fix a typo in the udev header. 2006-07-03 17:51:32 +00:00
Mattias Ellert 494b57584b Missing end tag 2006-05-27 14:56:58 +00:00
Mattias Ellert b7ea951e7c plist output from sane-desc 2006-05-27 07:50:05 +00:00
Henning Geinitz e8bf4ef719 Updated documentation concerning udev. 2006-05-10 19:34:05 +00:00
Henning Geinitz 84c4daefc8 Removed. No longer needed as hotplug-ng and udev files are generated by
sane-desc now.
2006-05-10 19:32:50 +00:00
Henning Geinitz 7d20639cb7 Create libsane.usermap (for hotplug), libsane.db (for hotplug-ng) and
libsane.rules (for udev) automatically with sane-desc based on the :usbid tokens
in the description files.
2006-04-18 18:45:16 +00:00
Henning Geinitz 204ac69909 Removed. Will be created automatically by sane-desc. 2006-04-18 18:41:22 +00:00
Julien BLACHE 8cdd5db635 Fix/optimize udev rules; tests on the same line are ANDed together, not ORed together, causing the rules to trigger more often than necessary. 2006-04-12 11:35:06 +00:00
Henning Geinitz db4e34ab62 Added some scanners. 2006-04-03 18:37:43 +00:00
Henning Geinitz 92d177c049 Added USB support for DragonFlyBSD (bug #303183). 2006-03-11 12:56:34 +00:00
Mattias Ellert 60024daafb Empty line confuses the convert-usermap.sh tools 2006-02-19 08:01:09 +00:00
Ullrich Sigwanz 28346f5111 adding trust office scan 19200 2006-02-04 10:28:51 +00:00
Henning Geinitz 2b425ad61c Added checks for altsetting =! 0. 2006-01-22 16:52:13 +00:00
Stéphane Voltz 70593ff2e1 - added Dell A920 (rebranded X1100) 2006-01-20 12:15:58 +00:00
Henning Geinitz 408c7c4e1f Added "ignore" parameter to :usbid token. Print warning if a backend defines USB
models without defining usbid. Print warning if a model doesn't have an
interface.
2006-01-14 19:06:49 +00:00
Henning Geinitz 2844681728 Improved rts8822l-01h chipset detection by adding check for descriptor.bcdUSB ==
0x110 reported by some scanners and accepting any value diferent to 0, read from
0xfe11 register. Patch from Jonathan Bravo Lopez <JKD@JKDSoft.cjb.net>.
2006-01-14 14:54:56 +00:00
Henning Geinitz 14e5a82d9d Added usermap, db, and udev output modes for generating USB vendor/product lists
for hotplug (ng) and Linux udev. Added version information to html modes.
2006-01-08 20:42:53 +00:00
Henning Geinitz 94f90304b0 Added support for keyword :usbid. All output modes now print the usb vendor and
product modes.
2006-01-08 15:48:38 +00:00
Henning Geinitz afa3fc0bb5 Added new output mode: statistics. This mode prints overal statistics about
known devices. Added support for more than one search directory. Removed support
for deprecated backend status ("alpha", "beta" ...). Ran indent -gnu. HTML
output (backends and mfgs) prints statitics now. Unify status and device type
strings. Simplified status and device type string printing. Removed any
remaining links of backend status.
2006-01-07 23:44:09 +00:00
Henning Geinitz c3cf1bc572 Ran indent -gnu. 2006-01-07 21:42:07 +00:00
Henning Geinitz 0cba368232 Added new output mode: statistics. This mode prints overal statistics about
known devices. Added support for more than one search directory. Removed support
for deprecated backend status ("alpha", "beta" ...).
2006-01-07 19:36:24 +00:00
Henning Geinitz e86da220dd Print version information when detecting chip sets. 2006-01-07 17:05:11 +00:00
Henning Geinitz 3df9888de2 Brother DCP-7010 is reported to work (bug #302862). 2006-01-07 16:38:59 +00:00
Henning Geinitz 00c45a8897 Added Hewlett-Packard PSC 1210. 2006-01-05 21:56:21 +00:00
Henning Geinitz 56e0aa44b2 Added Canon LiDE 60 (bug #302830). 2006-01-02 16:05:26 +00:00
Henning Geinitz 1720fe415a Added Brother MFC 8440. 2005-12-28 11:45:05 +00:00
Henning Geinitz 50139e542c Added Brother MFC-7420. 2005-12-23 13:14:12 +00:00
Henning Geinitz 9ddf8d1845 Added Epson Perfection 3490. 2005-12-06 15:15:18 +00:00
Henning Geinitz c458e3fe30 Added Epson Stylus CX4200. 2005-11-30 18:58:12 +00:00
Henning Geinitz 36f5ae321c Added Plustek Opticslim 2400 ids (from Jan Matousek). 2005-11-20 15:49:40 +00:00
Henning Geinitz 28c514bf73 Added detection of rts8822l-01h chipset (patch from Jonathan Bravo Lopez
<JKD@JKDSoft.cjb.net>).
2005-11-07 18:58:13 +00:00
Henning Geinitz 947339db25 Run "makedepend" if it's available. This way "make" builds
backends correctly even if only included files (e.g. headers) are
	  changed. Don't be too verbose when running makedepend.
	  Create links libsane-*.so.1 to the real library files if the
	  links are not there. This fixes dynamic loading on OpenBSD. The
	  links are not created for MacOS X as they don't work there.
	  Remove any libsane.* links in /usr/local/lib/sane. Such links
	  are created by libtool. As they point to libsane-v4l.so,
	  scanimage -L doesn't find any scanner in case of ld.so
	  misconfigurations.
	  The install target is much quiter now and prints the libtool
	  message only once now.
2005-10-29 20:01:54 +00:00
Henning Geinitz 2510b95437 Added Epson Stylus DX3850 (from niels_kalle <niels_kalle@web.de>). 2005-10-23 12:13:36 +00:00
Henning Geinitz 513cbc80ca Added Brother MFC 210C. 2005-10-17 18:05:22 +00:00
Henning Geinitz b2accf7467 Make "make dist" work again. 2005-10-16 19:06:14 +00:00
Henning Geinitz affb104893 Added lexmark backend (from Fred Odendaal <freshshelf@rogers.com>). 2005-10-16 17:15:37 +00:00
Henning Geinitz 1f36124198 Added udev to list of directories that are part of the distribution. 2005-10-01 16:06:12 +00:00
Julien BLACHE 92fa96f61c tools/udev/convert-usermap.sh: Don't print 0x when matching VID and PID. 2005-09-28 21:06:10 +00:00
Julien BLACHE 7ed2585674 tools/udev/convert-usermap.sh: Added a script to convert hotplug/libsane.usermap to a udev rules file. udev 070 + linux 2.6.14 will deprecate hotplug.
tools/README: updated.
2005-09-28 20:37:43 +00:00
Henning Geinitz 259a745dd4 Print more clear output if no USB scanners are found. Point to manual page. Warn
if libusb support hasn't been built.
2005-09-26 12:13:51 +00:00
Henning Geinitz e790e335e8 Added HP PSC 750. 2005-09-02 19:06:11 +00:00
Henning Geinitz 149b4c3923 Added detection for SQ113 chip (e.g. Mustek BearPaw 2448 TA Pro). 2005-09-01 20:41:12 +00:00
Stéphane Voltz 8c463cfb76 - added EPP support for UMAX Astra 610P 2005-08-24 05:35:06 +00:00
Stéphane Voltz f9f48fafa4 - Added rts8858c (used by lexmark X1100 series) detection 2005-08-22 18:59:26 +00:00
Henning Geinitz 821ca4d53c Added some Genius scanners. Fixed Visioneer Onetouch 7300 USB. Added Plustek
OpticSlim 2400.
2005-08-22 15:48:48 +00:00
Gerhard Jaeger c7a62fe2b3 Added USB ID for LiDE25. 2005-08-22 07:27:30 +00:00
Julien BLACHE 94ad270193 Added USB IDs for the sm3600-supported scanners. If you know the exact model name corresponding to the above IDs, please mail sane-devel:
0x05da/0x40b3, 0x05da/0x40b8, 0x05da/0x40ca, 0x05da/0x40dd, 0x05da/0x40ff
2005-08-17 16:36:49 +00:00
Henning Geinitz 621dc84b90 Added check for Toshiba M011 chips as used in Microtek ScanMaker 3600, 3700, and
3750.
2005-08-16 20:28:46 +00:00
Henning Geinitz ee11f5abcf Added check for combination of a PowerVision PV8630 (USB->parport bridge) and
National Semiconductor LM9830 as used in the HP 4200. Fixed compilation warning.
2005-08-16 18:23:42 +00:00
Henning Geinitz 53fe9ae549 Don't print anything else but the found messages in "-q" mode. 2005-08-16 18:19:41 +00:00
Julien BLACHE 51cc4e0797 Added various Epson IDs from Olaf Meeuwissen; reodered some misplaced Epson entries. 2005-07-29 10:15:00 +00:00