patch for 2.6.11+ compatibility (#83299) migrated to use linux-mod.

Package-Manager: portage-2.0.51.19

4 files changed, 43 insertions, 12 deletions

diff --git a/media-video/qc-usb/ChangeLog b/media-video/qc-usb/ChangeLog
index 67c34441519e..5b0a64714d9e 100644
--- a/media-video/qc-usb/ChangeLog
+++ b/media-video/qc-usb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/qc-usb
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.8 2005/01/28 19:18:03 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.9 2005/03/09 15:10:55 liquidx Exp $
+
+  09 Mar 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/0.6.2-linux-2.6.11.patch, qc-usb-0.6.2.ebuild:
+  patch for 2.6.11+ compatibility (#83299) migrated to use linux-mod.
 
   28 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> qc-usb-0.6.2.ebuild:
   Added to ~ppc, bug 79238.
diff --git a/media-video/qc-usb/Manifest b/media-video/qc-usb/Manifest
index aa605dbb99a2..f9c27f9543e6 100644
--- a/media-video/qc-usb/Manifest
+++ b/media-video/qc-usb/Manifest
@@ -1,7 +1,18 @@
-MD5 97bd2d5d2ede98e17e3139b4290195d1 qc-usb-0.6.2.ebuild 1031
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6291508aa0ccc70678994e4111ff3ead ChangeLog 1310
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 b8ec0739ec95e3d839773fb0820be3bc qc-usb-0.6.0.ebuild 1104
-MD5 9ada809f3aa1b961f31471e32aa8df57 ChangeLog 1133
+MD5 ddd345899300aff83247e374476b8cba qc-usb-0.6.2.ebuild 1056
 MD5 66d41ed8b43340151cdad8ec9a47b7c9 files/digest-qc-usb-0.6.0 64
 MD5 97aa1789cc24610ba63d6d7a95ed8f15 files/qc-usb-0.6.0-gcc34.patch 343
 MD5 78d4eba7ae91c449034741053a53596c files/digest-qc-usb-0.6.2 64
+MD5 1c7efb40ca2cfa4fec86da82641851cb files/0.6.2-linux-2.6.11.patch 495
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCLxIHRkyva5PS18kRAqfJAKCkaJClIsm7XxgR5WjxKQeD3/d87wCglYcz
+j/xgcrQWW/An/YLOJ/XVNu8=
+=6uSv
+-----END PGP SIGNATURE-----
diff --git a/media-video/qc-usb/files/0.6.2-linux-2.6.11.patch b/media-video/qc-usb/files/0.6.2-linux-2.6.11.patch
new file mode 100644
index 000000000000..dd8b239f5ed3
--- /dev/null
+++ b/media-video/qc-usb/files/0.6.2-linux-2.6.11.patch
@@ -0,0 +1,15 @@
+--- qc-usb-0.6.2/qc-memory.c-old	2005-02-24 19:40:37.000000000 -0500
++++ qc-usb-0.6.2/qc-memory.c	2005-02-24 19:41:12.000000000 -0500
+@@ -230,7 +230,11 @@
+ 	pos = (unsigned long)src;
+ 	while ((long)size > 0) {
+ 		physaddr = kvirt_to_pa(pos);
+-		if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED))
++        if (remap_pfn_range(vma,
++ 					start,
++ 					physaddr >> PAGE_SHIFT,
++ 					PAGE_SIZE,
++ 					PAGE_SHARED))
+ 			return -EAGAIN;
+ 		start += PAGE_SIZE;
+ 		pos += PAGE_SIZE;
diff --git a/media-video/qc-usb/qc-usb-0.6.2.ebuild b/media-video/qc-usb/qc-usb-0.6.2.ebuild
index 42d5d2e3ce6e..39153d18fa1d 100644
--- a/media-video/qc-usb/qc-usb-0.6.2.ebuild
+++ b/media-video/qc-usb/qc-usb-0.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.2.ebuild,v 1.3 2005/01/28 19:18:03 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/qc-usb-0.6.2.ebuild,v 1.4 2005/03/09 15:10:55 liquidx Exp $
 
-inherit kernel-mod eutils
+inherit linux-mod eutils
 
 DESCRIPTION="Logitech USB Quickcam Express Linux Driver Modules"
 HOMEPAGE="http://qce-ga.sourceforge.net/"
@@ -11,22 +11,23 @@ SRC_URI="mirror://sourceforge/qce-ga/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 DEPEND="virtual/linux-sources"
 
+src_unpack() {
+	cd ${S}
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-linux-2.6.11.patch
+}
+
 src_compile() {
 	emake KERNEL_DIR=${KERNEL_DIR} all || die
 }
 
 src_install() {
 	insinto /lib/modules/${KV}/drivers/usb
-	if kernel-mod_is_2_6_kernel; then
-		doins quickcam.ko
-	else
-		doins quickcam.o
-	fi
-
+	doins quickcam.${KV_OBJ}
 	dobin qcset
 	dodoc README* APPLICATIONS COPYING CREDITS TODO FAQ