rpms/kernel/F-12 patch-2.6.32.6.bz2.sign, NONE, 1.1 .cvsignore, 1.1142, 1.1143 kernel.spec, 1.1994, 1.1995 linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch, 1.1, 1.2 sources, 1.1100, 1.1101 upstream, 1.1014, 1.1015 patch-2.6.32.5.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Mon Jan 25 21:38:23 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv987
Modified Files:
.cvsignore kernel.spec
linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch sources
upstream
Added Files:
patch-2.6.32.6.bz2.sign
Removed Files:
patch-2.6.32.5.bz2.sign
Log Message:
* Mon Jan 25 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.6-35
- stable update 2.6.32.6
- rebase gspca crud.
--- NEW FILE patch-2.6.32.6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBLXe01yGugalF9Dw4RApvLAJ0ZcTTbhzuEUka5z9To2YKGJJEXVQCfUlBr
4c6Ao4St/2uieo5emSMP8bw=
=8nf3
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1142
retrieving revision 1.1143
diff -u -p -r1.1142 -r1.1143
--- .cvsignore 23 Jan 2010 03:04:33 -0000 1.1142
+++ .cvsignore 25 Jan 2010 21:38:22 -0000 1.1143
@@ -5,4 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.32
linux-2.6.32.tar.bz2
-patch-2.6.32.5.bz2
+patch-2.6.32.6.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1994
retrieving revision 1.1995
diff -u -p -r1.1994 -r1.1995
--- kernel.spec 25 Jan 2010 17:39:31 -0000 1.1994
+++ kernel.spec 25 Jan 2010 21:38:22 -0000 1.1995
@@ -40,7 +40,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 5
+%define stable_update 6
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -2029,7 +2029,11 @@ fi
# and build.
%changelog
-* Mon Jan 25 2010 Dave Jones <davej at redhat.com> 2.6.32.2-3
+* Mon Jan 25 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.6-35
+- stable update 2.6.32.6
+- rebase gspca crud.
+
+* Mon Jan 25 2010 Dave Jones <davej at redhat.com> 2.6.32.5-34
- Disable CONFIG_X86_CPU_DEBUG
* Sun Jan 24 2010 Hans de Goede <hdegoede at redhat.com> 2.6.32.5-33
linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch:
Documentation/video4linux/gspca.txt | 69
drivers/media/video/gspca/Kconfig | 69
drivers/media/video/gspca/Makefile | 12
drivers/media/video/gspca/benq.c | 322 +++
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 | 81
drivers/media/video/gspca/gl860/gl860.h | 7
drivers/media/video/gspca/gspca.c | 223 +-
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 | 299 +-
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 ++++++++-------------
include/linux/videodev2.h | 16
58 files changed, 12847 insertions(+), 3909 deletions(-)
Index: linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch 24 Jan 2010 19:39:08 -0000 1.1
+++ linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch 25 Jan 2010 21:38:22 -0000 1.2
@@ -1,17 +1,13 @@
-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
+From b9e9d3b5637a92a02705fe38ef136b2c3b785487 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
+Date: Mon, 25 Jan 2010 16:32:38 -0500
+Subject: [PATCH] linux-2.6-v4l-dvb-rebase-gspca-to-latest
-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/benq.c | 322 +++
drivers/media/video/gspca/conex.c | 20 +-
drivers/media/video/gspca/cpia1.c | 2022 +++++++++++++++++++
drivers/media/video/gspca/etoms.c | 18 +-
@@ -20,9 +16,9 @@ And also includes many many bugfixes.
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.c | 81 +-
drivers/media/video/gspca/gl860/gl860.h | 7 +-
- drivers/media/video/gspca/gspca.c | 231 ++-
+ drivers/media/video/gspca/gspca.c | 223 ++-
drivers/media/video/gspca/gspca.h | 35 +-
drivers/media/video/gspca/jeilinj.c | 34 +-
drivers/media/video/gspca/m5602/m5602_core.c | 29 +-
@@ -59,13 +55,14 @@ And also includes many many bugfixes.
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/sunplus.c | 299 ++--
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(-)
+ include/linux/videodev2.h | 15 +-
+ 58 files changed, 12847 insertions(+), 3908 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
@@ -493,7 +490,7 @@ index b742081..6e4cf1c 100644
gspca_tv8532-objs := tv8532.o
diff --git a/drivers/media/video/gspca/benq.c b/drivers/media/video/gspca/benq.c
new file mode 100644
-index 0000000..6c395a2
+index 0000000..43ac4af
--- /dev/null
+++ b/drivers/media/video/gspca/benq.c
@@ -0,0 +1,322 @@
@@ -3793,7 +3790,7 @@ index eda3346..d412694 100644
ov9655_camera_settings(gspca_dev);
diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c
-index 6ef59ac..9e42476 100644
+index 6ef59ac..38bf924 100644
--- a/drivers/media/video/gspca/gl860/gl860.c
+++ b/drivers/media/video/gspca/gl860/gl860.c
@@ -1,9 +1,7 @@
@@ -4048,7 +4045,7 @@ index cef4e24..305061f 100644
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
-index 23d3fb7..6a6e22c 100644
+index 23d3fb7..2ed4823 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -47,7 +47,7 @@ MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
@@ -4417,7 +4414,7 @@ index 23d3fb7..6a6e22c 100644
if (gspca_dev->present)
ret = gspca_dev->sd_desc->get_chip_ident(gspca_dev, chip);
else
-@@ -976,11 +989,40 @@ static int vidioc_enum_framesizes(struct file *file, void *priv,
+@@ -976,12 +989,41 @@ static int vidioc_enum_framesizes(struct file *file, void *priv,
return -EINVAL;
}
@@ -4453,12 +4450,12 @@ index 23d3fb7..6a6e22c 100644
{
struct gspca_dev *gspca_dev = container_of(vfd, struct gspca_dev, vdev);
-- PDEBUG(D_STREAM, "device released");
-+ PDEBUG(D_STREAM, "device released");
-+
+ PDEBUG(D_STREAM, "device released");
++
kfree(gspca_dev->usb_buf);
kfree(gspca_dev);
+ }
@@ -991,7 +1033,7 @@ static int dev_open(struct file *file)
struct gspca_dev *gspca_dev;
int ret;
@@ -17918,7 +17915,7 @@ index 487d405..96c6192 100644
{x1500, 0x1500, ARRAY_SIZE(x1500)},
{x1536, 0x1536, ARRAY_SIZE(x1536)},
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
-index aa8f995..b12bac4 100644
+index 28b4625..fc62c76 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -67,7 +67,7 @@ static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
@@ -18235,8 +18232,7 @@ index aa8f995..b12bac4 100644
+ spca504B_PollingDataReady(gspca_dev);
/* Init the cam width height with some values get on init ? */
-- reg_w_riv(dev, 0x31, 0, 0x04);
-+ reg_w_riv(gspca_dev, 0x31, 0x0004, 0x00);
+ reg_w_riv(dev, 0x31, 0x04, 0);
spca504B_WaitCmdStatus(gspca_dev);
- rc = spca504B_PollingDataReady(gspca_dev);
+ spca504B_PollingDataReady(gspca_dev);
@@ -18308,17 +18304,17 @@ index aa8f995..b12bac4 100644
default:
/* case BRIDGE_SPCA533: */
/* case BRIDGE_SPCA504B: */
-- reg_w_riv(dev, 0, 0x00, 0x21ad); /* hue */
-- reg_w_riv(dev, 0, 0x01, 0x21ac); /* sat/hue */
-- reg_w_riv(dev, 0, 0x00, 0x21a3); /* gamma */
+- reg_w_riv(dev, 0, 0x21ad, 0x00); /* hue */
+- reg_w_riv(dev, 0, 0x21ac, 0x01); /* sat/hue */
+- reg_w_riv(dev, 0, 0x21a3, 0x00); /* gamma */
+ reg_w_riv(gspca_dev, 0, 0x21ad, 0x00); /* hue */
+ reg_w_riv(gspca_dev, 0, 0x21ac, 0x01); /* sat/hue */
+ reg_w_riv(gspca_dev, 0, 0x21a3, 0x00); /* gamma */
break;
case BRIDGE_SPCA536:
-- reg_w_riv(dev, 0, 0x40, 0x20f5);
-- reg_w_riv(dev, 0, 0x01, 0x20f4);
-- reg_w_riv(dev, 0, 0x00, 0x2089);
+- reg_w_riv(dev, 0, 0x20f5, 0x40);
+- reg_w_riv(dev, 0, 0x20f4, 0x01);
+- reg_w_riv(dev, 0, 0x2089, 0x00);
+ reg_w_riv(gspca_dev, 0, 0x20f5, 0x40);
+ reg_w_riv(gspca_dev, 0, 0x20f4, 0x01);
+ reg_w_riv(gspca_dev, 0, 0x2089, 0x00);
@@ -18336,11 +18332,11 @@ index aa8f995..b12bac4 100644
switch (sd->bridge) {
case BRIDGE_SPCA504B:
- reg_w_riv(dev, 0x1d, 0x00, 0);
-- reg_w_riv(dev, 0, 0x01, 0x2306);
-- reg_w_riv(dev, 0, 0x00, 0x0d04);
-- reg_w_riv(dev, 0, 0x00, 0x2000);
-- reg_w_riv(dev, 0, 0x13, 0x2301);
-- reg_w_riv(dev, 0, 0x00, 0x2306);
+- reg_w_riv(dev, 0, 0x2306, 0x01);
+- reg_w_riv(dev, 0, 0x0d04, 0x00);
+- reg_w_riv(dev, 0, 0x2000, 0x00);
+- reg_w_riv(dev, 0, 0x2301, 0x13);
+- reg_w_riv(dev, 0, 0x2306, 0x00);
+ reg_w_riv(gspca_dev, 0x1d, 0x00, 0);
+ reg_w_riv(gspca_dev, 0x00, 0x2306, 0x01);
+ reg_w_riv(gspca_dev, 0x00, 0x0d04, 0x00);
@@ -18448,8 +18444,8 @@ index aa8f995..b12bac4 100644
spca504B_WaitCmdStatus(gspca_dev);
break;
default:
-- reg_w_riv(dev, 0x31, 0, 0x04);
-+ reg_w_riv(gspca_dev, 0x31, 0x0004, 0x00);
+- reg_w_riv(dev, 0x31, 0x04, 0);
++ reg_w_riv(gspca_dev, 0x31, 0x04, 0x00);
spca504B_WaitCmdStatus(gspca_dev);
spca504B_PollingDataReady(gspca_dev);
break;
@@ -23916,12 +23912,10 @@ index cdf3357..7795a99 100644
{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
+diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
+index b59e78c..535ea7b 100644
+--- a/include/linux/videodev2.h
++++ b/include/linux/videodev2.h
@@ -294,6 +294,7 @@ struct v4l2_pix_format {
/* Grey formats */
@@ -23965,7 +23959,7 @@ diff -up linux-2.6.32.x86_64/include/lin
/*
* F O R M A T E N U M E R A T I O N
-@@ -912,8 +1028,10 @@ enum v4l2_colorfx {
+@@ -912,8 +921,10 @@ enum v4l2_colorfx {
#define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32)
#define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33)
@@ -23977,3 +23971,6 @@ diff -up linux-2.6.32.x86_64/include/lin
/* MPEG-class control IDs defined by V4L2 */
#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
+--
+1.6.6
+
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1100
retrieving revision 1.1101
diff -u -p -r1.1100 -r1.1101
--- sources 23 Jan 2010 03:04:34 -0000 1.1100
+++ sources 25 Jan 2010 21:38:22 -0000 1.1101
@@ -1,2 +1,2 @@
260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
-49e6bc73c7a7f690fe7ddf09fe2b5d06 patch-2.6.32.5.bz2
+94415211e7854fc9377e948379c86679 patch-2.6.32.6.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1014
retrieving revision 1.1015
diff -u -p -r1.1014 -r1.1015
--- upstream 23 Jan 2010 03:04:34 -0000 1.1014
+++ upstream 25 Jan 2010 21:38:23 -0000 1.1015
@@ -1,2 +1,2 @@
linux-2.6.32.tar.bz2
-patch-2.6.32.5.bz2
+patch-2.6.32.6.bz2
--- patch-2.6.32.5.bz2.sign DELETED ---
More information about the scm-commits
mailing list