Bump to 0.6.6-r2. Fix compilation on 2.6.28, closes #254564.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 187 insertions, 5 deletions

diff --git a/media-video/qc-usb/ChangeLog b/media-video/qc-usb/ChangeLog
index 3656bf8b5bfa..8856f09943ef 100644
--- a/media-video/qc-usb/ChangeLog
+++ b/media-video/qc-usb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/qc-usb
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.31 2009/01/04 14:53:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.32 2009/02/15 19:22:53 eva Exp $
+
+*qc-usb-0.6.6-r2 (15 Feb 2009)
+
+  15 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/qc-usb-0.6.6-kcompat-2.6.28.patch, +qc-usb-0.6.6-r2.ebuild:
+  Bump to 0.6.6-r2. Fix compilation on 2.6.28, closes #254564.
 
   04 Jan 2009; Markus Meier <maekke@gentoo.org> qc-usb-0.6.6-r1.ebuild:
   amd64/x86 stable, bug #252581
diff --git a/media-video/qc-usb/Manifest b/media-video/qc-usb/Manifest
index 5bb2a1b145a4..13c87dde8536 100644
--- a/media-video/qc-usb/Manifest
+++ b/media-video/qc-usb/Manifest
@@ -4,16 +4,18 @@ 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-kcompat-2.6.26.patch 1123 RMD160 df3d0c253bca12853a8924810210a3b9d4562645 SHA1 b549293fe695aa346b26a7d52c65ac142c4ae4bc SHA256 cfe408b1fd03831df8cd68e391444b6ef12c1a9ba45e14dfe9962530f92d1644
 AUX qc-usb-0.6.6-kcompat-2.6.27.patch 825 RMD160 452e06231e8e22ea56acd5b5b8a3ee62e91ca7cf SHA1 46d53a36496ab41bf12372854fa59dcbf4d5b52f SHA256 c922c0921fb0d9d85e0d50e3613453b1df0f72850652b981a7f9f0dcec2bfc6f
+AUX qc-usb-0.6.6-kcompat-2.6.28.patch 3822 RMD160 6c460feca9ec6486ef179ad8b3d2ae2b31dfbd3c SHA1 6649830de11cfc58842679e901461cbd1e43d673 SHA256 0443fdbbe2489ff7864b04dfbc53525061612cacddc718a3f237ba0422e61f10
 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-r1.ebuild 1432 RMD160 242d83929db35789bb97180a8941711927380f0f SHA1 4186fe63711c182a547d3ffd4a0871b0409641aa SHA256 4b87dc3ddc1b9dd9d34cb337744e9d2c9480e2bb51dbc4ccaf0cfce3d92120c6
+EBUILD qc-usb-0.6.6-r2.ebuild 1524 RMD160 86a70eb28973b642577d20a972172fbc655869e4 SHA1 47bc3082d7d94681dc5f25ff04c2d6a83dae5e35 SHA256 24438cfa4ceb44b5e5da5b6c6b90161f3d93dda9a63c463061addb6e3501f0ae
 EBUILD qc-usb-0.6.6.ebuild 1180 RMD160 388b674942429679b1940270d7461b5cf3cd03cd SHA1 9c6cb3ac02c6c0f2f62d8668181fa0e8e7d05f32 SHA256 bc4b40af30b573b70ab260813aefba84437577b294a53a669324ed55fb915d61
-MISC ChangeLog 4573 RMD160 720faf46a20541833285cb940a5f3948f7a208ee SHA1 c6cb0c9855cedc79d476fd232ea2692938a0e498 SHA256 bb0adfe41e9e24ef06e7fe9fc7e91bcc0da54e57c733b0df4e928c56bebe24a8
+MISC ChangeLog 4789 RMD160 64480b7da698465e77b16e41fd9423d4501a62f2 SHA1 015f5c1025518d6630f3638ebf286b10168388ab SHA256 d4157c33812c0a957036e5ee03560d17b8bd55343a7a2272b1a63fe18acb3de5
 MISC metadata.xml 220 RMD160 49ec168a4213a2fbbf9a8afee036ba9f7f6cf680 SHA1 6aef5b4070840997f99df46fdd1dd10b52875402 SHA256 898ede299fa86272e3197815cec67e09c7239107f49a2c5dd1b534df6c0b9d58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklgzXYACgkQkKaRLQcq0GIBNQCeOHndKCpq0vZOKut33ahMn3Xm
