Added support for Logitech Quickcam Express due to Bug #155416.

Package-Manager: portage-2.1.2_rc1-r7

5 files changed, 121 insertions, 10 deletions

diff --git a/media-video/spca5xx/ChangeLog b/media-video/spca5xx/ChangeLog
index 2aabf188d6ca..202f8a72f860 100644
--- a/media-video/spca5xx/ChangeLog
+++ b/media-video/spca5xx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/spca5xx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/ChangeLog,v 1.25 2006/10/22 15:04:58 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/ChangeLog,v 1.26 2006/11/17 12:03:26 zzam Exp $
+
+*spca5xx-20060501-r2 (17 Nov 2006)
+
+  17 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/spca-20060501-LogitechQC92f.patch, +spca5xx-20060501-r2.ebuild:
+  Added support for Logitech Quickcam Express due to Bug #155416.
 
 *spca5xx-20060501-r1 (22 Oct 2006)
 
diff --git a/media-video/spca5xx/Manifest b/media-video/spca5xx/Manifest
index 650cf4a2235c..8df94d328008 100644
--- a/media-video/spca5xx/Manifest
+++ b/media-video/spca5xx/Manifest
@@ -5,6 +5,10 @@ AUX spca-20060501-2.6.18.patch 433 RMD160 457e16a863a78d0690b27155e7eab53f4af7b8
 MD5 7071693a1c26d7a2d29a33a9e66d7845 files/spca-20060501-2.6.18.patch 433
 RMD160 457e16a863a78d0690b27155e7eab53f4af7b84d files/spca-20060501-2.6.18.patch 433
 SHA256 c8cf5190ec60756eb531a8d0cf2bdb03c55d825daff83d6e5d5b2d0096f317c7 files/spca-20060501-2.6.18.patch 433
+AUX spca-20060501-LogitechQC92f.patch 2160 RMD160 29790567f50958b0f9973b8e51110eacd03ce47e SHA1 73902db6741b0ffb315738474495162bf90bcb13 SHA256 2eb414f70d17fe114b7c303bf30cc40b5f27f49c09e19f69195b18a0233c00c8
+MD5 d051b1e2a069235b120723a83bc36125 files/spca-20060501-LogitechQC92f.patch 2160
+RMD160 29790567f50958b0f9973b8e51110eacd03ce47e files/spca-20060501-LogitechQC92f.patch 2160
+SHA256 2eb414f70d17fe114b7c303bf30cc40b5f27f49c09e19f69195b18a0233c00c8 files/spca-20060501-LogitechQC92f.patch 2160
 AUX spca-20060501-defines.patch 523 RMD160 fb552bb37282516f525c3d0a94907b962cf071dc SHA1 7391dd84ab489375714b0e079aceed66456acf46 SHA256 7f89425e507fd3685dca5f0e980fc83267bec0f0e24c707b6299b5a9a61d93a5
 MD5 2896ecaf4977c19608d10a92ba3d8135 files/spca-20060501-defines.patch 523
 RMD160 fb552bb37282516f525c3d0a94907b962cf071dc files/spca-20060501-defines.patch 523
@@ -29,14 +33,18 @@ EBUILD spca5xx-20060501-r1.ebuild 915 RMD160 74d2c53fd8b7b2f29f9aff8415ae4c00564
 MD5 be7ee62c46dd4dd2eb9574a05831347c spca5xx-20060501-r1.ebuild 915
 RMD160 74d2c53fd8b7b2f29f9aff8415ae4c0056483fa7 spca5xx-20060501-r1.ebuild 915
 SHA256 e9e81c0e9606351ada35d420b00526dc763c357a88bbb4d2f7340b01cc26ab07 spca5xx-20060501-r1.ebuild 915
+EBUILD spca5xx-20060501-r2.ebuild 967 RMD160 8086381cd3aa5d0b7d6f2d34b46f9d331fea939c SHA1 2cb97d4fa955bde071ca8c1b0ff995d0b54a80af SHA256 9ccafac0734a60de1b7a33d4d6ff40dcf5c0eedb5075646010fc4f6a95d212e5
+MD5 57e0c66fa3b2be1c6dfc2275e115f22b spca5xx-20060501-r2.ebuild 967
+RMD160 8086381cd3aa5d0b7d6f2d34b46f9d331fea939c spca5xx-20060501-r2.ebuild 967
+SHA256 9ccafac0734a60de1b7a33d4d6ff40dcf5c0eedb5075646010fc4f6a95d212e5 spca5xx-20060501-r2.ebuild 967
 EBUILD spca5xx-20060501.ebuild 848 RMD160 9e69056fc6a16d5641782bc503a866546cbcf199 SHA1 e1290bb725958800390dd2a83d0d5f016d9d7539 SHA256 61e3789ca18b98f337b492e0f78348273774a04c32b9b835774c082166b978fc
 MD5 674b827a6e25374f13deec09f019dd0c spca5xx-20060501.ebuild 848
 RMD160 9e69056fc6a16d5641782bc503a866546cbcf199 spca5xx-20060501.ebuild 848
 SHA256 61e3789ca18b98f337b492e0f78348273774a04c32b9b835774c082166b978fc spca5xx-20060501.ebuild 848
