fix compilation with 2.6.24, bug #208568

Package-Manager: portage-2.1.4.1

4 files changed, 61 insertions, 7 deletions

diff --git a/media-video/qc-usb/ChangeLog b/media-video/qc-usb/ChangeLog
index 4d302b207c1d..e38db966141b 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.27 2007/11/27 12:02:11 zzam Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.28 2008/02/02 23:43:52 eva Exp $
+
+  02 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/qc-usb-0.6.6-kcompat-2.6.24.patch, qc-usb-0.6.6.ebuild:
+  fix 2.6.24 compilation, bug #208568
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> qc-usb-0.6.6.ebuild:
   Fixed quoting.
diff --git a/media-video/qc-usb/Manifest b/media-video/qc-usb/Manifest
index 334491f7188b..1e5dfc190a1e 100644
--- a/media-video/qc-usb/Manifest
+++ b/media-video/qc-usb/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX qc-usb-0.6.6-kcompat-2.6.24.patch 1465 RMD160 23332300f47d147db6809c7dbe982ab12562e90d SHA1 c454cf43e9d607849384cc2d39361218dcfd926e SHA256 e46a1e68dc2762103fbf795565a4b5c03771cd8b1c36f6b2f04f6af9b3630164
 AUX qc-usb-0.6.6-koutput.patch 3177 RMD160 b1535321f207d5943f5cf1f5aef0024d6f3aa5a0 SHA1 bb2a9e4bb8a41ce4f0588aea173445c3982bea0f SHA256 520a01b91f537e01543e086dd5cef7f97b6cde4766c829b1ae804ea6c6cc415f
 DIST qc-usb-0.6.6.tar.gz 147072 RMD160 08dade63cac3b9c668769fb1446a43f55f6a7969 SHA1 947a9f1233586af71d82e413f455ef01ee388b43 SHA256 3c2485f21fc3ae2232a234c989a8256e802e589968f90d1357eba05fa5fc62a8
-EBUILD qc-usb-0.6.6.ebuild 1032 RMD160 c8f86219dbab010bc2cd091259522cb969afd1e7 SHA1 60105ad6f39d86c8f1272804a837989dc3730b58 SHA256 f7955b316d447ff80c0b6aa1e11ddb32c776b18662a064685667f64dd7ff260c
-MISC ChangeLog 3867 RMD160 5d943acf794734650bfc551bfc8faf5dd5b28763 SHA1 89c547c7904afe49e4caa15c546bf817c0942590 SHA256 d7c6afb7ef6942355825aeb0a343cfc078692fd91a729b2ea55b04b25ee4306d
+EBUILD qc-usb-0.6.6.ebuild 1111 RMD160 097f01db08a66c16e1293dc19279a48d41687181 SHA1 c9d8747a3bb03af10d9819e9df60e7e47ed51f4b SHA256 059bdfbb9cb9534d62a8c32af8cd7f822bad7e0dd1d53420df52edb3f6cbade5
+MISC ChangeLog 4024 RMD160 000fb2689696d49cb382fff44b7c1007b4196298 SHA1 32e37aed85538427894308e42feb475548fd34ce SHA256 0e286766f65b4ac52bbac3ef0bb871e98af405cf41470c109973ced15fa4976c
 MISC metadata.xml 220 RMD160 49ec168a4213a2fbbf9a8afee036ba9f7f6cf680 SHA1 6aef5b4070840997f99df46fdd1dd10b52875402 SHA256 898ede299fa86272e3197815cec67e09c7239107f49a2c5dd1b534df6c0b9d58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHpQDf1fmVwcYIWAYRAhxyAJ41eRr9QslNvjEdgipvLemh51d67ACePoYJ
+3KWABIvw3gUuUX99SMNksq4=
+=cf/g
+-----END PGP SIGNATURE-----
diff --git a/media-video/qc-usb/files/qc-usb-0.6.6-kcompat-2.6.24.patch b/media-video/qc-usb/files/qc-usb-0.6.6-kcompat-2.6.24.patch
new file mode 100644
index 000000000000..c8974bc5d51d
--- /dev/null
+++ b/media-video/qc-usb/files/qc-usb-0.6.6-kcompat-2.6.24.patch
@@ -0,0 +1,36 @@
+diff -urNad qc-usb-0.6.6~/qc-driver.c qc-usb-0.6.6/qc-driver.c
+--- qc-usb-0.6.6~/qc-driver.c	2006-10-24 04:06:19.000000000 +0200
++++ qc-usb-0.6.6/qc-driver.c	2007-12-09 17:20:30.000000000 +0100
+@@ -821,7 +821,9 @@
+ 	if (!cr) goto fail2;
+ 	urb->transfer_buffer = kmalloc(qc_i2c_maxbufsize*sizeof(u8), GFP_KERNEL);	/* Allocate maximum ever needed */
+ 	if (!urb->transfer_buffer) goto fail3;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 	spin_lock_init(&urb->lock);
++#endif
+ 	urb->complete = qc_i2c_handler;
+ 	urb->context  = qc;
+ #if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,9) && !defined(CONFIG_SUSE_KERNEL)) || LINUX_VERSION_CODE<KERNEL_VERSION(2,6,8)
+@@ -3006,7 +3008,9 @@
+ static struct video_device qc_v4l_template = {
+ 	name:		"QuickCam USB",
+ 	type:		VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 	hardware:	VID_HARDWARE_QCAM_USB,
++#endif
+ 	minor:		-1,
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ 	release:	qc_v4l_release,
+diff -urNad qc-usb-0.6.6~/quickcam.h qc-usb-0.6.6/quickcam.h
+--- qc-usb-0.6.6~/quickcam.h	2006-11-04 14:38:27.000000000 +0100
++++ qc-usb-0.6.6/quickcam.h	2007-12-09 17:17:01.000000000 +0100
+@@ -126,7 +126,9 @@
+ #define FALSE			0
+ #define TRUE			(!FALSE)
+ typedef unsigned char Bool;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ #define BIT(x)		(1<<(x))
++#endif
+ #define SIZE(a)		(sizeof(a)/sizeof((a)[0]))
+ #define MAX(a,b)	((a)>(b)?(a):(b))
+ #define MIN(a,b)	((a)<(b)?(a):(b))
diff --git a/media-video/qc-usb/qc-usb-0.6.6.ebuild b/media-video/qc-usb/qc-usb-0.6.6.ebuild
index d7e87ba98880..92ecc346b5f5 100644
--- a/media-video/qc-usb/qc-usb-0.6.6.ebuild
+++ b/media-video/qc-usb/qc-usb-0.6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.6.ebuild,v 1.5 2007/11/27 12:02:11 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/qc-usb-0.6.6.ebuild,v 1.6 2008/02/02 23:43:52 eva Exp $
 
 inherit linux-mod eutils multilib
 
@@ -30,7 +30,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	convert_to_m "${S}"/Makefile
-	epatch "${FILESDIR}"/${P}-koutput.patch
+	epatch "${FILESDIR}/${P}-koutput.patch"
+
+	# Fix compilation with 2.6.24
+	epatch "${FILESDIR}/${P}-kcompat-2.6.24.patch"
 }
 
 src_install() {