Use linux-mod corrrectly, thanks to Gert-Jan Rodenburg <hertog@home.nl> and Alon Bar-Lev <alon.barlev@gmail.com> in bug 129828, also remove old patches

(Portage version: 2.1_pre10-r2)

4 files changed, 113 insertions, 9 deletions

diff --git a/media-video/qc-usb/ChangeLog b/media-video/qc-usb/ChangeLog
index a70075f7db0b..1185d1283a92 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.13 2006/03/31 17:19:35 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.14 2006/05/03 22:56:02 genstef Exp $
+
+  03 May 2006; Stefan Schweizer <genstef@gentoo.org>
+  -files/qc-usb-0.6.0-gcc34.patch, -files/0.6.2-linux-2.6.11.patch,
+  +files/qc-usb-gcc4.patch, qc-usb-0.6.3.ebuild:
+  Use linux-mod corrrectly, thanks to Gert-Jan Rodenburg <hertog@home.nl> and
+  Alon Bar-Lev <alon.barlev@gmail.com> in bug 129828, also remove old patches
 
   31 Mar 2006; Simon Stelling <blubb@gentoo.org> qc-usb-0.6.3.ebuild:
   fix bug 128257
diff --git a/media-video/qc-usb/files/digest-qc-usb-0.6.3 b/media-video/qc-usb/files/digest-qc-usb-0.6.3
index 682760d0eda7..df58dd30fac4 100644
--- a/media-video/qc-usb/files/digest-qc-usb-0.6.3
+++ b/media-video/qc-usb/files/digest-qc-usb-0.6.3
@@ -1 +1,3 @@
 MD5 3d33380a29a7f92c4eef1f82d61b4ee0 qc-usb-0.6.3.tar.gz 148994