-MISC ChangeLog 3789 RMD160 ed60cd7426a6186d4cc5720e9755cc0b286e5ace SHA1 58d8416875841a6f9732ba5d8774117b17a38ebf SHA256 83e0febdcb18c7bd79151b1ecc04b58c99855933040598b1a61f76f16b0701b1
-MD5 a797fd970495cbc85544363796b3fe2e ChangeLog 3789
-RMD160 ed60cd7426a6186d4cc5720e9755cc0b286e5ace ChangeLog 3789
-SHA256 83e0febdcb18c7bd79151b1ecc04b58c99855933040598b1a61f76f16b0701b1 ChangeLog 3789
+MISC ChangeLog 4014 RMD160 b5336edb2a8469e0290f2aa6331168b75585449b SHA1 83c21bb8d58f174ecdac7806cbfa0dc349c4566e SHA256 9d1da1e5e1fa526a810aa754eb87efcc1180c3aa67becd53dee3f1203ab07b35
+MD5 c9be70f7f0e7b37ab26ad830710e7749 ChangeLog 4014
+RMD160 b5336edb2a8469e0290f2aa6331168b75585449b ChangeLog 4014
+SHA256 9d1da1e5e1fa526a810aa754eb87efcc1180c3aa67becd53dee3f1203ab07b35 ChangeLog 4014
 MISC metadata.xml 224 RMD160 38404e7e41fb07335d42010dc13acf089800ff81 SHA1 7a8b4b22614bfad69b006ed05d773db39af7194a SHA256 5c462d2f7ca491a9e8be04d0a498050b974c31258b264a3ee7a1495d63780502
 MD5 334e4f71306cef3c0456b8ba59bbbfe8 metadata.xml 224
 RMD160 38404e7e41fb07335d42010dc13acf089800ff81 metadata.xml 224
@@ -56,12 +64,13 @@ SHA256 f19c6d77b0c2e40209575780dcae6e3ecdea36012c668947d85805699f5ddfdd files/di
 MD5 cf47d0f77665bce00f04fd3a0bd0d44a files/digest-spca5xx-20060501-r1 250
 RMD160 3d3f61a3c574a3828520809c3cf7f99bbb1d0de2 files/digest-spca5xx-20060501-r1 250
 SHA256 f19c6d77b0c2e40209575780dcae6e3ecdea36012c668947d85805699f5ddfdd files/digest-spca5xx-20060501-r1 250
+MD5 cf47d0f77665bce00f04fd3a0bd0d44a files/digest-spca5xx-20060501-r2 250
+RMD160 3d3f61a3c574a3828520809c3cf7f99bbb1d0de2 files/digest-spca5xx-20060501-r2 250
+SHA256 f19c6d77b0c2e40209575780dcae6e3ecdea36012c668947d85805699f5ddfdd files/digest-spca5xx-20060501-r2 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iQCVAwUBRTuIzYBrouQZ9K4FAQIDVwQAkx0XCN11W6aLqtqA5FtyCRTh2hX26Bf2
-QW7YzC1Rt7FaZub7bJU8n0ZDKYddTzB63cSacdO26nJ/a5YlOLeZV1CqFVCnywoq
-TH9O9QmSv5eGxNK28sDbZxQFkzVL2Q7o3oeuVhDIUUMnslOQGevE/NQdqeyZOFZN
-g1TPkJ+4UZY=
-=eYpm
+iD8DBQFFXaU8t2vP6XvVdOcRAltdAJ9w3EKzh7KARTHPTEmSI583sFVL4gCgjPsw
+iJpyS2KvE7tUa13NtLaA+rA=
+=1Olb
 -----END PGP SIGNATURE-----
