rpms/kernel/F-12 linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch, NONE, 1.1 config-generic, 1.340, 1.341 kernel.spec, 1.1992, 1.1993
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Jan 24 19:39:08 UTC 2010
- Previous message: rpms/php-channel-phpmd/F-11 channel.xml, NONE, 1.1 import.log, NONE, 1.1 php-channel-phpmd.spec, NONE, 1.1
- Next message: rpms/milia/F-12 import.log, NONE, 1.1 milia.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8081
Modified Files:
config-generic kernel.spec
Added Files:
linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch
Log Message:
* Sun Jan 24 2010 Hans de Goede <hdegoede at redhat.com> 2.6.32.5-33
- Rebase gspca usb webcam driver + sub drivers to latest upstream, this
adds support for the following webcam bridge chipsets:
benq, cpia1, ovfx2, sn9c2028, w996xCF, stv0680;
and also includes many many bugfixes (hopefully also fixes 531234)
linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch:
b/Documentation/video4linux/gspca.txt | 69
b/drivers/media/video/gspca/Kconfig | 69
b/drivers/media/video/gspca/Makefile | 12
b/drivers/media/video/gspca/benq.c | 322 ++
b/drivers/media/video/gspca/conex.c | 20
b/drivers/media/video/gspca/cpia1.c | 2022 ++++++++++++++++++
b/drivers/media/video/gspca/etoms.c | 18
b/drivers/media/video/gspca/finepix.c | 23
b/drivers/media/video/gspca/gl860/gl860-mi1320.c | 57
b/drivers/media/video/gspca/gl860/gl860-mi2020.c | 71
b/drivers/media/video/gspca/gl860/gl860-ov2640.c | 140 -
b/drivers/media/video/gspca/gl860/gl860-ov9655.c | 43
b/drivers/media/video/gspca/gl860/gl860.c | 81
b/drivers/media/video/gspca/gl860/gl860.h | 7
b/drivers/media/video/gspca/gspca.c | 225 +-
b/drivers/media/video/gspca/gspca.h | 35
b/drivers/media/video/gspca/jeilinj.c | 34
b/drivers/media/video/gspca/m5602/m5602_core.c | 29
b/drivers/media/video/gspca/m5602/m5602_mt9m111.c | 4
b/drivers/media/video/gspca/m5602/m5602_ov7660.c | 2
b/drivers/media/video/gspca/m5602/m5602_ov7660.h | 2
b/drivers/media/video/gspca/m5602/m5602_ov9650.c | 4
b/drivers/media/video/gspca/m5602/m5602_po1030.c | 2
b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 18
b/drivers/media/video/gspca/m5602/m5602_s5k83a.c | 2
b/drivers/media/video/gspca/mars.c | 13
b/drivers/media/video/gspca/mr97310a.c | 615 +++--
b/drivers/media/video/gspca/ov519.c | 1590 ++++++++++++--
b/drivers/media/video/gspca/ov534.c | 1330 ++++++-----
b/drivers/media/video/gspca/ov534_9.c | 1477 +++++++++++++
b/drivers/media/video/gspca/pac207.c | 15
b/drivers/media/video/gspca/pac7302.c | 1237 +++++++++++
b/drivers/media/video/gspca/pac7311.c | 623 +----
b/drivers/media/video/gspca/pac_common.h | 91
b/drivers/media/video/gspca/sn9c2028.c | 757 ++++++
b/drivers/media/video/gspca/sn9c2028.h | 51
b/drivers/media/video/gspca/sn9c20x.c | 56
b/drivers/media/video/gspca/sonixb.c | 58
b/drivers/media/video/gspca/sonixj.c | 966 +++++---
b/drivers/media/video/gspca/spca500.c | 15
b/drivers/media/video/gspca/spca501.c | 16
b/drivers/media/video/gspca/spca505.c | 12
b/drivers/media/video/gspca/spca506.c | 20
b/drivers/media/video/gspca/spca508.c | 12
b/drivers/media/video/gspca/spca561.c | 18
b/drivers/media/video/gspca/sq905.c | 75
b/drivers/media/video/gspca/sq905c.c | 76
b/drivers/media/video/gspca/stk014.c | 119 -
b/drivers/media/video/gspca/stv0680.c | 394 +++
b/drivers/media/video/gspca/stv06xx/stv06xx.c | 14
b/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 1
b/drivers/media/video/gspca/sunplus.c | 301 +-
b/drivers/media/video/gspca/t613.c | 9
b/drivers/media/video/gspca/tv8532.c | 9
b/drivers/media/video/gspca/vc032x.c | 736 +++++-
b/drivers/media/video/gspca/w996Xcf.c | 609 +++++
b/drivers/media/video/gspca/zc3xx.c | 2119 +++++++------------
linux-2.6.32.x86_64/include/linux/videodev2.h | 15
58 files changed, 12849 insertions(+), 3911 deletions(-)
--- NEW FILE linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch ---
>From 31d1be24a90cd40752b68aa4bbe6bfe8facbd566 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Sun, 24 Jan 2010 13:43:06 +0100
Subject: [PATCH] Rebase gspca to latest upstream
This adds support for the following webcam bridge chipsets:
benq, cpia1, ovfx2, sn9c2028, w996xCF, stv0680
And also includes many many bugfixes.
---
Documentation/video4linux/gspca.txt | 69 +-
drivers/media/video/gspca/Kconfig | 69 +-
drivers/media/video/gspca/Makefile | 12 +
drivers/media/video/gspca/benq.c | 330 +++
drivers/media/video/gspca/conex.c | 20 +-
drivers/media/video/gspca/cpia1.c | 2022 +++++++++++++++++++
drivers/media/video/gspca/etoms.c | 18 +-
drivers/media/video/gspca/finepix.c | 23 +-
drivers/media/video/gspca/gl860/gl860-mi1320.c | 57 +-
drivers/media/video/gspca/gl860/gl860-mi2020.c | 71 +-
drivers/media/video/gspca/gl860/gl860-ov2640.c | 140 +-
drivers/media/video/gspca/gl860/gl860-ov9655.c | 43 +-
drivers/media/video/gspca/gl860/gl860.c | 85 +-
drivers/media/video/gspca/gl860/gl860.h | 7 +-
drivers/media/video/gspca/gspca.c | 231 ++-
drivers/media/video/gspca/gspca.h | 35 +-
drivers/media/video/gspca/jeilinj.c | 34 +-
drivers/media/video/gspca/m5602/m5602_core.c | 29 +-
drivers/media/video/gspca/m5602/m5602_mt9m111.c | 4 +-
drivers/media/video/gspca/m5602/m5602_ov7660.c | 2 +-
drivers/media/video/gspca/m5602/m5602_ov7660.h | 2 +-
drivers/media/video/gspca/m5602/m5602_ov9650.c | 4 +-
drivers/media/video/gspca/m5602/m5602_po1030.c | 2 +-
drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 18 +-
drivers/media/video/gspca/m5602/m5602_s5k83a.c | 2 +-
drivers/media/video/gspca/mars.c | 13 +-
drivers/media/video/gspca/mr97310a.c | 615 ++++---
drivers/media/video/gspca/ov519.c | 1590 +++++++++++++--
drivers/media/video/gspca/ov534.c | 1330 +++++++-----
drivers/media/video/gspca/ov534_9.c | 1477 ++++++++++++++
drivers/media/video/gspca/pac207.c | 15 +-
drivers/media/video/gspca/pac7302.c | 1237 ++++++++++++
drivers/media/video/gspca/pac7311.c | 623 ++----
drivers/media/video/gspca/pac_common.h | 91 +-
drivers/media/video/gspca/sn9c2028.c | 757 +++++++
drivers/media/video/gspca/sn9c2028.h | 51 +
drivers/media/video/gspca/sn9c20x.c | 56 +-
drivers/media/video/gspca/sonixb.c | 58 +-
drivers/media/video/gspca/sonixj.c | 966 ++++++---
drivers/media/video/gspca/spca500.c | 15 +-
drivers/media/video/gspca/spca501.c | 16 +-
drivers/media/video/gspca/spca505.c | 12 +-
drivers/media/video/gspca/spca506.c | 20 +-
drivers/media/video/gspca/spca508.c | 12 +-
drivers/media/video/gspca/spca561.c | 18 +-
drivers/media/video/gspca/sq905.c | 75 +-
drivers/media/video/gspca/sq905c.c | 76 +-
drivers/media/video/gspca/stk014.c | 119 +-
drivers/media/video/gspca/stv0680.c | 394 ++++
drivers/media/video/gspca/stv06xx/stv06xx.c | 14 +-
drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 1 +
drivers/media/video/gspca/sunplus.c | 301 ++--
drivers/media/video/gspca/t613.c | 9 +-
drivers/media/video/gspca/tv8532.c | 9 +-
drivers/media/video/gspca/vc032x.c | 736 ++++++-
drivers/media/video/gspca/w996Xcf.c | 609 ++++++
drivers/media/video/gspca/zc3xx.c | 2118 ++++++++------------
57 files changed, 12850 insertions(+), 3912 deletions(-)
create mode 100644 drivers/media/video/gspca/benq.c
create mode 100644 drivers/media/video/gspca/cpia1.c
create mode 100644 drivers/media/video/gspca/ov534_9.c
create mode 100644 drivers/media/video/gspca/pac7302.c
create mode 100644 drivers/media/video/gspca/sn9c2028.c
create mode 100644 drivers/media/video/gspca/sn9c2028.h
create mode 100644 drivers/media/video/gspca/stv0680.c
create mode 100644 drivers/media/video/gspca/w996Xcf.c
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 90e85a8..939dda9 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -6,11 +6,13 @@ The modules are:
xxxx vend:prod
----
-spca501 0000:0000 MystFromOri Unknow Camera
+spca501 0000:0000 MystFromOri Unknown Camera
+spca508 0130:0130 Clone Digital Webcam 11043
m5602 0402:5602 ALi Video Camera Controller
spca501 040a:0002 Kodak DVC-325
spca500 040a:0300 Kodak EZ200
zc3xx 041e:041e Creative WebCam Live!
+ov519 041e:4003 Video Blaster WebCam Go Plus
spca500 041e:400a Creative PC-CAM 300
sunplus 041e:400b Creative PC-CAM 600
sunplus 041e:4012 PC-Cam350
@@ -40,6 +42,7 @@ ov519 041e:4064 Creative Live! VISTA VF0420
ov519 041e:4067 Creative Live! Cam Video IM (VF0350)
ov519 041e:4068 Creative Live! VISTA VF0470
spca561 0458:7004 Genius VideoCAM Express V2
+sn9c2028 0458:7005 Genius Smart 300, version 2
sunplus 0458:7006 Genius Dsc 1.3 Smart
zc3xx 0458:7007 Genius VideoCam V2
zc3xx 0458:700c Genius VideoCam V3
@@ -69,12 +72,12 @@ zc3xx 046d:08a3 Logitech QC Chat
zc3xx 046d:08a6 Logitech QCim
zc3xx 046d:08a7 Logitech QuickCam Image
zc3xx 046d:08a9 Logitech Notebook Deluxe
-zc3xx 046d:08aa Labtec Webcam Notebook
+zc3xx 046d:08aa Labtec Webcam Notebook
zc3xx 046d:08ac Logitech QuickCam Cool
zc3xx 046d:08ad Logitech QCCommunicate STX
zc3xx 046d:08ae Logitech QuickCam for Notebooks
zc3xx 046d:08af Logitech QuickCam Cool
-zc3xx 046d:08b9 Logitech QC IM ???
+zc3xx 046d:08b9 Logitech QuickCam Express
zc3xx 046d:08d7 Logitech QCam STX
zc3xx 046d:08d9 Logitech QuickCam IM/Connect
zc3xx 046d:08d8 Logitech Notebook Deluxe
@@ -83,7 +86,7 @@ zc3xx 046d:08dd Logitech QuickCam for Notebooks
spca500 046d:0900 Logitech Inc. ClickSmart 310
spca500 046d:0901 Logitech Inc. ClickSmart 510
sunplus 046d:0905 Logitech ClickSmart 820
-tv8532 046d:0920 QC Express
+tv8532 046d:0920 Logitech QuickCam Express
tv8532 046d:0921 Labtec Webcam
spca561 046d:0928 Logitech QC Express Etch2
spca561 046d:0929 Labtec Webcam Elch2
@@ -92,7 +95,7 @@ spca561 046d:092b Labtec Webcam Plus
spca561 046d:092c Logitech QC chat Elch2
spca561 046d:092d Logitech QC Elch2
spca561 046d:092e Logitech QC Elch2
-spca561 046d:092f Logitech QuickCam Express Plus
+spca561 046d:092f Logitech QuickCam Express Plus
sunplus 046d:0960 Logitech ClickSmart 420
sunplus 0471:0322 Philips DMVC1300K
zc3xx 0471:0325 Philips SPC 200 NC
@@ -107,6 +110,7 @@ sunplus 04a5:3003 Benq DC 1300
sunplus 04a5:3008 Benq DC 1500
sunplus 04a5:300a Benq DC 3410
spca500 04a5:300c Benq DC 1016
+benq 04a5:3035 Benq DC E300
finepix 04cb:0104 Fujifilm FinePix 4800
finepix 04cb:0109 Fujifilm FinePix A202
finepix 04cb:010b Fujifilm FinePix A203
@@ -140,6 +144,7 @@ sunplus 04fc:5360 Sunplus Generic
spca500 04fc:7333 PalmPixDC85
sunplus 04fc:ffff Pure DigitalDakota
spca501 0506:00df 3Com HomeConnect Lite
+sunplus 052b:1507 Megapixel 5 Pretec DC-1007
sunplus 052b:1513 Megapix V4
sunplus 052b:1803 MegaImage VI
tv8532 0545:808b Veo Stingray
@@ -149,6 +154,7 @@ sunplus 0546:3191 Polaroid Ion 80
sunplus 0546:3273 Polaroid PDC2030
ov519 054c:0154 Sonny toy4
ov519 054c:0155 Sonny toy5
+cpia1 0553:0002 CPIA CPiA (version1) based cameras
zc3xx 055f:c005 Mustek Wcam300A
spca500 055f:c200 Mustek Gsmart 300
sunplus 055f:c211 Kowa Bs888e Microcamera
@@ -167,10 +173,14 @@ sunplus 055f:c650 Mustek MDC5500Z
zc3xx 055f:d003 Mustek WCam300A
zc3xx 055f:d004 Mustek WCam300 AN
conex 0572:0041 Creative Notebook cx11646
+ov519 05a9:0511 Video Blaster WebCam 3/WebCam Plus, D-Link USB Digital Video Camera
+ov519 05a9:0518 Creative WebCam
ov519 05a9:0519 OV519 Microphone
ov519 05a9:0530 OmniVision
+ov519 05a9:2800 OmniVision SuperCAM
ov519 05a9:4519 Webcam Classic
ov519 05a9:8519 OmniVision
+ov519 05a9:a511 D-Link USB Digital Video Camera
ov519 05a9:a518 D-Link DSB-C310 Webcam
sunplus 05da:1018 Digital Dream Enigma 1.3
stk014 05e1:0893 Syntek DV4000
@@ -182,13 +192,11 @@ spca500 06bd:0404 Agfa CL20
spca500 06be:0800 Optimedia
sunplus 06d6:0031 Trust 610 LCD PowerC at m Zoom
spca506 06e1:a190 ADS Instant VCD
-ov534 06f8:3002 Hercules Blog Webcam
-ov534 06f8:3003 Hercules Dualpix HD Weblog
+ov534_9 06f8:3003 Hercules Dualpix HD Weblog
sonixj 06f8:3004 Hercules Classic Silver
sonixj 06f8:3008 Hercules Deluxe Optical Glass
-pac7311 06f8:3009 Hercules Classic Link
+pac7302 06f8:3009 Hercules Classic Link
spca508 0733:0110 ViewQuest VQ110
-spca508 0130:0130 Clone Digital Webcam 11043
spca501 0733:0401 Intel Create and Share
spca501 0733:0402 ViewQuest M318B
spca505 0733:0430 Intel PC Camera Pro
@@ -199,10 +207,13 @@ sunplus 0733:2221 Mercury Digital Pro 3.1p
sunplus 0733:3261 Concord 3045 spca536a
sunplus 0733:3281 Cyberpix S550V
spca506 0734:043b 3DeMon USB Capture aka
+cpia1 0813:0001 QX3 camera
+ov519 0813:0002 Dual Mode USB Camera Plus
spca500 084d:0003 D-Link DSC-350
[...23580 lines suppressed...]
- zc3_init = init_tb[(int) sd->sensor][mode];
+ mode = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;
switch (sd->sensor) {
case SENSOR_HV7131C:
zcxx_probeSensor(gspca_dev);
@@ -7258,36 +6876,31 @@ static int sd_start(struct gspca_dev *gspca_dev)
case SENSOR_PAS106:
usb_exchange(gspca_dev, pas106b_Initial_com);
break;
- case SENSOR_PB0330:
- if (mode) {
- if (sd->chip_revision == 0xc001
- || sd->chip_revision == 0xe001
- || sd->chip_revision == 0x8001)
- zc3_init = pb03303x_Initial;
- } else {
- if (sd->chip_revision == 0xc001
- || sd->chip_revision == 0xe001
- || sd->chip_revision == 0x8001)
- zc3_init = pb03303x_InitialScale;
- }
- break;
}
- usb_exchange(gspca_dev, zc3_init);
+ usb_exchange(gspca_dev, init_tb[sd->sensor][mode]);
switch (sd->sensor) {
case SENSOR_ADCM2700:
case SENSOR_GC0305:
case SENSOR_OV7620:
case SENSOR_PO2030:
+ case SENSOR_TAS5130CXX:
case SENSOR_TAS5130C_VF0250:
/* msleep(100); * ?? */
reg_r(gspca_dev, 0x0002); /* --> 0x40 */
reg_w(dev, 0x09, 0x01ad); /* (from win traces) */
reg_w(dev, 0x15, 0x01ae);
+ if (sd->sensor == SENSOR_TAS5130CXX)
+ break;
reg_w(dev, 0x0d, 0x003a);
reg_w(dev, 0x02, 0x003b);
reg_w(dev, 0x00, 0x0038);
break;
+ case SENSOR_PAS202B:
+ reg_w(dev, 0x03, 0x003b);
+ reg_w(dev, 0x0c, 0x003a);
+ reg_w(dev, 0x0b, 0x0039);
+ break;
}
setmatrix(gspca_dev);
@@ -7300,6 +6913,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
break;
case SENSOR_PAS202B:
case SENSOR_GC0305:
+ case SENSOR_TAS5130CXX:
reg_r(gspca_dev, 0x0008);
/* fall thru */
case SENSOR_PO2030:
@@ -7310,10 +6924,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
/* set the gamma tables when not set */
switch (sd->sensor) {
- case SENSOR_CS2102: /* gamma set in xxx_Initial */
- case SENSOR_CS2102K:
+ case SENSOR_CS2102K: /* gamma set in xxx_Initial */
case SENSOR_HDCS2020b:
- case SENSOR_PB0330: /* pb with chip_revision - see above */
case SENSOR_OV7630C:
case SENSOR_TAS5130CK:
break;
@@ -7343,6 +6955,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
reg_w(dev, 0x40, 0x0117);
break;
case SENSOR_GC0305:
+ case SENSOR_TAS5130CXX:
reg_w(dev, 0x09, 0x01ad); /* (from win traces) */
reg_w(dev, 0x15, 0x01ae);
/* fall thru */
@@ -7365,14 +6978,14 @@ static int sd_start(struct gspca_dev *gspca_dev)
setautogain(gspca_dev);
switch (sd->sensor) {
case SENSOR_PO2030:
- msleep(500);
- reg_r(gspca_dev, 0x0008);
- reg_r(gspca_dev, 0x0007);
- /*fall thru*/
- case SENSOR_PAS202B:
+ msleep(50);
reg_w(dev, 0x00, 0x0007); /* (from win traces) */
reg_w(dev, 0x02, ZC3XX_R008_CLOCKSETTING);
break;
+ case SENSOR_PAS202B:
+ reg_w(dev, 0x32, 0x0007); /* (from win traces) */
+ reg_w(dev, 0x02, ZC3XX_R008_CLOCKSETTING);
+ break;
}
return 0;
}
@@ -7389,17 +7002,16 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
}
static void sd_pkt_scan(struct gspca_dev *gspca_dev,
- struct gspca_frame *frame,
- __u8 *data,
+ u8 *data,
int len)
{
struct sd *sd = (struct sd *) gspca_dev;
if (data[0] == 0xff && data[1] == 0xd8) { /* start of frame */
- frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
- data, 0);
+ gspca_frame_add(gspca_dev, LAST_PACKET,
+ NULL, 0);
/* put the JPEG header in the new frame */
- gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+ gspca_frame_add(gspca_dev, FIRST_PACKET,
sd->jpeg_hdr, JPEG_HDR_SZ);
/* remove the webcam's header:
@@ -7411,7 +7023,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
data += 18;
len -= 18;
}
- gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
+ gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
}
static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
@@ -7636,7 +7248,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
{USB_DEVICE(0x0ac8, 0x0302), .driver_info = SENSOR_PAS106},
{USB_DEVICE(0x0ac8, 0x301b)},
{USB_DEVICE(0x0ac8, 0x303b)},
- {USB_DEVICE(0x0ac8, 0x305b), .driver_info = SENSOR_TAS5130C_VF0250},
+ {USB_DEVICE(0x0ac8, 0x305b)},
{USB_DEVICE(0x0ac8, 0x307b)},
{USB_DEVICE(0x10fd, 0x0128)},
{USB_DEVICE(0x10fd, 0x804d)},
--
1.6.5.2
diff -up linux-2.6.32.x86_64/include/linux/videodev2.h.gspca linux-2.6.32.x86_64/include/linux/videodev2.h
--- linux-2.6.32.x86_64/include/linux/videodev2.h.gspca 2009-12-03 04:51:21.000000000 +0100
+++ linux-2.6.32.x86_64/include/linux/videodev2.h 2010-01-24 15:35:49.000000000 +0100
@@ -294,6 +294,7 @@ struct v4l2_pix_format {
/* Grey formats */
#define V4L2_PIX_FMT_GREY v4l2_fourcc('G', 'R', 'E', 'Y') /* 8 Greyscale */
+#define V4L2_PIX_FMT_Y10 v4l2_fourcc('Y', '1', '0', ' ') /* 10 Greyscale */
#define V4L2_PIX_FMT_Y16 v4l2_fourcc('Y', '1', '6', ' ') /* 16 Greyscale */
/* Palette formats */
@@ -329,7 +330,11 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */
#define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G', 'B', 'R', 'G') /* 8 GBGB.. RGRG.. */
#define V4L2_PIX_FMT_SGRBG8 v4l2_fourcc('G', 'R', 'B', 'G') /* 8 GRGR.. BGBG.. */
-#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10bit raw bayer */
+#define V4L2_PIX_FMT_SRGGB8 v4l2_fourcc('R', 'G', 'G', 'B') /* 8 RGRG.. GBGB.. */
+#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10 BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10 GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10 GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10 RGRG.. GBGB.. */
/* 10bit raw bayer DPCM compressed to 8 bits */
#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
/*
@@ -345,6 +350,7 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 */
/* Vendor-specific formats */
+#define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
@@ -357,10 +363,13 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_SPCA561 v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
#define V4L2_PIX_FMT_PAC207 v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
+#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */
#define V4L2_PIX_FMT_SQ905C v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
#define V4L2_PIX_FMT_PJPG v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
#define V4L2_PIX_FMT_OV511 v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
#define V4L2_PIX_FMT_OV518 v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
+#define V4L2_PIX_FMT_STV0680 v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
+#define V4L2_PIX_FMT_TM6000 v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
/*
* F O R M A T E N U M E R A T I O N
@@ -912,8 +1028,10 @@ enum v4l2_colorfx {
#define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32)
#define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33)
+#define V4L2_CID_ROTATE (V4L2_CID_BASE+34)
+#define V4L2_CID_BG_COLOR (V4L2_CID_BASE+35)
/* last CID + 1 */
-#define V4L2_CID_LASTP1 (V4L2_CID_BASE+34)
+#define V4L2_CID_LASTP1 (V4L2_CID_BASE+36)
/* MPEG-class control IDs defined by V4L2 */
#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-generic,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- config-generic 20 Jan 2010 15:50:31 -0000 1.340
+++ config-generic 24 Jan 2010 19:39:08 -0000 1.341
@@ -2256,9 +2256,9 @@ CONFIG_VIDEO_BT848=m
CONFIG_VIDEO_BT848_DVB=y
CONFIG_VIDEO_BWQCAM=m
# CONFIG_VIDEO_CAFE_CCIC is not set
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA_PP is not set
+# CONFIG_VIDEO_CPIA_USB is not set
CONFIG_VIDEO_CPIA2=m
CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_CX23885=m
@@ -2279,7 +2279,7 @@ CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_IVTV=m
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_OVCAMCHIP=m
+# CONFIG_VIDEO_OVCAMCHIP is not set
CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_SAA5246A=m
@@ -2766,19 +2766,24 @@ CONFIG_USB_DABUSB=m
CONFIG_USB_VICAM=m
CONFIG_USB_DSBR=m
-CONFIG_USB_ET61X251=m
+# CONFIG_USB_ET61X251 is not set
CONFIG_USB_M5602=m
CONFIG_USB_STV06XX=m
CONFIG_USB_GSPCA=m
CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_BENQ=m
CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
CONFIG_USB_GSPCA_ETOMS=m
CONFIG_USB_GSPCA_FINEPIX=m
CONFIG_USB_GSPCA_MARS=m
CONFIG_USB_GSPCA_OV519=m
CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
CONFIG_USB_GSPCA_SN9C20X=m
CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
CONFIG_USB_GSPCA_SONIXB=m
@@ -2790,6 +2795,7 @@ CONFIG_USB_GSPCA_SPCA506=m
CONFIG_USB_GSPCA_SPCA508=m
CONFIG_USB_GSPCA_SPCA561=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
CONFIG_USB_GSPCA_TV8532=m
@@ -2806,8 +2812,8 @@ CONFIG_USB_KONICAWC=m
CONFIG_USB_S2255=m
CONFIG_USB_SE401=m
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-CONFIG_USB_STV680=m
-CONFIG_USB_SN9C102=m
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_SN9C102 is not set
CONFIG_USB_ZR364XX=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_MT9M001=m
@@ -2980,7 +2986,7 @@ CONFIG_USB_STKWEBCAM=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_U132_HCD=m
CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_W9968CF=m
+$ CONFIG_USB_W9968CF is not set
CONFIG_USB_XUSBATM=m
# CONFIG_USB_ZC0301 is not set
CONFIG_USB_ZERO=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1992
retrieving revision 1.1993
diff -u -p -r1.1992 -r1.1993
--- kernel.spec 23 Jan 2010 03:04:34 -0000 1.1992
+++ kernel.spec 24 Jan 2010 19:39:08 -0000 1.1993
@@ -725,6 +725,7 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch
Patch2900: linux-2.6-v4l-dvb-update.patch
Patch2901: linux-2.6-v4l-dvb-experimental.patch
Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
+Patch2904: linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch
# fs fixes
@@ -1362,6 +1363,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl
#ApplyPatch linux-2.6-v4l-dvb-update.patch
#ApplyPatch linux-2.6-v4l-dvb-experimental.patch
#ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
+ApplyPatch linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch
# Patches headed upstream
ApplyPatch linux-2.6-rfkill-all.patch
@@ -2027,6 +2029,12 @@ fi
# and build.
%changelog
+* Sun Jan 24 2010 Hans de Goede <hdegoede at redhat.com> 2.6.32.5-33
+- Rebase gspca usb webcam driver + sub drivers to latest upstream, this
+ adds support for the following webcam bridge chipsets:
+ benq, cpia1, ovfx2, sn9c2028, w996xCF, stv0680;
+ and also includes many many bugfixes (hopefully also fixes 531234)
+
* Sat Jan 23 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.5-32
- Linux 2.6.32.5
- Revert commit c7c85101afd0cb8ce497456d12ee1cad4aad152f from
- Previous message: rpms/php-channel-phpmd/F-11 channel.xml, NONE, 1.1 import.log, NONE, 1.1 php-channel-phpmd.spec, NONE, 1.1
- Next message: rpms/milia/F-12 import.log, NONE, 1.1 milia.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list