Adding lock directory (used by some backends, bug #104025) and support for LiDE25 scanners (bug #104026)

(Portage version: 2.0.51.22-r2)

6 files changed, 154 insertions, 18 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index ce0dc79a3cf8..4b172b96adb3 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.73 2005/08/22 10:44:06 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.74 2005/08/30 08:00:38 phosphan Exp $
+
+*sane-backends-1.0.16-r2 (30 Aug 2005)
+
+  30 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> +files/lide25.patch,
+  +sane-backends-1.0.16-r2.ebuild, -sane-backends-1.0.16.ebuild:
+  Adding lock directory (used by some backends, bug #104025) and support for
+  LiDE25 scanners (bug #104026)
 
   22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
   sane-backends-1.0.16-r1.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 57cc0a9d1ebe..c9a58b737650 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,9 +1,9 @@
+MD5 d614a291422958dc8848f6ab054e4016 sane-backends-1.0.16-r2.ebuild 3884
 MD5 ebd00143bfe66f76d0d0da95cbc84923 sane-backends-1.0.15.ebuild 2598
 MD5 544c2bc7c5a23b2ae8280b879eac1fbb sane-backends-1.0.15-r2.ebuild 3912
 MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
 MD5 61d573be9593ba3be2da335586ac7eb2 sane-backends-1.0.16-r1.ebuild 3743
 MD5 e73a3bf54c049342701898a62ea3b301 sane-backends-1.0.15-r1.ebuild 2674
-MD5 63791870c63ed2fd6abebe7d7b3ebc85 sane-backends-1.0.16.ebuild 3672
 MD5 316abfc3d93b077fd1337385a0dfa2b7 ChangeLog 13034
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 79980449d94fb97178178bef2a1c7443 sane-backends-1.0.15-r3.ebuild 3975
@@ -17,5 +17,6 @@ MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r1 157
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r2 157
 MD5 d16f7594dad0db0c268e143c3676041e files/digest-sane-backends-1.0.15-r3 220
 MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r1 151
+MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r2 151
+MD5 0bc1f6b8682b5585c8e87a325f983ade files/lide25.patch 5565
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
-MD5 f6aabb0fd7dcc3cbec039d7774a038b0 files/digest-sane-backends-1.0.16 73
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16
deleted file mode 100644
index 640cd97241ee..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r2 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r2
new file mode 100644
index 000000000000..c28bef8f1d50
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r2
@@ -0,0 +1,2 @@
+MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
+MD5 321ec37f7229dda4dc86b06301cfad8e sane-1.0.16-brother-driver.diff.bz2 8224
diff --git a/media-gfx/sane-backends/files/lide25.patch b/media-gfx/sane-backends/files/lide25.patch
new file mode 100644
index 000000000000..54d4aa2454d1
--- /dev/null
+++ b/media-gfx/sane-backends/files/lide25.patch
@@ -0,0 +1,125 @@
+diff -Nur sane-backends/backend/plustek-usb.c sane-backends-new/backend/plustek-usb.c
+--- sane-backends/backend/plustek-usb.c	2005-07-04 11:54:30.000000000 +0200
++++ sane-backends-new/backend/plustek-usb.c	2005-07-21 14:37:15.000000000 +0200
+@@ -1094,7 +1094,8 @@
+ 	/* the CanoScan CIS devices need special handling... */
+ 	if((dev->usbDev.vendor == 0x04A9) &&    
+ 		(dev->usbDev.product==0x2206 || dev->usbDev.product==0x2207 ||
+-		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E)) {
++		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E ||
++		 dev->usbDev.product==0x2220)) {
+ 		use_alt_cal = SANE_TRUE;
+ 		
+ 	} else {
+diff -Nur sane-backends/backend/plustek-usbdevs.c sane-backends-new/backend/plustek-usbdevs.c
+--- sane-backends/backend/plustek-usbdevs.c	2005-07-04 11:54:30.000000000 +0200
++++ sane-backends-new/backend/plustek-usbdevs.c	2005-07-21 14:36:48.000000000 +0200
+@@ -702,6 +702,24 @@
+ 	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
+ };
+ 
++/* Canon LiDE25
++ */
++static DCapsDef Cap0x04A9_0x2220 =
++{
++	{{ 0, 100}, 50, 10, {2550, 3508}, {75, 75}, COLOR_BW },
++	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
++	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
++	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
++	{1200, 1200},
++	0,
++	SENSORORDER_rgb,
++	16,                 /* sensor distance                         */
++	3,                  /* number of buttons                       */
++	kCIS1240,           /* use default settings during calibration */
++	0,                  /* not used here...                        */
++	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
++};
++
+ /******************* additional Hardware descriptions ************************/
+ 
+ /** U24, UT12 and UT16
+@@ -2279,6 +2297,75 @@
+ 	2.0
+ };
+ 
++/** Canon LiDE25 */
++static HWDef Hw0x04A9_0x2220 =
++{
++	0.72,   /* dMaxMotorSpeed (Max_Speed)                     */
++	0.30,   /* dMaxMoveSpeed (Max_Speed)                      */
++	0.0,    /* dHighSpeed                                     */
++	100,    /* wIntegrationTimeLowLamp                        */
++	100,    /* wIntegrationTimeHighLamp                       */
++	1200,   /* wMotorDpi (Full step DPI)                      */
++	512,    /* wRAMSize (KB)                                  */
++	3.75,   /* dMinIntegrationTimeLowres (ms)                 */
++	5.75,   /* dMinIntegrationTimeHighres (ms)                */
++	   0,   /* wGreenPWMDutyCycleLow (reg 0x2a + 0x2b)        */
++	   0,   /* wGreenPWMDutyCycleHigh (reg 0x2a + 0x2b)       */
++
++	0x11,   /* bSensorConfiguration (0x0b)                    */
++	0x4d,   /* sensor control settings (reg 0x0c)             */
++	0x2f,   /* sensor control settings (reg 0x0d)             */
++	0x00,   /* sensor control settings (reg 0x0e)             */
++
++	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
++	       /* mono (reg 0x0f to 0x18)                        */
++
++	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
++	      /* color (reg 0x0f to 0x18)                       */
++
++	(_BLUE_CH | _ONE_CH_COLOR), /* bReg_0x26 color mode       */
++
++	0x00,   /* bReg 0x27 color mode                           */
++	2,      /* bReg 0x29 illumination mode                    */
++
++	{ 3,  0,    0,  50,  3000,  0,     0 },
++	{ 2, 50, 16383, 50, 16383, 50, 16383 },
++
++	1,      /* StepperPhaseCorrection (reg 0x1a + 0x1b)       */
++	0,      /* bOpticBlackStart (reg 0x1c)                    */
++	0,      /* bOpticBlackEnd (reg 0x1d)                      */
++	0x7f,   /* wActivePixelsStart (reg 0x1e + 0x1f)           */
++	10559,  /* wLineEnd (reg 0x20 + 0x21)                     */
++
++	50,     /* red lamp on    (reg 0x2c + 0x2d)               */
++	16383,  /* red lamp off   (reg 0x2e + 0x2f)               */
++	50,     /* green lamp on  (reg 0x30 + 0x31)               */
++	16383,  /* green lamp off (reg 0x32 + 0x33)               */
++	50,     /* blue lamp on   (reg 0x34 + 0x35)               */
++	16383,  /* blue lamp off  (reg 0x36 + 0x37)               */
++
++	3,      /* stepper motor control (reg 0x45)               */
++	0,      /* wStepsAfterPaperSensor2 (reg 0x4c + 0x4d)      */
++	0x20,   /* steps to reverse when buffer is full reg 0x50) */
++	0xfc,   /* acceleration profile (reg 0x51)                */
++	0,      /* lines to process (reg 0x54)                    */
++	0x0f,   /* kickstart (reg 0x55)                           */
++	0x08,   /* pwm freq (reg 0x56)                            */
++	0x1f,   /* pwm duty cycle (reg 0x57)                      */
++
++	0x04,   /* Paper sense (reg 0x58)                         */
++
++	0x66,   /* misc io12 (reg 0x59)                           */
++	0x16,   /* misc io34 (reg 0x5a)                           */
++	0x91,   /* misc io56 (reg 0x5b)                           */
++	0x01,   /* test mode ADC Output CODE MSB (reg 0x5c)       */
++	0,      /* test mode ADC Output CODE LSB (reg 0x5d)       */
++	0,      /* test mode (reg 0x5e)                           */
++	_LM9833,
++	MODEL_CANON1200,
++	2.0
++};
++
+ /******************** all available combinations *****************************/
+ 
+ /** here we have all supported devices and their settings...
+@@ -2348,6 +2435,7 @@
+ 	{"0x04A9-0x2208",   &Cap0x04A9_0x2208, &Hw0x04A9_0x2208, "D660U"       },
+ 	{"0x04A9-0x220D",   &Cap0x04A9_0x220D, &Hw0x04A9_0x220D, "N670U/N676U/LiDE20" },
+ 	{"0x04A9-0x220E",   &Cap0x04A9_0x220E, &Hw0x04A9_0x220E, "N1240U/LiDE30"      },
++	{"0x04A9-0x2220",   &Cap0x04A9_0x2220, &Hw0x04A9_0x2220, "LiDE25"      },
+ 
+ 	/* Please add other devices here...
+ 	 * The first entry is a string, composed out of the vendor and product id,
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild
index 68636799fa65..27914f37e0f4 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.16.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.16.ebuild,v 1.2 2005/08/22 07:26:48 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild,v 1.1 2005/08/30 08:00:38 phosphan Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 IUSE="usb gphoto2 ipv6 v4l"
 
@@ -16,11 +16,12 @@ DEPEND=">=media-libs/jpeg-6b
 	gphoto2? ( media-libs/libgphoto2 )
 	v4l? ( sys-kernel/linux-headers )"
 
-BROTHERMFCDRIVER="sane-backends-1.0.15-brothermfc.patch"
+BROTHERMFCDRIVER="sane-${PV}-brother-driver.diff"
 
 SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz"
-	#usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
+	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz
+	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
+		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
 KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
@@ -61,16 +62,12 @@ src_unpack() {
 		einfo "instead of building all of them."
 	fi
 	unpack ${A}
-	#if use usb; then
-	#	unpack ${BROTHERMFCDRIVER}.bz2
-	#fi
-	#cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
+	if use usb; then
+		unpack ${BROTHERMFCDRIVER}.bz2
+	fi
 
 	cd ${S}
 
-	#epatch ${FILESDIR}/canoscan-focus.patch
-	#epatch ${WORKDIR}/gt68xx-71.patch
-
 	#only generate the .ps and not the fonts
 	sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \
 		doc/Makefile.in
@@ -79,19 +76,24 @@ src_unpack() {
 		|| die "function_name fix failed"
 
 	if use usb; then
-		#epatch ${WORKDIR}/${BROTHERMFCDRIVER}
+		epatch ${WORKDIR}/${BROTHERMFCDRIVER}
+		sed -e 's/bh canon/bh brother canon/' -i configure || \
+			die "could not add 'brother' to backend list"
 		epatch ${FILESDIR}/libusbscanner-device-r1.patch
 		:
 	fi
+	epatch ${FILESDIR}/lide25.patch
 }
 
 src_compile() {
+	filter-flags -ffast-math
 	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
 	BACKENDS="${SANE_BACKENDS}" \
 	econf \
 		$(use_enable usb libusb) \
 		$(use_with gphoto2) \
 		$(use_enable ipv6) \
+		--with-group=scanner \
 		${myconf} || die "econf failed"
 
 	emake || die
@@ -105,7 +107,7 @@ src_compile() {
 
 src_install () {
 	einstall docdir=${D}/usr/share/doc/${PF}
-
+	touch ${D}/var/lib/lock/sane/.keep # don't use keepdir, it changes the permissions
 	if use usb; then
 		cd tools/hotplug
 		insinto /etc/hotplug/usb