diff --git a/media-video/spca5xx/files/digest-spca5xx-20060501-r2 b/media-video/spca5xx/files/digest-spca5xx-20060501-r2
new file mode 100644
index 000000000000..7700fdc72b15
--- /dev/null
+++ b/media-video/spca5xx/files/digest-spca5xx-20060501-r2
@@ -0,0 +1,3 @@
+MD5 8fcec25715aea10f9ebec5728c37e752 spca5xx-20060501.tar.gz 192817
+RMD160 68997c92f29f4abf7487bd6d80662738aadb6471 spca5xx-20060501.tar.gz 192817
+SHA256 b8049142742cc81bc945aadefb40d173aeb447e428ec62a93e781032ea9b40c2 spca5xx-20060501.tar.gz 192817
diff --git a/media-video/spca5xx/files/spca-20060501-LogitechQC92f.patch b/media-video/spca5xx/files/spca-20060501-LogitechQC92f.patch
new file mode 100644
index 000000000000..41be65d2227e
--- /dev/null
+++ b/media-video/spca5xx/files/spca-20060501-LogitechQC92f.patch
@@ -0,0 +1,54 @@
+diff -ru spca5xx-20060501/drivers/usb/spca561.h spca5xx-20060501-patched/drivers/usb/spca561.h
+--- spca5xx-20060501/drivers/usb/spca561.h	2006-04-21 11:33:24.000000000 +0200
++++ spca5xx-20060501-patched/drivers/usb/spca561.h	2006-11-17 12:52:41.919394762 +0100
+@@ -758,6 +758,7 @@
+     case 0x403b:
+     case 0x092b:
+     case 0x092c:
++    case 0x092f:
+ 	spca50x->chip_revision = Rev012A;
+ 	break;
+     default:
+diff -ru spca5xx-20060501/drivers/usb/spca5xx.c spca5xx-20060501-patched/drivers/usb/spca5xx.c
+--- spca5xx-20060501/drivers/usb/spca5xx.c	2006-04-29 17:38:07.000000000 +0200
++++ spca5xx-20060501-patched/drivers/usb/spca5xx.c	2006-11-17 12:55:08.687320268 +0100
+@@ -432,6 +432,7 @@
+     ToptroIndus,
+     AgfaCl20,
+     LogitechQC92c,
++    LogitechQC92f,
+     SonixWC311P,
+     Concord3045,
+     Mercury21,			//120
+@@ -600,6 +601,7 @@
+     {ToptroIndus, "Toptro Industrial"},
+     {AgfaCl20, "Agfa ephoto CL20"},
+     {LogitechQC92c, "Logitech QuickCam chat"},
++    {LogitechQC92f, "Logitech QuickCam Express"},
+     {SonixWC311P, "Sonix sn9c102P Hv7131R"},
+     {Concord3045, "Concord 3045 spca536a"},
+     {Mercury21, "Mercury Peripherals Inc."},
+@@ -769,6 +771,7 @@
+     {USB_DEVICE(0x2899, 0x012c)},	/* Toptro Industrial */
+     {USB_DEVICE(0x06bd, 0x0404)},	/* Agfa CL20 */
+     {USB_DEVICE(0x046d, 0x092c)},	/* Logitech QC chat Elch2 */
++    {USB_DEVICE(0x046d, 0x092f)},	/* Logitech QC Express */
+     {USB_DEVICE(0x0c45, 0x607c)},	/* Sonix sn9c102p Hv7131R */
+     {USB_DEVICE(0x0733, 0x3261)},	/* Concord 3045 spca536a */
+     {USB_DEVICE(0x0733, 0x1314)},	/* Mercury 2.1MEG Deluxe Classic Cam */
+@@ -4595,6 +4598,15 @@
+ 	    info("USB SPCA5XX camera found.Logitech QuickCam chat (SPCA561A)");
+ 	    memcpy(&spca50x->funct,&fspca561,sizeof(struct cam_operation));
+ 	    break;
++	case 0x092f:
++	    spca50x->desc = LogitechQC92f;
++	    spca50x->bridge = BRIDGE_SPCA561;
++	    spca50x->sensor = SENSOR_INTERNAL;
++
++	    spca50x->cameratype = S561;
++	    info("USB SPCA5XX camera found.Logitech QuickCam Express (SPCA561A)");
++	    memcpy(&spca50x->funct,&fspca561,sizeof(struct cam_operation));
++	    break;
+ 	default:
+ 	    goto error;
+ 	};
diff --git a/media-video/spca5xx/spca5xx-20060501-r2.ebuild b/media-video/spca5xx/spca5xx-20060501-r2.ebuild
new file mode 100644
index 000000000000..457ecd2ab7aa
--- /dev/null
+++ b/media-video/spca5xx/spca5xx-20060501-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20060501-r2.ebuild,v 1.1 2006/11/17 12:03:26 zzam Exp $
+
+inherit linux-mod
+
+DESCRIPTION="spca5xx driver for webcams."
+HOMEPAGE="http://mxhaard.free.fr/spca5xx.html"
+SRC_URI="http://mxhaard.free.fr/spca50x/Download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT=""
+DEPEND=""
+RDEPEND=""
+
+MODULE_NAMES="spca5xx(usb/video:)"
+BUILD_TARGETS="default"
+CONFIG_CHECK="VIDEO_DEV VIDEO_V4L1_COMPAT"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	convert_to_m ${S}/Makefile
+	cd "${S}"
+	epatch "${FILESDIR}"/spca-20060501-defines.patch
+	epatch "${FILESDIR}"/spca-20060501-2.6.18.patch
+	epatch "${FILESDIR}"/spca-20060501-LogitechQC92f.patch
+}
+
+src_install() {
+	dodoc CHANGELOG INSTALL README
+	linux-mod_src_install
+}