Package: qc-usb-source
Version: 0.6.6-6
Severity: wishlist
Tags: patch

The module fails to compile against Linux 2.6.27 due to removal of type
field from video_device struct:
<URL: 
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0ea6bc8d43c9ee3c5384bea184eab020927a5b2c>

Attached a patch which #ifdef's around this problem. Not pretty but confirmed
working.

Thanks, Kel.
---
--- a/qc-driver.c
+++ b/qc-driver.c
@@ -2528,7 +2528,11 @@
                        if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP");
                        memset(&b, 0, sizeof(b));
                        strcpy(b.name, "Logitech QuickCam USB");        /* Max 
31 characters */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+                       b.type      = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE;
+#else
                        b.type      = qc->vdev.type;
+#endif
                        b.channels  = 1;
                        b.audios    = 0;
                        b.maxwidth  = qc->sensor_data.maxwidth;
@@ -3007,7 +3011,9 @@
 
 static struct video_device qc_v4l_template = {
        name:           "QuickCam USB",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
        type:           VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        hardware:       VID_HARDWARE_QCAM_USB,
 #endif
---



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to