Updated spca5 to version 0.60. In this patch also preliminary support

trough trough the added patch for the Logitech QuickCam Express.

5 files changed, 78 insertions, 12 deletions

diff --git a/graphics/spcaview/Makefile b/graphics/spcaview/Makefile
index bf796793c7f..1ea151bcf4a 100644
--- a/graphics/spcaview/Makefile
+++ b/graphics/spcaview/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2006/10/22 21:14:46 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/11/13 19:27:27 reinoud Exp $
 #
 
-DISTNAME=	spca5xx-20060301
-PKGNAME=	spcaview-0.5a
-PKGREVISION=	1
+DISTNAME=	spca5xx-20060402
+PKGNAME=	spcaview-0.60
+#PKGREVISION=	1
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://mxhaard.free.fr/spca50x/Download/
 
 PATCH_SITES=	http://www.medias.ne.jp/~takam/bsd/
-PATCHFILES= 	spca5xx-bsd-0.5a.patch.gz
+PATCHFILES= 	spca5xx-bsd-0.6a.patch.gz
 PATCH_DIST_STRIP=	-p3
 
 MAINTAINER=	hamajima@NetBSD.org
diff --git a/graphics/spcaview/distinfo b/graphics/spcaview/distinfo
index 5966b1fe692..e2ecee9f78e 100644
--- a/graphics/spcaview/distinfo
+++ b/graphics/spcaview/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.3 2006/03/29 14:09:44 hamajima Exp $
+$NetBSD: distinfo,v 1.4 2006/11/13 19:27:27 reinoud Exp $
 
-SHA1 (spca5xx-20060301.tar.gz) = a05611f83c7d57f1ed1deed93685b2c9d9976313
-RMD160 (spca5xx-20060301.tar.gz) = 02e2cfd8952dcebde0f8b9a87d27a13627d354bc
-Size (spca5xx-20060301.tar.gz) = 194600 bytes
-SHA1 (spca5xx-bsd-0.5a.patch.gz) = 8ba458c84ef44b837ab5c26348a72b3d936675cc
-RMD160 (spca5xx-bsd-0.5a.patch.gz) = 18450b62ff5b4a310794b6ccb0ad6e48bfbc97c7
-Size (spca5xx-bsd-0.5a.patch.gz) = 30433 bytes
+SHA1 (spca5xx-20060402.tar.gz) = 630378040d386aa5d11836d3a89a8b0c8cb78e2a
+RMD160 (spca5xx-20060402.tar.gz) = 8b18c6e6ce4b394ce657f8abc32a202d66736b3e
+Size (spca5xx-20060402.tar.gz) = 195622 bytes
+SHA1 (spca5xx-bsd-0.6a.patch.gz) = a33c08bb4c213f710baace8885b95565d8355c4a
+RMD160 (spca5xx-bsd-0.6a.patch.gz) = 70e931ddbd467aedc734b6495906908c03191cc4
+Size (spca5xx-bsd-0.6a.patch.gz) = 31203 bytes
+SHA1 (patch-aa) = 2e3bbf8364479c6c7aee071e24b9af1181e077e3
+SHA1 (patch-ab) = db1b0c8c573fec4ca176cddb8497262f53153301
+SHA1 (patch-ac) = 068b045ff8b9ae84c232818b356bb24328f0452f
diff --git a/graphics/spcaview/patches/patch-aa b/graphics/spcaview/patches/patch-aa
new file mode 100644
index 00000000000..23f7f6757f9
--- /dev/null
+++ b/graphics/spcaview/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.3 2006/11/13 19:27:28 reinoud Exp $
+
+--- spca561.h.orig	2006-11-13 17:01:02.000000000 +0100
++++ spca561.h
+@@ -735,6 +735,7 @@ static int spca561_config(struct usb_spc
+     case 0x403b:
+     case 0x092b:
+     case 0x092c:
++    case 0x092f:
+ 	spca50x->chip_revision = Rev012A;
+ 	break;
+     default:
diff --git a/graphics/spcaview/patches/patch-ab b/graphics/spcaview/patches/patch-ab
new file mode 100644
index 00000000000..fe954531187
--- /dev/null
+++ b/graphics/spcaview/patches/patch-ab
@@ -0,0 +1,38 @@
+$NetBSD: patch-ab,v 1.3 2006/11/13 19:27:28 reinoud Exp $
+
+--- spca5xx.c.orig	2006-11-13 17:01:02.000000000 +0100
++++ spca5xx.c
+@@ -462,6 +462,7 @@ enum {
+     PhilipsSPC600NC,
+     PhilipsSPC300NC,
+     Sonix6019,
++    LogitechQC92f,
+     LastCamera
+ };
+ static struct cam_list clist[] = {
+@@ -624,6 +625,7 @@ static struct cam_list clist[] = {
+     {PhilipsSPC600NC, "Philips SPC600NC "},
+     {PhilipsSPC300NC, "Philips SPC300NC "},
+     {Sonix6019, "Sonix VGA Ov7630 "},
++    {LogitechQC92f, "Logitech QuickCam express"},
+     {-1, NULL}
+ };
+ 
+@@ -7301,6 +7303,17 @@ static int spcaDetectCamera(struct usb_s
+ 	    spca50x->cameratype = S561;
+ 	    info("USB SPCA5XX camera found.Logitech QuickCam chat (SPCA561A)");
+ 	    break;
++	case 0x092f:
++	    spca50x->desc = LogitechQC92f;
++	    spca50x->bridge = BRIDGE_SPCA561;
++	    spca50x->sensor = SENSOR_INTERNAL;
++	    spca50x->header_len = SPCA561_OFFSET_DATA;
++	    spca50x->i2c_ctrl_reg = SPCA50X_REG_I2C_CTRL;
++	    spca50x->i2c_base = SPCA561_INDEX_I2C_BASE;
++	    spca50x->i2c_trigger_on_write = 1;
++	    spca50x->cameratype = S561;
++	    info("USB SPCA5XX camera found.Logitech QuickCam express (SPCA561A)");
++	    break;
+ 	default:
+ 	    goto error;
+ 	};
diff --git a/graphics/spcaview/patches/patch-ac b/graphics/spcaview/patches/patch-ac
new file mode 100644
index 00000000000..3bcf2e90acf
--- /dev/null
+++ b/graphics/spcaview/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2006/11/13 19:27:28 reinoud Exp $
+
+--- spca5view.c.orig	2006-11-13 19:19:36.000000000 +0100
++++ spca5view.c
+@@ -80,7 +80,7 @@ GdkImlibImage *get_new_frame(GdkImlibIma
+ void do_pushkey(int key);
+ 
+ static int infflag = 0;
+-static int vflag  = 0;	/* virtical */
++int        vflag  = 0;	/* virtical */
+ static int bcflag = 0;	/* brightness/contrast */
+ #define	BFLAG	0x01
+ #define	CFLAG	0x02