Hello community,
here is the log from the commit of package quickcam
checked in at Tue Nov 27 18:46:40 CET 2007.
--------
--- quickcam/quickcam.changes 2007-04-21 13:35:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/quickcam/quickcam.changes 2007-11-27 15:00:54.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 27 15:00:32 CET 2007 - olh@suse.de
+
+- update for 2.6.24 API changes
+
+-------------------------------------------------------------------
New:
----
qc-usb-BIT.patch
qc-usb-hardware.patch
qc-usb-messenger-hardware.patch
qc-usb-messenger-LONG.patch
qc-usb-urb_lock.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ quickcam.spec ++++++
--- /var/tmp/diff_new_pack.C32667/_old 2007-11-27 18:46:10.000000000 +0100
+++ /var/tmp/diff_new_pack.C32667/_new 2007-11-27 18:46:10.000000000 +0100
@@ -13,23 +13,28 @@
Name: quickcam
BuildRequires: kernel-source kernel-syms module-init-tools
-URL: http://qce-ga.sourceforge.net/
+Url: http://qce-ga.sourceforge.net/
Version: 0.6.6
-Release: 3
+Release: 4
%define qc_usb_messenger qc-usb-messenger-1.6
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: LGPL v2.1 or later
Group: System/Kernel
Summary: Logitech USB QuickCam Kernel Module
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: http://mesh.dl.sourceforge.net/sourceforge/qce-ga/qc-usb-%{version}.tar.bz2
Source1: http://home.mag.cx/messenger/source/%{qc_usb_messenger}.tar.bz2
Patch0: qc-usb-support.patch
+Patch1: qc-usb-BIT.patch
+Patch2: qc-usb-hardware.patch
Patch3: qc-usb-qc_v4l_read-prototype.patch
Patch4: qc-usb-remove-linux-pagemap.patch
Patch5: qc-usb.UTS_RELEASE.patch
+Patch6: qc-usb-urb_lock.patch
Patch8: qc-usb.pt_regs.patch
Patch21: qc-usb-messenger.UTS_RELEASE.patch
Patch22: qc-usb-messenger.pt_regs.patch
+Patch23: qc-usb-messenger-hardware.patch
+Patch24: qc-usb-messenger-LONG.patch
%suse_kernel_module_package -x default ppc64 smp bigsmp
%description
@@ -63,13 +68,18 @@
%prep
%setup -q -n qc-usb-%{version} -a 1
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch8 -p1
cd %{qc_usb_messenger}
%patch21 -p1
%patch22 -p1
+%patch23 -p1
+%patch24 -p1
%build
mkdir source obj
@@ -129,6 +139,8 @@
done
%changelog
+* Tue Nov 27 2007 - olh@suse.de
+- update for 2.6.24 API changes
* Sat Apr 21 2007 - olh@suse.de
- add debug to spec file
* Wed Apr 04 2007 - lrupp@suse.de
++++++ qc-usb-BIT.patch ++++++
---
quickcam.h | 2 ++
1 file changed, 2 insertions(+)
--- a/quickcam.h
+++ b/quickcam.h
@@ -126,7 +126,9 @@ struct qc_userlut {
#define FALSE 0
#define TRUE (!FALSE)
typedef unsigned char Bool;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
#define BIT(x) (1<<(x))
+#endif
#define SIZE(a) (sizeof(a)/sizeof((a)[0]))
#define MAX(a,b) ((a)>(b)?(a):(b))
#define MIN(a,b) ((a)<(b)?(a):(b))
++++++ qc-usb-hardware.patch ++++++
---
qc-driver.c | 1 -
1 file changed, 1 deletion(-)
--- a/qc-driver.c
+++ b/qc-driver.c
@@ -2997,7 +2997,6 @@ static struct file_operations qc_v4l_fop
static struct video_device qc_v4l_template = {
name: "QuickCam USB",
type: VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
- hardware: VID_HARDWARE_QCAM_USB,
minor: -1,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
release: qc_v4l_release,
++++++ qc-usb-messenger-hardware.patch ++++++
---
qc-driver.c | 1 -
1 file changed, 1 deletion(-)
--- a/qc-driver.c
+++ b/qc-driver.c
@@ -3392,7 +3392,6 @@ static struct file_operations qc_v4l_fop
static struct video_device qc_v4l_template = {
name: "QuickCam USB",
type: VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE,
- hardware: VID_HARDWARE_QCAM_USB,
minor: -1,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
release: qc_v4l_release,
++++++ qc-usb-messenger-LONG.patch ++++++
---
qc-driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/qc-driver.c
+++ b/qc-driver.c
@@ -3595,7 +3595,7 @@ static struct quickcam *qc_usb_init(stru
qc->input_ptr->name = "Quickcam snapshot button";
qc->input_ptr->private = qc;
qc->input_ptr->evbit[0] = BIT(EV_KEY);
- qc->input_ptr->keybit[LONG(BTN_0)] = BIT(BTN_0);
+ qc->input_ptr->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
qc->input_ptr->id.bustype = BUS_USB;
++++++ qc-usb-urb_lock.patch ++++++
---
qc-driver.c | 1 -
1 file changed, 1 deletion(-)
--- a/qc-driver.c
+++ b/qc-driver.c
@@ -817,7 +817,6 @@ static int qc_i2c_init(struct quickcam *
if (!cr) goto fail2;
urb->transfer_buffer = kmalloc(qc_i2c_maxbufsize*sizeof(u8), GFP_KERNEL); /* Allocate maximum ever needed */
if (!urb->transfer_buffer) goto fail3;
- spin_lock_init(&urb->lock);
urb->complete = qc_i2c_handler;
urb->context = qc;
#if (LINUX_VERSION_CODE