Apply 2.6.27 compat patch from bug #245581, thanks to Thomas Juerges.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27.7 i686

4 files changed, 99 insertions, 12 deletions

diff --git a/media-video/qc-usb-messenger/ChangeLog b/media-video/qc-usb-messenger/ChangeLog
index 4f72eec712b9..095160f6fa92 100644
--- a/media-video/qc-usb-messenger/ChangeLog
+++ b/media-video/qc-usb-messenger/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2008/11/13 11:25:45 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb-messenger/ChangeLog,v 1.16 2008/12/10 05:10:19 ssuominen Exp $
+
+*qc-usb-messenger-1.8-r1 (10 Dec 2008)
+
+  10 Dec 2008; <ssuominen@gentoo.org>
+  +files/qc-usb-messenger-1.8-kcompat-2.6.27.patch,
+  +qc-usb-messenger-1.8-r1.ebuild:
+  Apply 2.6.27 compat patch from bug #245581, thanks to Thomas Juerges.
 
   13 Nov 2008; Torsten Veller <tove@gentoo.org> qc-usb-messenger-1.8.ebuild:
   x86 stable (#245688)
diff --git a/media-video/qc-usb-messenger/Manifest b/media-video/qc-usb-messenger/Manifest
index 5f346f87563e..cb931ad91375 100644
--- a/media-video/qc-usb-messenger/Manifest
+++ b/media-video/qc-usb-messenger/Manifest
@@ -1,8 +1,6 @@
------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-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
@@ -13,13 +11,7 @@ EBUILD qc-usb-messenger-1.5.ebuild 1121 RMD160 439cb1bee421122a5e682bd44efaff789
 EBUILD qc-usb-messenger-1.6.ebuild 1084 RMD160 f07ed76b9e3034c9ed810c833c300685a428eb06 SHA1 f7e7e51084050f86606c852c434197b1b1dbdc40 SHA256 d1efb344676891db3500eb06694717cd6580a1852530fa72ca58faf5a9d528db
 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 1254 RMD160 7167bd7043ce0297b5f00e4be82a826b1ecf970a SHA1 9f8f284d20c0584f6de9e78252be0fbccf0471d6 SHA256 849ffdcbe3ca6c0a8104bd5070605f99412b4220fa527ec3250b1c0b941cb19d
 EBUILD qc-usb-messenger-1.8.ebuild 1196 RMD160 4036d43c7774e114284ecb3a8bfbd833c04e8091 SHA1 f0d8f40f8c7e019191f3cae79d915020208ed0a5 SHA256 857662f2d571887713cbc11be806625b789a971444679d46fa19407a02907527
-MISC ChangeLog 2453 RMD160 e9e2c894057f9510ab8fbda5c8766a13b9759b19 SHA1 f29ad65f4822526886daf378721c20f65ae43578 SHA256 64ed5ac9654d44b0143e853cb1d033c2424b6a59db2253b17def374f421b1d49
+MISC ChangeLog 2696 RMD160 41b1c8d6d5ffbb2060b201330053f8b98c67cd59 SHA1 ae4b23a3f696175f5a743bddb7d82de058e7f402 SHA256 53e44852f9f3250c7628ac72e1cb3567d2205e5ad2297e76eec58d06962b2bc1
 MISC metadata.xml 257 RMD160 a3dc4ad9897ee2b532b103b50ef831f71dc51626 SHA1 9501e3c7eaea3e50874f6215a6f8a5af28228bc3 SHA256 f9be4d35e47c1b9b7f4a818ae47c35d15c836160a2e750db598b94bbd54b8546
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkcDq4ACgkQV3J2n04EauwZZgCgkIFnms8DTTGYQ4Lp0gpsiJc2
-yxIAnRjxdp0SvyLBwTQKHh433IWS4OTy
-=QuVM
------END PGP SIGNATURE-----
diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.27.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.27.patch
new file mode 100644
index 000000000000..9284800e0dce
--- /dev/null
+++ b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.27.patch
@@ -0,0 +1,38 @@
+--- qc-usb-messenger-1.8.org/qc-driver.c	2008-11-04 12:23:01.000000000 -0700
++++ qc-usb-messenger-1.8/qc-driver.c	2008-11-04 12:52:24.000000000 -0700
+@@ -2895,7 +2895,11 @@
+ 			if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP");
+ 			memset(&b, 0, sizeof(b));
+ 			strcpy(b.name, "Logitech QuickCam USB");	/* Max 31 characters */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++			b.type      = qc->vdev.vfl_type;
++#else
+ 			b.type      = qc->vdev.type;
++#endif
+ 			b.channels  = 1;
+ 			b.audios    = 0;
+ 			b.maxwidth  = qc->sensor_data.maxwidth;
+@@ -3035,7 +3039,11 @@
+ 		  if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOC_QUERYCAP");
+ 		  memset(&vc, 0, sizeof(vc));
+ 		  strcpy(vc.name, "Logitech QuickCam USB");	/* Max 31 characters */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++		  vc.type = qc->vdev.vfl_type;
++#else
+ 		  vc.type = qc->vdev.type;
++#endif
+ 		  vc.inputs = 1;
+ 		  vc.outputs = 0;
+ 		  vc.audios = 0;
+@@ -3484,7 +3492,11 @@
+ 
+ static struct video_device qc_v4l_template = {
+ 	name:		"QuickCam USB",
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++	vfl_type:		VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE,
++#else
+ 	type:		VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE,
++#endif
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 	hardware:	VID_HARDWARE_QCAM_USB,
+ #endif
diff --git a/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r1.ebuild b/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r1.ebuild
new file mode 100644
index 000000000000..1be05949a655
--- /dev/null
+++ b/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r1.ebuild
@@ -0,0 +1,50 @@
+# 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-messenger/qc-usb-messenger-1.8-r1.ebuild,v 1.1 2008/12/10 05:10:19 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 ~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
+}
+
+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'."
+}