+RMD160 248768b551dc810dea524567e73b591353c0f8ed qc-usb-0.6.3.tar.gz 148994
+SHA256 fee6264949107e5d879525487c1c3b27ea208ea854792d8c87142143cb2f2aa5 qc-usb-0.6.3.tar.gz 148994
diff --git a/media-video/qc-usb/files/qc-usb-gcc4.patch b/media-video/qc-usb/files/qc-usb-gcc4.patch
new file mode 100644
index 000000000000..3854814c8c2d
--- /dev/null
+++ b/media-video/qc-usb/files/qc-usb-gcc4.patch
@@ -0,0 +1,93 @@
+diff -ur qc-usb-0.6.3.orig/qc-driver.c qc-usb-0.6.3/qc-driver.c
+--- qc-usb-0.6.3.orig/qc-driver.c	2006-05-04 00:41:21.000000000 +0200
++++ qc-usb-0.6.3/qc-driver.c	2006-05-04 00:44:19.000000000 +0200
+@@ -75,63 +75,63 @@
+ #endif
+ /* }}} */
+ /* {{{ [fold] Module parameters  */
+-MODULE_PARM_DESC(qcdebug, "Sets the debug output (bitfield)");
+-MODULE_PARM(qcdebug, "i");
+ int qcdebug = DEBUGLEVEL;
++MODULE_PARM_DESC(qcdebug, "Sets the debug output (bitfield)");
++module_param(qcdebug, int, 0);
+ 
+-MODULE_PARM_DESC(keepsettings, "Keep picture settings across one open to another (0-1)");
+-MODULE_PARM(keepsettings, "i");
+ static int keepsettings = 0;
++MODULE_PARM_DESC(keepsettings, "Keep picture settings across one open to another (0-1)");
++module_param(keepsettings, int, 0);
+ 
+-MODULE_PARM_DESC(settle, "Maximum number of frames to wait picture brightness to settle (0-255)");
+-MODULE_PARM(settle, "i");
+ static int settle = 0;
++MODULE_PARM_DESC(settle, "Maximum number of frames to wait picture brightness to settle (0-255)");
++module_param(settle, int, 0);
+ 
+ /* Subsampling is used to allow higher scan rate with smaller images. */
+-MODULE_PARM_DESC(subsample, "Sets subsampling (0-1)");
+-MODULE_PARM(subsample, "i");
+ static int subsample = 0;	/* normal or sub-sample (sub-sample to increase the speed) */
++MODULE_PARM_DESC(subsample, "Sets subsampling (0-1)");
++module_param(subsample, int, 0);
+ 
+-MODULE_PARM_DESC(compress, "Enable compressed mode (0-1)");
+-MODULE_PARM(compress, "i");
+ static int compress = 0;	/* Enable compressed mode if available (higher framerate) */
++MODULE_PARM_DESC(compress, "Enable compressed mode (0-1)");
++module_param(compress, int, 0);
+ 
+-MODULE_PARM_DESC(frameskip, "How frequently capture frames (0-10)");
+-MODULE_PARM(frameskip, "i");
+ static int frameskip = 0;
++MODULE_PARM_DESC(frameskip, "How frequently capture frames (0-10)");
++module_param(frameskip, int, 0);
+ 
+-MODULE_PARM_DESC(quality, "Sets the picture quality (0-5)");
+-MODULE_PARM(quality, "i");
+ static int quality = 5;		/* 5 = generalized adjustable Pei-Tam method */
++MODULE_PARM_DESC(quality, "Sets the picture quality (0-5)");
++module_param(quality, int, 0);
+ 
+-MODULE_PARM_DESC(adaptive, "Automatic adaptive brightness control (0-1)");
+-MODULE_PARM(adaptive, "i");
+ static int adaptive = 1;
++MODULE_PARM_DESC(adaptive, "Automatic adaptive brightness control (0-1)");
++module_param(adaptive, int, 0);
+ 
+-MODULE_PARM_DESC(equalize, "Equalize image (0-1)");
+-MODULE_PARM(equalize, "i");
+ static int equalize = 0;	/* Disabled by default */
++MODULE_PARM_DESC(equalize, "Equalize image (0-1)");
++module_param(equalize, int, 0);
+ 
+-MODULE_PARM_DESC(userlut, "Apply user-specified lookup-table (0-1)");
+-MODULE_PARM(userlut, "i");
+ static int userlut = 0;		/* Disabled by default */
++MODULE_PARM_DESC(userlut, "Apply user-specified lookup-table (0-1)");
++module_param(userlut, int, 0);
+ 
+-MODULE_PARM_DESC(retryerrors, "Retry if image capture fails, otherwise return error code (0-1)");
+-MODULE_PARM(retryerrors, "i");
+ static int retryerrors = 1;	/* Enabled by default */
++MODULE_PARM_DESC(retryerrors, "Retry if image capture fails, otherwise return error code (0-1)");
++module_param(retryerrors, int, 0);
+ 
+ /* Bug in Xvideo(?): if the width is not divisible by 8 and Xvideo is used, the frame is shown wrongly */
+-MODULE_PARM_DESC(compatible, "Enable workaround for bugs in application programs (bitfield)");
+-MODULE_PARM(compatible, "i");
+ static int compatible = 0;	/* Disabled by default */
++MODULE_PARM_DESC(compatible, "Enable workaround for bugs in application programs (bitfield)");
++module_param(compatible, int, 0);
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,5)
++static int video_nr = -1;
+ MODULE_PARM_DESC(video_nr, "Set videodevice number (/dev/videoX)");
+-MODULE_PARM(video_nr,"i");
++module_param(video_nr, int, 0);
+ /* video_nr option allows to specify a certain /dev/videoX device */
+ /* (like /dev/video0 or /dev/video1 ...)                          */
+ /* for autodetect first available use video_nr=-1 (defaultvalue)  */
+-static int video_nr = -1;
+ #endif
+ /* }}} */
+ /* {{{ [fold] Miscellaneous data  */
diff --git a/media-video/qc-usb/qc-usb-0.6.3.ebuild b/media-video/qc-usb/qc-usb-0.6.3.ebuild
index caad9d5f0dc4..74cf23eca8ad 100644
--- a/media-video/qc-usb/qc-usb-0.6.3.ebuild
+++ b/media-video/qc-usb/qc-usb-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.3.ebuild,v 1.6 2006/04/11 16:56:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/qc-usb-0.6.3.ebuild,v 1.7 2006/05/03 22:56:02 genstef Exp $
 
 inherit linux-mod eutils multilib
 
@@ -13,8 +13,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
 
+CONFIG_CHECK="USB VIDEO_DEV"
+MODULE_NAMES="quickcam(usb:)"
+BUILD_TARGETS="all"
+
 pkg_setup() {
 	ABI=${KERNEL_ABI}
+	linux-mod_pkg_setup
+	BUILD_PARAMS="LINUX_DIR=${KV_DIR}"
 }
 
 src_unpack() {
@@ -23,19 +29,16 @@ src_unpack() {
 
 	# Linux 2.6.16 compatibility, bug #127018
 	epatch ${FILESDIR}/${P}-linux-2.6.16.patch
-}
-
-src_compile() {
-	emake LINUX_DIR=${KERNEL_DIR} all || die
+	convert_to_m ${S}/Makefile
+	epatch ${FILESDIR}/qc-usb-gcc4.patch
 }
 
 src_install() {
-	insinto /lib/modules/${KV}/drivers/usb
-	doins quickcam.${KV_OBJ}
+	linux-mod_src_install
+
 	dobin qcset
 	dodoc README* APPLICATIONS COPYING CREDITS TODO FAQ
 
 	insinto /usr/share/doc/${PF}
 	doins quickcam.sh debug.sh freeshm.sh
 }
-