-zRwAnRq6TRte9qHXdnwLnC9fL/0FHfHU
-=2Pwh
+iEYEARECAAYFAkmYa5IACgkQ1fmVwcYIWAZNiACg6O5sQzNB5hgL8TkcyXoapKK3
+58sAoMFHifsavqf5ji6jWabvhoCrdeHF
+=zQLJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/qc-usb/files/qc-usb-0.6.6-kcompat-2.6.28.patch b/media-video/qc-usb/files/qc-usb-0.6.6-kcompat-2.6.28.patch
new file mode 100644
index 000000000000..438891f179a3
--- /dev/null
+++ b/media-video/qc-usb/files/qc-usb-0.6.6-kcompat-2.6.28.patch
@@ -0,0 +1,110 @@
+--- a/qc-driver.c	2009-01-11 17:54:22.000000000 +0100
++++ b/qc-driver.c	2009-01-11 17:50:38.000000000 +0100
+@@ -645,7 +645,11 @@
+  * - There is still commands to be sent in commands buffer or pid=0x850 and finalization packet is not yet sent.
+  */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++static void qc_i2c_handler(struct urb *urb)
++#else
+ static void qc_i2c_handler(struct urb *urb, struct pt_regs *ptregs)
++#endif
+ #else
+ static void qc_i2c_handler(struct urb *urb)
+ #endif
+@@ -1740,7 +1744,11 @@
+  * - There are too many transfer errors
+  */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++static void qc_isoc_handler(struct urb *urb)
++#else
+ static void qc_isoc_handler(struct urb *urb, struct pt_regs *ptregs)
++#endif
+ #else
+ static void qc_isoc_handler(struct urb *urb)
+ #endif
+@@ -2255,7 +2263,11 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ 	struct video_device *dev = video_devdata(file);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++	struct quickcam *qc = (struct quickcam *) video_get_drvdata(dev);
++#else
+ 	struct quickcam *qc = (struct quickcam *)dev->priv;
++#endif
+ 	struct qc_frame_data *fd = &qc->frame_data;
+ 	int mask;
+ 
+@@ -2307,7 +2319,11 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ 	struct video_device *dev = video_devdata(file);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++	struct quickcam *qc = (struct quickcam *) video_get_drvdata(dev);
++#else
+ 	struct quickcam *qc = dev->priv;
++#endif
+ 	int r;
+ 
+ 	if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_open(qc=%p)", qc);
+@@ -2375,7 +2391,11 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ 	struct video_device *dev = video_devdata(file);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++	struct quickcam *qc = (struct quickcam *) video_get_drvdata(dev);
++#else
+ 	struct quickcam *qc = (struct quickcam *)dev->priv;
++#endif
+ 	if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_close(dev=%p,qc=%p)",dev,qc);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ 	TEST_BUGR_MSG(qc==NULL, "qc==NULL");
+@@ -2423,7 +2443,11 @@
+ 	struct video_device *dev = video_devdata(file);
+ 	int noblock = file->f_flags & O_NONBLOCK;
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++	struct quickcam *qc = (struct quickcam *) video_get_drvdata(dev);
++#else
+ 	struct quickcam *qc = (struct quickcam *)dev->priv;
++#endif
+ 	int frame_len;
+ 	unsigned char *frame;
+ 	long r = 0;
+@@ -2478,7 +2502,11 @@
+ 	const void *start = (void *)vma->vm_start;
+ 	unsigned long size  = vma->vm_end - vma->vm_start;
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++	struct quickcam *qc = (struct quickcam *) video_get_drvdata(dev);
++#else
+ 	struct quickcam *qc = (struct quickcam *)dev->priv;
++#endif
+ 	unsigned char *frame;
+ 	int ret = 0,  frame_size;
+ #if !HAVE_VMA && LINUX_VERSION_CODE<KERNEL_VERSION(2,6,0)
+@@ -2510,7 +2538,11 @@
+ 	struct video_device *dev = video_devdata(file);
+ 	void *argp = (void *)arg;
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++	struct quickcam *qc = (struct quickcam *) video_get_drvdata(dev);
++#else
+ 	struct quickcam *qc = (struct quickcam *)dev->priv;
++#endif
+ 	int i, retval = 0;
+ 
+ 	if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_ioctl(dev=%p,cmd=%u,arg=%p,qc=%p)",dev,cmd,argp,qc);
+@@ -3161,7 +3193,11 @@
+ 
+ 		/* Register V4L video device */
+ 		memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template));
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++		video_set_drvdata(&qc->vdev, qc);
++#else
+ 		qc->vdev.priv = qc;
++#endif
+ 		r = video_register_device(&qc->vdev, VFL_TYPE_GRABBER, video_nr);
+ 		if (r<0) goto fail3;
+ 		PRINTK(KERN_INFO, "Registered device: /dev/video%i", qc->vdev.minor);
diff --git a/media-video/qc-usb/qc-usb-0.6.6-r2.ebuild b/media-video/qc-usb/qc-usb-0.6.6-r2.ebuild
new file mode 100644
index 000000000000..54116493968a
--- /dev/null
+++ b/media-video/qc-usb/qc-usb-0.6.6-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 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-r2.ebuild,v 1.1 2009/02/15 19:22:53 eva Exp $
+
+inherit linux-mod eutils multilib
+
+DESCRIPTION="Logitech USB Quickcam Express Linux Driver Modules"
+HOMEPAGE="http://qce-ga.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qce-ga/${P}.tar.gz"
+
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+CONFIG_CHECK="USB VIDEO_DEV VIDEO_V4L1_COMPAT"
+MODULE_NAMES="quickcam(usb:)"
+BUILD_TARGETS="all"
+
+RDEPEND="!media-video/qc-usb-messenger"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	ABI=${KERNEL_ABI}
+	linux-mod_pkg_setup
+	BUILD_PARAMS="LINUX_DIR=${KV_DIR} OUTPUT_DIR=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	convert_to_m "${S}"/Makefile
+	epatch "${FILESDIR}/${P}-koutput.patch"
+
+	# Do not strip symbols
+	sed -i -e "s/-s qcset.c/qcset.c/" Makefile
+
+	# Fix compilation with 2.6.24
+	epatch "${FILESDIR}/${P}-kcompat-2.6.24.patch"
+
+	if kernel_is ge 2 6 26; then
+		# Fix compilation with 2.6.26, bug #232390
+		epatch "${FILESDIR}/${P}-kcompat-2.6.26.patch"
+	fi
+
+	if kernel_is ge 2 6 27; then
+		# Fix compilation with 2.6.27
+		epatch "${FILESDIR}/${P}-kcompat-2.6.27.patch"
+	fi
+
+	# Fix compilation with 2.6.28, bug #254564
+	epatch "${FILESDIR}/${P}-kcompat-2.6.28.patch"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dobin qcset
+	dodoc README* APPLICATIONS CREDITS TODO FAQ
+
+	insinto /usr/share/doc/${PF}
+	doins quickcam.sh debug.sh freeshm.sh
+}