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

Package-Manager: portage-2.1.1-r2

4 files changed, 55 insertions, 14 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/Manifest b/media-video/usb-pwc-re/Manifest
index 28826a311d1d..3f9355b3649c 100644
--- a/media-video/usb-pwc-re/Manifest
+++ b/media-video/usb-pwc-re/Manifest
@@ -1,3 +1,7 @@
+AUX config.h.patch 840 RMD160 c60c0c4043cc55544e633add279121529d616227 SHA1 4ed88d21605fed4fe342643733c5619ce41c7f0b SHA256 4d9f1b3a5bed952ba06b298321de12ae0b92ae4e5d5dee08cd119e87dc7d1092
+MD5 97d10102a1b83184f11f24c88032b99d files/config.h.patch 840
+RMD160 c60c0c4043cc55544e633add279121529d616227 files/config.h.patch 840
+SHA256 4d9f1b3a5bed952ba06b298321de12ae0b92ae4e5d5dee08cd119e87dc7d1092 files/config.h.patch 840
 DIST pwc-10.0.11.tar.bz2 46946 RMD160 52c6a1338f4a04cecc80c018b414e4c60b718dd0 SHA1 cbd07ec04b74250d602177d9187d923d578e014b SHA256 4191644d425a209d2a2429019fdced6031ee0c9c02ef1cc4f6469098d65a4b8c
 DIST pwc-10.0.12-rc1.tar.bz2 48861 RMD160 52f526e308494235f0f80c4525d01efc9e2cd107 SHA1 ee26739355381f88848ca40f8f827351a0b9f12f SHA256 dad803c34e902e286a3d6fb052f48b826c62a8ad19a54ced2936da7641b62907
 DIST pwc-10.0.7.tar.bz2 49025 RMD160 b056c18d894670726eb4d383455365bcc8b6ba8e SHA1 04552630459f0dff4dcffa550faf7625e446662d SHA256 d69919ed94909f0c6b0ac1af0fe2180fc8b75f3e905c5209cf54021a4718a3f2
@@ -14,18 +18,18 @@ EBUILD usb-pwc-re-10.0.7.ebuild 1379 RMD160 173386ce96f0e355a408e60dbc6a151afb63
 MD5 5d3c2e8a4b68c22666a96577958aae2c usb-pwc-re-10.0.7.ebuild 1379
 RMD160 173386ce96f0e355a408e60dbc6a151afb63f9fc usb-pwc-re-10.0.7.ebuild 1379
 SHA256 8cafd0e663a6d4c2ec2a518b15f0b88457384949fa2deab2dc95cb32ce8e241c usb-pwc-re-10.0.7.ebuild 1379
-EBUILD usb-pwc-re-20061023.042702-r1.ebuild 1215 RMD160 902a688fa91b34664691c729bc1069c69bf0626e SHA1 3019e51c0320d4d9558573c5aa4b6fe48268d36f SHA256 22f9d31a025378974936075ff751f5fb9ce9a6c9cac48b422d179d03c7e21059
-MD5 7e6c908001d18f43846b2959764e3acb usb-pwc-re-20061023.042702-r1.ebuild 1215
-RMD160 902a688fa91b34664691c729bc1069c69bf0626e usb-pwc-re-20061023.042702-r1.ebuild 1215
-SHA256 22f9d31a025378974936075ff751f5fb9ce9a6c9cac48b422d179d03c7e21059 usb-pwc-re-20061023.042702-r1.ebuild 1215
+EBUILD usb-pwc-re-20061023.042702-r1.ebuild 1475 RMD160 99eea36ea560b0a759a9252162bf36ca2bef9272 SHA1 f788d0ef009aa4252cbed8171e1e2d74aeb198c6 SHA256 12790d29685a69714edb8810135f5e16a3978fde87ee0fec57369e60bba067ec
+MD5 7154d0c9ed9d72169b4c94c22c0a4062 usb-pwc-re-20061023.042702-r1.ebuild 1475
+RMD160 99eea36ea560b0a759a9252162bf36ca2bef9272 usb-pwc-re-20061023.042702-r1.ebuild 1475
+SHA256 12790d29685a69714edb8810135f5e16a3978fde87ee0fec57369e60bba067ec usb-pwc-re-20061023.042702-r1.ebuild 1475
 EBUILD usb-pwc-re-20061023.042702.ebuild 1441 RMD160 93fb53555b1327adf67e622e5e0d972b6e42b8ee SHA1 79fd7624e0a5bc3d223b16c29f3f7772fbe7d27b SHA256 7b54b6ffcb94df0a6fc3070cefef90353213ad3e4f2ffebceb4da24eaaf8a19f
 MD5 7dea454257f68f5315301e21896e220e usb-pwc-re-20061023.042702.ebuild 1441
 RMD160 93fb53555b1327adf67e622e5e0d972b6e42b8ee usb-pwc-re-20061023.042702.ebuild 1441
 SHA256 7b54b6ffcb94df0a6fc3070cefef90353213ad3e4f2ffebceb4da24eaaf8a19f usb-pwc-re-20061023.042702.ebuild 1441
-MISC ChangeLog 3785 RMD160 774de2796c9a3e4e98f287962efe03ba3ce5cce7 SHA1 419df502acd15cbbfd8c3b3aadb7262344d9af4b SHA256 8af60e7e4c19c6be6f02bc1d2d689a3b267c7586b8b2245ee77613a644beb728
-MD5 0454dafbc5b1210c7fd24e2bb18833da ChangeLog 3785
-RMD160 774de2796c9a3e4e98f287962efe03ba3ce5cce7 ChangeLog 3785
-SHA256 8af60e7e4c19c6be6f02bc1d2d689a3b267c7586b8b2245ee77613a644beb728 ChangeLog 3785
+MISC ChangeLog 3980 RMD160 d5f171714449587f90cdf39fcc9c1dbab12569da SHA1 702ed6a6d694058682d60b435d83e4d0b5ea646c SHA256 3e856e3a23c23430f0975fe61d6e62c90ad25ef1c718dbef0efb79b34823c590
+MD5 628fa82daeab4c3b46ba565f2f30d3ba ChangeLog 3980
+RMD160 d5f171714449587f90cdf39fcc9c1dbab12569da ChangeLog 3980
+SHA256 3e856e3a23c23430f0975fe61d6e62c90ad25ef1c718dbef0efb79b34823c590 ChangeLog 3980
 MISC metadata.xml 222 RMD160 80472e8fc32f242b944e7df7d2d89996cf40b5bd SHA1 651558716d8136fa0e5de3766a5fdcf29d0e3eec SHA256 452116b01cc5f6f917f8ce8e2d15fb0de73f054c6bbe6632b39174e9deb8b058
 MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
 RMD160 80472e8fc32f242b944e7df7d2d89996cf40b5bd metadata.xml 222
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