Preparing for 2.6.19 and fixing the linux-mod-stuff, bugs #158609, #159520.

(Portage version: 2.1.1-r2)

3 files changed, 43 insertions, 6 deletions

diff --git a/media-video/usb-pwc-re/ChangeLog b/media-video/usb-pwc-re/ChangeLog
index b7f06c993a5f..c4c1015ddffa 100644
--- a/media-video/usb-pwc-re/ChangeLog
+++ b/media-video/usb-pwc-re/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/usb-pwc-re
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.26 2006/12/30 11:26:02 phosphan Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.27 2007/01/08 12:58:01 phosphan Exp $
+
+  08 Jan 2007; Patrick Kursawe <phosphan@gentoo.org> +files/config.h.patch,
+  usb-pwc-re-20061023.042702-r1.ebuild:
+  Preparing for 2.6.19 and fixing the linux-mod-stuff, bugs #158609, #159520.
 
   30 Dec 2006; Patrick Kursawe <phosphan@gentoo.org>
   +usb-pwc-re-20061023.042702-r1.ebuild:
diff --git a/media-video/usb-pwc-re/files/config.h.patch b/media-video/usb-pwc-re/files/config.h.patch
new file mode 100644
index 000000000000..ecfe9eef2ac2
--- /dev/null
+++ b/media-video/usb-pwc-re/files/config.h.patch
@@ -0,0 +1,25 @@
+Common subdirectories: pwc-v4l2-20061023-042702/.tmp_versions and pwc-fixed/.tmp_versions
+diff -u pwc-v4l2-20061023-042702/pwc-uncompress.h pwc-fixed/pwc-uncompress.h
+--- pwc-v4l2-20061023-042702/pwc-uncompress.h	2006-01-07 12:57:47.000000000 +0100
++++ pwc-fixed/pwc-uncompress.h	2007-01-02 17:34:31.000000000 +0100
+@@ -30,7 +30,7 @@
+ #ifndef PWC_UNCOMPRESS_H
+ #define PWC_UNCOMPRESS_H
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ 
+ #include "pwc-ioctl.h"
+ 
+diff -u pwc-v4l2-20061023-042702/pwc.h pwc-fixed/pwc.h
+--- pwc-v4l2-20061023-042702/pwc.h	2006-09-25 21:56:26.000000000 +0200
++++ pwc-fixed/pwc.h	2007-01-02 17:34:53.000000000 +0100
+@@ -25,7 +25,7 @@
+ #ifndef PWC_H
+ #define PWC_H
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/usb.h>
+ #include <linux/spinlock.h>
diff --git a/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild b/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild
index 0bcaee2a5f90..c686084a486c 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild,v 1.1 2006/12/30 11:26:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-20061023.042702-r1.ebuild,v 1.2 2007/01/08 12:58:01 phosphan Exp $
 
 
-inherit linux-mod
+inherit linux-mod eutils
 
 DESCRIPTION="Free Philips USB Webcam driver for Linux that supports VGA resolution, newer kernels and replaces the old pwcx module."
 HOMEPAGE="http://www.saillard.org/pwc/"
@@ -20,13 +20,21 @@ RDEPEND=""
 
 # linux-mod variables
 BUILD_TARGETS="all"
+BUILD_PARAMS="KSRC=${KERNEL_DIR}"
 MODULE_NAMES="pwc(media/video:)"
-CONFIG_CHECK="USB !USB_PWC"
+CONFIG_CHECK="USB VIDEO_V4L1_COMPAT !USB_PWC"
 ERROR_USB="${P} requires Host-side USB support (CONFIG_USB)."
 ERROR_USB_PWC="${P} requires the in-kernel version of the PWC driver to be disabled (CONFIG_USB_PWC)."
+ERROR_VIDEO_V4L1_COMPAT="{$P} requires support for the Video For Linux API 1 compatibility layer (CONFIG_VIDEO_V4L1_COMPAT)."
 
 S=${WORKDIR}/pwc-v4l2-${MY_PV}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/config.h.patch
+}
+
 pkg_setup() {
 	linux-mod_pkg_setup