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

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 56 insertions, 20 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/Manifest b/media-video/qc-usb/Manifest
index 3b289e07c16d..f0943cb96a06 100644
--- a/media-video/qc-usb/Manifest
+++ b/media-video/qc-usb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qc-usb-0.6.3-linux-2.6.16.patch 522 RMD160 b0e38576c2d7ad0edefd21c4db3c0898edc448d6 SHA1 bf5cd49aa8c255cdb2a6a4ec657cf2caab2d9d85 SHA256 51a36d1b6a7d704b49679b0904c07cf2b982aba571d1812fcde4c9d7ace23d99
 MD5 e43a0d0ceeaa2255d5f76833b1a63dd3 files/qc-usb-0.6.3-linux-2.6.16.patch 522
 RMD160 b0e38576c2d7ad0edefd21c4db3c0898edc448d6 files/qc-usb-0.6.3-linux-2.6.16.patch 522
@@ -13,20 +10,28 @@ AUX qc-usb-gcc4.patch 4130 RMD160 e7d9d2831729c7f2ceac760ccf09601b182d5597 SHA1
 MD5 d5dd1aeff751da16df31f84ced71d090 files/qc-usb-gcc4.patch 4130
 RMD160 e7d9d2831729c7f2ceac760ccf09601b182d5597 files/qc-usb-gcc4.patch 4130
 SHA256 99f17dcc452c805489b82df49779491708b6df3eb3988b43af6822f1f1d404d3 files/qc-usb-gcc4.patch 4130
+AUX qc-usb-linux-2.6.18-1.patch 1188 RMD160 c5aefbb0e714f86a03334a9b1a637c5ee3a60189 SHA1 c1a167122f59a0e6945da107ae641973bca7a848 SHA256 722f2128d6d0d95a9e1aa25136c35ec612b162b7513f96f0aafa2dba9b91e710
+MD5 0290c7fb89128510c3821ea9f0e3d841 files/qc-usb-linux-2.6.18-1.patch 1188
+RMD160 c5aefbb0e714f86a03334a9b1a637c5ee3a60189 files/qc-usb-linux-2.6.18-1.patch 1188
+SHA256 722f2128d6d0d95a9e1aa25136c35ec612b162b7513f96f0aafa2dba9b91e710 files/qc-usb-linux-2.6.18-1.patch 1188
+AUX qc-usb-linux-2.6.18-2.patch 348 RMD160 790c9741ba2354f9cede4e35d7b165776dab76dd SHA1 f44068e0f56d244171c29b446da3f486d3a5d002 SHA256 f267fcd99d045138418f9d08d2b9ee1f90221cdd745065a035f8669d4633a986
+MD5 5594f97c4c1adeb5893e09fa3c87df66 files/qc-usb-linux-2.6.18-2.patch 348
+RMD160 790c9741ba2354f9cede4e35d7b165776dab76dd files/qc-usb-linux-2.6.18-2.patch 348
+SHA256 f267fcd99d045138418f9d08d2b9ee1f90221cdd745065a035f8669d4633a986 files/qc-usb-linux-2.6.18-2.patch 348
 DIST qc-usb-0.6.3.tar.gz 148994 RMD160 248768b551dc810dea524567e73b591353c0f8ed SHA1 5583ab73c4cc8546fde78e5a29fe1b6482075a74 SHA256 fee6264949107e5d879525487c1c3b27ea208ea854792d8c87142143cb2f2aa5
 DIST qc-usb-0.6.4.tar.gz 144247 RMD160 8717f7664d760dd503b097dd8fb68a873112ccd9 SHA1 5ef041ea1d77c3659c667ac58229ab8d03f34be8 SHA256 366b454ffd99dc5afcb47443657801e38bcd0fbffe0bee6ad1663957d5b9cd8c
 EBUILD qc-usb-0.6.3.ebuild 1021 RMD160 acd62cf337ff0d1e1288e6720b69c6d38ed80e0a SHA1 1e249ffc6ab898b10a7673af0f6e9ad15663d65f SHA256 961244bf08b5e76ecc12e9b47b4519bad36086661545d805344d2928a05987ae
 MD5 7287c1dfaf5e9162f4e5423a90408c37 qc-usb-0.6.3.ebuild 1021
 RMD160 acd62cf337ff0d1e1288e6720b69c6d38ed80e0a qc-usb-0.6.3.ebuild 1021
 SHA256 961244bf08b5e76ecc12e9b47b4519bad36086661545d805344d2928a05987ae qc-usb-0.6.3.ebuild 1021
