Package: qc-usb-source
Version: 0.6.4-2
Severity: normal
Tags: patch

The module failes to build with new kernels as a few things changed
since 2.6.16. Olaf Hering posted the supplied patch on the 
quickcam.devel list.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-rc4
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)

Versions of packages qc-usb-source depends on:
ii  debhelper                     5.0.37.3   helper programs for debian/rules

Versions of packages qc-usb-source recommends:
ii  kernel-package                10.054     A utility for building Linux kerne

-- no debconf information
diff -rup qc-usb-source.orig/qc-driver.c qc-usb-source/qc-driver.c
--- qc-usb-source.orig/qc-driver.c	2006-05-06 04:51:50.000000000 +0200
+++ qc-usb-source/qc-driver.c	2006-08-31 23:53:28.000000000 +0200
@@ -867,7 +867,6 @@ static int qc_proc_read(char *page, char
 
 	out += sprintf(out, "\tGeneral driver status\n");
 	out += sprintf(out, "Driver version   : %s\n", VERSION);
-	out += sprintf(out, "Kernel version   : %s\n", UTS_RELEASE);
 	if (qc->dev!=NULL) {
 	out += sprintf(out, "Device Id        : %04X:%04X\n", (int)GET_VENDORID(qc), (int)GET_PRODUCTID(qc));
 	out += sprintf(out, "USB bus number   : %i\n", qc->dev->bus->busnum);
@@ -3266,8 +3265,8 @@ static void *qc_usb_probe(struct usb_dev
 
 	/* We found a QuickCam */
 	PRINTK(KERN_INFO,"QuickCam USB camera found (driver version %s)", VERSION);
-	PRINTK(KERN_INFO,"Kernel:%s bus:%i class:%02X subclass:%02X vendor:%04X product:%04X",
-		UTS_RELEASE, usbdev->bus->busnum, ifacedesc->bInterfaceClass, ifacedesc->bInterfaceSubClass,
+	PRINTK(KERN_INFO,"bus:%i class:%02X subclass:%02X vendor:%04X product:%04X",
+		usbdev->bus->busnum, ifacedesc->bInterfaceClass, ifacedesc->bInterfaceSubClass,
 		usbdev->descriptor.idVendor, usbdev->descriptor.idProduct);
 
 	/* The interface is claimed (bound) automatically to us when we return from this function (without error code) */
diff -rup qc-usb-source.orig/quickcam.h qc-usb-source/quickcam.h
--- qc-usb-source.orig/quickcam.h	2006-05-06 05:00:26.000000000 +0200
+++ qc-usb-source/quickcam.h	2006-09-01 00:11:44.000000000 +0200
@@ -93,6 +93,7 @@ struct qc_userlut {
 #endif
 
 #include <linux/videodev.h>
+#include <media/v4l2-dev.h>
 #include <linux/usb.h>
 #include <asm/pgtable.h>		/* This is required for testing pte_offset_map */
 #include <linux/spinlock.h>

Reply via email to