Fix compatibility with linux 2.6.28 (bug #252849) and fix Makefile to support ppc and ppc64 (not keyworded though, bug #245585). Thanks to Thomas Juergues <thomas@sokrates.homelinux.net> for both patches.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-gentoo-r7 x86_64

5 files changed, 197 insertions, 13 deletions

diff --git a/media-video/qc-usb-messenger/ChangeLog b/media-video/qc-usb-messenger/ChangeLog
index 306c6e51943b..13a5d0c4aedc 100644
--- a/media-video/qc-usb-messenger/ChangeLog
+++ b/media-video/qc-usb-messenger/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/qc-usb-messenger
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb-messenger/ChangeLog,v 1.18 2008/12/25 15:45:57 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb-messenger/ChangeLog,v 1.19 2009/01/09 21:18:12 coldwind Exp $
+
+*qc-usb-messenger-1.8-r2 (09 Jan 2009)
+
+  09 Jan 2009; Santiago M. Mola <coldwind@gentoo.org>
+  +files/qc-usb-messenger-1.8-kcompat-2.6.28.patch,
+  +files/qc-usb-messenger-1.8-ppc.patch, +qc-usb-messenger-1.8-r2.ebuild:
+  Fix compatibility with linux 2.6.28 (bug #252849) and fix Makefile to
+  support ppc and ppc64 (not keyworded though, bug #245585). Thanks to
+  Thomas Juergues <thomas@sokrates.homelinux.net> for both patches.
 
   25 Dec 2008; Markus Meier <maekke@gentoo.org>
   qc-usb-messenger-1.8-r1.ebuild:
diff --git a/media-video/qc-usb-messenger/Manifest b/media-video/qc-usb-messenger/Manifest
index 717a3b1ec994..f7e9b0065a34 100644
--- a/media-video/qc-usb-messenger/Manifest
+++ b/media-video/qc-usb-messenger/Manifest
@@ -1,9 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qc-usb-messenger-1.7-2.6.24.patch 2680 RMD160 a919437d8c6c90bda9728298b89acf550794aca5 SHA1 57c998b7b9d67e5ee57548e708e374a0a10bcdbc SHA256 374b18a9ff6ea61edd9ac66a4b0475275009598c78427eecbdbacaee5c22ac09
 AUX qc-usb-messenger-1.8-kcompat-2.6.26.patch 12397 RMD160 5fa23ace7c3715e8d3a829e6e718891430351caf SHA1 c44e1c9264d8a36fb45d211e340bf27d3b39d55d SHA256 a3f045781b0e1af0b9c2efbe682ddac0980bdadcceb78e461462d2ca656da3ad
 AUX qc-usb-messenger-1.8-kcompat-2.6.27.patch 1285 RMD160 ba8e3f92e763f6424ddaa0249b7627b15922007c SHA1 fd9ce481e20a31a4e6e213f15c00235635585698 SHA256 6fb7f717401943889d6d45c717a3eaef84c7d0f7cac0c0a767555985bdc93c59
+AUX qc-usb-messenger-1.8-kcompat-2.6.28.patch 4062 RMD160 97c120881806f4ad82968d345e06e3823ecc3b8d SHA1 708cbd8fe4dc5d3f3851d331c8b369d43d02a74b SHA256 13bb1cc6cc7b85916b924121b8c85bbcc815328bc93b0e9726fbb1e579d51a98
+AUX qc-usb-messenger-1.8-ppc.patch 857 RMD160 b6cf8a184cdb3ea6f478202fccc24fd3257d57a4 SHA1 4acdccac7f139a72112729a9e3886f2ba9138cae SHA256 99a6dd740a1133e824a61aa347cdfb646cfc0f7a908226497813f0084e3f703f
 AUX qc-usb-messenger-2.6.19.patch 458 RMD160 b342699e447f88d488b2ae38399a19b5113927eb SHA1 67a5b14f409da9ffe9a69fa8c00243f4185d3fa9 SHA256 f34da6c0b67f5c269cf4e67663d9ef6e9673f2e0d6f343bb258573111c6937ea
 AUX qc-usb-messenger-koutput.patch 2424 RMD160 8e061adb423e6a78900160c7f66fdf2fa9ced872 SHA1 a5cdd2e355bc89ae86b0f606b39bcfa00e36ec56 SHA256 ec6d308f351830f06bce785314a860424ce045e737c3bafddc9b8532f0a4e63f
 DIST qc-usb-messenger-1.5.tar.gz 167203 RMD160 e885b6d3c0508964df1ca81805435ebe996fba13 SHA1 c152ad98cf1b9684bee8350860d84c0d197bc76f SHA256 b5b0d23bffdb2edb8c7a0baeed704c41e327d61279190e309701ed4a39ad4c02
@@ -15,13 +14,7 @@ EBUILD qc-usb-messenger-1.6.ebuild 1084 RMD160 f07ed76b9e3034c9ed810c833c300685a
 EBUILD qc-usb-messenger-1.7-r1.ebuild 1098 RMD160 e475324a8d8d238f38f41569e24542a0954fcb57 SHA1 59b9e4e5a8fd1a362a6d34dbc3fcdc79d5581358 SHA256 c20dac3de037384aeff635eedef808f973d0bd593ddf1dea8a1dcef4be929cc5
 EBUILD qc-usb-messenger-1.7.ebuild 1055 RMD160 425c88cc7af4eae809ab2fb694c4109e40dc4c12 SHA1 00d24ebccc40ecff4de72757fcdc212c65e776b5 SHA256 3866d31e503c51b3bb5da368d7c3801986d4975414919beba7fa32eb4f006d32
 EBUILD qc-usb-messenger-1.8-r1.ebuild 1249 RMD160 39f2e640a2c130c69283707595a6e31373407979 SHA1 fec6670e9c872fbef36e318ed65b17eae923bd9e SHA256 627606c0962f89ea6a78284aca8448ea8c3517e74f8b55a175a4536315330b68
+EBUILD qc-usb-messenger-1.8-r2.ebuild 1338 RMD160 13c2430f781fbf5bdccb05da66083985c06ca527 SHA1 2fbf84075806440b8df9cae57a08547726e6dfca SHA256 eb8f7d12d1ad97967c8c2c092165e781912e128f71b40684903c0c2614ce9cf3
 EBUILD qc-usb-messenger-1.8.ebuild 1196 RMD160 4036d43c7774e114284ecb3a8bfbd833c04e8091 SHA1 f0d8f40f8c7e019191f3cae79d915020208ed0a5 SHA256 857662f2d571887713cbc11be806625b789a971444679d46fa19407a02907527
-MISC ChangeLog 2920 RMD160 bee480453cc4b5bde72fe1a372b620f2bdd21c7d SHA1 95146f0e67d4185ad3c365d900e126d5376e293a SHA256 a02d33c9acbdf9eee11e85398298f12112800627682cbf3e4221591a699f438e
+MISC ChangeLog 3354 RMD160 a041dbc12456900408f7650a10f9b21434dcbf22 SHA1 4197ead03e326bc31a5e9b4da9ec347960b0fdef SHA256 81be17c6a4cb6e1d25bbb3df169133068a6579545f784a6d16a6145d4a7a42cf
 MISC metadata.xml 257 RMD160 a3dc4ad9897ee2b532b103b50ef831f71dc51626 SHA1 9501e3c7eaea3e50874f6215a6f8a5af28228bc3 SHA256 f9be4d35e47c1b9b7f4a818ae47c35d15c836160a2e750db598b94bbd54b8546
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklTqrwACgkQkKaRLQcq0GLOKwCfZmxM2Ifb0O+3ypbQfau5Ppyt
-1+8AnjqU4HxMs2CaB1w78XyG1tnFcRLr
-=dS3v
------END PGP SIGNATURE-----
diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.28.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.28.patch
new file mode 100644
index 000000000000..83bec2c5011a
--- /dev/null
+++ b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.28.patch
@@ -0,0 +1,114 @@
+Source: Thomas Juerges <thomas@sokrates.homelinux.net>
+Upstream: unknown
+Reason: Linux 2.6.28 compatibility. http://bugs.gentoo.org/show_bug.cgi?id=252849
+
+--- qc-usb-messenger-1.8.org/qc-driver.c	2008-12-28 11:40:18.000000000 -0700
++++ qc-usb-messenger-1.8/qc-driver.c	2008-12-28 11:24:23.000000000 -0700
+@@ -2486,7 +2486,7 @@
+ 		}
+ 
+ 		if (qc->settings.adaptive && !qc->sensor_data.sensor->autoexposure && r>=0 && midvalue>=0) {
+-			int ex, gn;
++			int ex = 0, gn = 0;
+ 			qc_adapt(qc, midvalue, qc->vpic.brightness>>8, &ex, &gn);
+ 			qc->sensor_data.sensor->set_levels(qc, ex, gn, qc->vpic.hue, qc->vpic.colour);
+ 			if(qc->settings.shutteradapt)
+@@ -2622,7 +2622,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;
+ 
+@@ -2674,7 +2678,11 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ 	struct video_device *dev = video_devdata(file);
+ #endif
+-	struct quickcam *qc = dev->priv;
++#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 r;
+ 
+ 	if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_open(qc=%p)", qc);
+@@ -2739,7 +2747,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)
+@@ -2788,7 +2800,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;
+@@ -2845,7 +2861,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)
+@@ -2877,7 +2897,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);
+@@ -3688,8 +3712,12 @@
+ 	qc->input_ptr->id.vendor = qc->dev->descriptor.idVendor;
+ 	qc->input_ptr->id.product = qc->dev->descriptor.idProduct;
+ 	qc->input_ptr->id.version = qc->dev->descriptor.bcdDevice;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++	r = input_register_device(qc->input_ptr);
++	CHECK_ERROR(r != 0, fail2b, "qc_int_init input_register_device failed %d", r);
++#else
+ 	input_register_device(qc->input_ptr);
+-
++#endif
+ 	*qc->input_event_path = '\0';
+ 	usb_make_path(qc->dev, qc->input_physname, 56);
+ 	strcat(qc->input_physname, "/input0");
+@@ -3748,7 +3776,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
+ 
+ 		mb();
+ 		r = video_register_device(&qc->vdev, VFL_TYPE_GRABBER, video_nr);
diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-ppc.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-ppc.patch
new file mode 100644
index 000000000000..6e270ada1b4b
--- /dev/null
+++ b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-ppc.patch
@@ -0,0 +1,16 @@
+Source: Written by Thomas Juerges <thomas@sokrates.homelinux.net>, thanks to Joseph Jezak <josejx@gentoo.org>
+        for the tip about ppc64.
+Upstream: unknown
+Reason: Support ppc and ppc64. https://bugs.gentoo.org/show_bug.cgi?id=245585
+
+--- qc-usb-messenger-1.8/Makefile	2008-11-04 11:36:03.000000000 -0700
++++ qc-usb-messenger-1.8.new/Makefile	2008-11-04 11:23:45.000000000 -0700
+@@ -70,7 +70,7 @@
+ USER_OPT := $(USER_OPT) -DHAVE_UTSRELEASE_H=$(HAVE_UTSRELEASE_H)
+ endif
+ 
+-ARCH    := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
++ARCH    := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/powerpc/ -e s/ppc/powerpc/)
+ INSTALL := $(shell which install)
+ DEPMOD  := $(shell which depmod || which /sbin/depmod || echo "true You should now run depmod")
+ 
diff --git a/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r2.ebuild b/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r2.ebuild
new file mode 100644
index 000000000000..1b948ddbf4a9
--- /dev/null
+++ b/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r2.ebuild
@@ -0,0 +1,52 @@
+# 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-r2.ebuild,v 1.1 2009/01/09 21:18:12 coldwind 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 ~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}-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'."
+}