fix 2.6.18, bug 148710 thanks to Ricardo Lanziano <ricardo.lanziano@gmail.com>

(Portage version: 2.1.2_pre3-r5)

4 files changed, 40 insertions, 2 deletions

diff --git a/media-video/qc-usb/ChangeLog b/media-video/qc-usb/ChangeLog
index 4446350cdb1a..9a09301d938c 100644
--- a/media-video/qc-usb/ChangeLog
+++ b/media-video/qc-usb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/qc-usb
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.17 2006/08/28 17:19:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.18 2006/10/20 19:07:01 genstef Exp $
+
+  20 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/qc-usb-linux-2.6.18-1.patch, +files/qc-usb-linux-2.6.18-2.patch,
+  qc-usb-0.6.4.ebuild:
+  fix 2.6.18, bug 148710 thanks to Ricardo Lanziano <ricardo.lanziano@gmail.com>
 
   28 Aug 2006; Alastair Tse <liquidx@gentoo.org> files/digest-qc-usb-0.6.3,
   Manifest:
diff --git a/media-video/qc-usb/files/qc-usb-linux-2.6.18-1.patch b/media-video/qc-usb/files/qc-usb-linux-2.6.18-1.patch
new file mode 100644
index 000000000000..a0efb331dab7
--- /dev/null
+++ b/media-video/qc-usb/files/qc-usb-linux-2.6.18-1.patch
@@ -0,0 +1,21 @@
+--- qc-usb-0.6.4.old/qc-driver.c	2006-05-05 21:51:50.000000000 -0500
++++ qc-usb-0.6.4/qc-driver.c	2006-10-16 21:49:03.000000000 -0500
+@@ -867,7 +867,6 @@
+ 
+ 	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 @@
+ 
+ 	/* 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 --git a/media-video/qc-usb/files/qc-usb-linux-2.6.18-2.patch b/media-video/qc-usb/files/qc-usb-linux-2.6.18-2.patch
new file mode 100644
index 000000000000..08c56d7620fa
--- /dev/null
+++ b/media-video/qc-usb/files/qc-usb-linux-2.6.18-2.patch
@@ -0,0 +1,10 @@
+--- qc-usb-0.6.4.old/quickcam.h	2006-05-05 22:00:26.000000000 -0500
++++ qc-usb-0.6.4/quickcam.h	2006-10-16 21:49:39.000000000 -0500
+@@ -93,6 +93,7 @@
+ #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>
diff --git a/media-video/qc-usb/qc-usb-0.6.4.ebuild b/media-video/qc-usb/qc-usb-0.6.4.ebuild
index f0a3c17899de..ed325813608a 100644
--- a/media-video/qc-usb/qc-usb-0.6.4.ebuild
+++ b/media-video/qc-usb/qc-usb-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/qc-usb-0.6.4.ebuild,v 1.2 2006/08/11 08:32:17 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/qc-usb-0.6.4.ebuild,v 1.3 2006/10/20 19:07:01 genstef Exp $
 
 inherit linux-mod eutils multilib
 
@@ -28,6 +28,8 @@ src_unpack() {
 	cd ${S}
 	convert_to_m ${S}/Makefile
 	epatch ${FILESDIR}/${P}-koutput.patch
+	epatch ${FILESDIR}/qc-usb-linux-2.6.18-1.patch
+	epatch ${FILESDIR}/qc-usb-linux-2.6.18-2.patch
 }
 
 src_install() {