Fix building with >= 2.6.30 wrt #277605, thanks to Stijn Tintel for reporting and patch.

(Portage version: 2.2_rc42/cvs/Linux x86_64)

3 files changed, 95 insertions, 1 deletions

diff --git a/media-video/qc-usb-messenger/ChangeLog b/media-video/qc-usb-messenger/ChangeLog
index 894663ae4436..eae21ca7540e 100644
--- a/media-video/qc-usb-messenger/ChangeLog
+++ b/media-video/qc-usb-messenger/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/qc-usb-messenger
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb-messenger/ChangeLog,v 1.21 2009/01/10 11:46:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb-messenger/ChangeLog,v 1.22 2009/09/30 17:52:36 ssuominen Exp $
+
+*qc-usb-messenger-1.8-r3 (30 Sep 2009)
+
+  30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +qc-usb-messenger-1.8-r3.ebuild,
+  +files/qc-usb-messenger-1.8-kcompat-2.6.30.patch:
+  Fix building with >= 2.6.30 wrt #277605, thanks to Stijn Tintel for
+  reporting and patch.
 
   10 Jan 2009; Markus Meier <maekke@gentoo.org>
   qc-usb-messenger-1.8-r2.ebuild:
diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.30.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.30.patch
new file mode 100644
index 000000000000..4d908aa597b0
--- /dev/null
+++ b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.30.patch
@@ -0,0 +1,33 @@
+diff -Nurb qc-usb-messenger-1.8/qc-driver.c qc-usb-messenger-1.8-2.6.30/qc-driver.c
+--- qc-usb-messenger-1.8/qc-driver.c	2009-07-10 22:14:56.065971478 +0200
++++ qc-usb-messenger-1.8-2.6.30/qc-driver.c	2009-07-10 22:44:47.676535154 +0200
+@@ -1124,7 +1124,6 @@
+ 		PRINTK(KERN_WARNING,"Could not register procfs file entry");
+ 		return -ENXIO;
+ 	}
+-	entry->owner = THIS_MODULE;
+ 	entry->data = qc;
+ 	entry->read_proc = qc_proc_read;
+ 	entry->write_proc = qc_proc_write;
+@@ -1137,7 +1136,6 @@
+ 		PRINTK(KERN_WARNING,"Could not register procfs file entry");
+ 		return -ENXIO;
+ 	}
+-	entry->owner = THIS_MODULE;
+ 	entry->data = qc;
+ 	entry->read_proc = qc_proc_button_read;
+ 	entry->write_proc = qc_proc_write;
+@@ -1179,13 +1177,11 @@
+ 		PRINTK(KERN_WARNING,"Could not register procfs dir entry");
+ 		return -ENXIO;
+ 	}
+-	qc_proc_video_entry->owner = THIS_MODULE;
+ 	qc_proc_quickcam_entry = create_proc_entry(qc_proc_quickcam_name, S_IFDIR, qc_proc_video_entry);
+ 	if (!qc_proc_quickcam_entry) {
+ 		PRINTK(KERN_WARNING,"Could not register procfs dir entry");
+ 		return -ENXIO;
+ 	}
+-	qc_proc_quickcam_entry->owner = THIS_MODULE;
+ 	return 0;
+ }
+ /* }}} */
diff --git a/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r3.ebuild b/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r3.ebuild
new file mode 100644
index 000000000000..2eb1703dd0ae
--- /dev/null
+++ b/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r3.ebuild
@@ -0,0 +1,53 @@
+# 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-messenger/qc-usb-messenger-1.8-r3.ebuild,v 1.1 2009/09/30 17:52:36 ssuominen Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="Logitech USB Quickcam Express Messenger & Communicate Linux Driver Modules"
+HOMEPAGE="http://home.mag.cx/messenger"
+SRC_URI="http://home.mag.cx/messenger/source/${P}.tar.gz"
+
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+CONFIG_CHECK="USB VIDEO_DEV VIDEO_V4L1_COMPAT"
+MODULE_NAMES="qcmessenger(usb:)"
+BUILD_TARGETS="all"
+
+DEPEND="virtual/linux-sources
+	!media-video/qc-usb"
+
+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 Makefile
+	epatch "${FILESDIR}"/${PN}-koutput.patch
+	epatch "${FILESDIR}"/${P}-kcompat-2.6.26.patch
+	epatch "${FILESDIR}"/${P}-kcompat-2.6.27.patch
+	epatch "${FILESDIR}"/${P}-kcompat-2.6.28.patch
+	epatch "${FILESDIR}"/${P}-kcompat-2.6.30.patch
+	epatch "${FILESDIR}"/${P}-ppc.patch
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dobin qcset
+	dodoc README* APPLICATIONS CREDITS TODO FAQ _CHANGES_MESSENGER _README_MESSENGER
+
+	insinto /usr/share/doc/${PF}
+	doins *.sh
+}
+
+pkg_postinst() {
+	elog "QuickCam Messenger module is now called 'qcmessenger'."
+}