-EBUILD qc-usb-0.6.4.ebuild 960 RMD160 281d889472262b056c5a74bd5c7f7e9a94bbf9d2 SHA1 3e54945384ff161d874495889ae94c27749e8f17 SHA256 366c0acedeec8a6af19028743494f990a84241f7d324d775ad7742e3b45e2f63
-MD5 b94ceefa727429bfd69497ec09f73736 qc-usb-0.6.4.ebuild 960
-RMD160 281d889472262b056c5a74bd5c7f7e9a94bbf9d2 qc-usb-0.6.4.ebuild 960
-SHA256 366c0acedeec8a6af19028743494f990a84241f7d324d775ad7742e3b45e2f63 qc-usb-0.6.4.ebuild 960
-MISC ChangeLog 2641 RMD160 b020f2e64a7483457e4ff74c9340f9930e13a8cf SHA1 9224163985950a33f1d1ee7b27343225b19614b0 SHA256 f0db732bb848f7169fa2b8fe43c6d418829f451ef4f0385dccf9abd1833f7ebe
-MD5 3dd1fd5966632b8f2b66f7ace3367845 ChangeLog 2641
-RMD160 b020f2e64a7483457e4ff74c9340f9930e13a8cf ChangeLog 2641
-SHA256 f0db732bb848f7169fa2b8fe43c6d418829f451ef4f0385dccf9abd1833f7ebe ChangeLog 2641
+EBUILD qc-usb-0.6.4.ebuild 1056 RMD160 d68e83510ad4eb33f12fab5717fc3e1a294c3bcc SHA1 73d2688f5d007ca72a8e549b6680fc67d9b2612d SHA256 7c54e9024ff14fb2de21af0f3a98644b85fe7386c17165f732ddf4f139edba58
+MD5 927edce4f5e3d11098ddb087a9eccd4b qc-usb-0.6.4.ebuild 1056
+RMD160 d68e83510ad4eb33f12fab5717fc3e1a294c3bcc qc-usb-0.6.4.ebuild 1056
+SHA256 7c54e9024ff14fb2de21af0f3a98644b85fe7386c17165f732ddf4f139edba58 qc-usb-0.6.4.ebuild 1056
+MISC ChangeLog 2873 RMD160 c899875fd1f15d1985cb8fc18a3c2689cb802aba SHA1 2292a9aaf62a4287a1d47f422f8e3173bddded5a SHA256 3746fff5efa4e83e489b8eb01a76f5c6ddcf59d8d23be30ffcd8f313f19ef4cd
+MD5 72ca2c156dbd1282887102a4a156b6e6 ChangeLog 2873
+RMD160 c899875fd1f15d1985cb8fc18a3c2689cb802aba ChangeLog 2873
+SHA256 3746fff5efa4e83e489b8eb01a76f5c6ddcf59d8d23be30ffcd8f313f19ef4cd ChangeLog 2873
 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219
@@ -37,10 +42,3 @@ SHA256 32aa60f0c06c1ca50c8d9c06383cb90cb274a2d1338153e8adf8e9ed03a111e0 files/di
 MD5 1c3df1e286f83e9511fb1c816e040190 files/digest-qc-usb-0.6.4 238
 RMD160 4a5fc67a679fe67866e97ae88a6eee6f2e9e54eb files/digest-qc-usb-0.6.4 238
 SHA256 24794cfc143f1848862c216c4e6dea7c6c57fce3fe01e8762f8309db6442ff04 files/digest-qc-usb-0.6.4 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFE8yWeuB6ZT1m7QRERAnqPAJ0RrADCFoADuL6Zxohrli9MW/YgMgCfUiXl
-aLdA18cdUd8nBEh/CDD4FvE=
-=6oPf
------END PGP SIGNATURE-----
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() {