bump to 20060501-r1 for kernel >2.6.17 support. see bug 148425

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 79 insertions, 17 deletions

diff --git a/media-video/spca5xx/ChangeLog b/media-video/spca5xx/ChangeLog
index 075f9f64ed03..2aabf188d6ca 100644
--- a/media-video/spca5xx/ChangeLog
+++ b/media-video/spca5xx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/spca5xx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/ChangeLog,v 1.24 2006/07/16 22:56:24 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/ChangeLog,v 1.25 2006/10/22 15:04:58 kingtaco Exp $
+
+*spca5xx-20060501-r1 (22 Oct 2006)
+
+  22 Oct 2006; Mike Doty <kingtaco@gentoo.org>
+  +files/spca-20060501-2.6.18.patch, +spca5xx-20060501-r1.ebuild:
+  Added 20060501-r1 for support of >2.6.17 kernels. see bug 148425. spca5xx
+  will soon be replaced by gspca.
 
   16 Jul 2006; Daniel Black <dragonheart@gentoo.org>
   +files/spca-20060501-defines.patch, spca5xx-20060501.ebuild:
diff --git a/media-video/spca5xx/Manifest b/media-video/spca5xx/Manifest
index 24ea4ce8872d..6e95355f7bc5 100644
--- a/media-video/spca5xx/Manifest
+++ b/media-video/spca5xx/Manifest
@@ -1,12 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX spca-20060501-2.6.18.patch 433 RMD160 457e16a863a78d0690b27155e7eab53f4af7b84d SHA1 d5183a65ace55b9ba3a1db92d6fa359118f00219 SHA256 c8cf5190ec60756eb531a8d0cf2bdb03c55d825daff83d6e5d5b2d0096f317c7
+MD5 7071693a1c26d7a2d29a33a9e66d7845 files/spca-20060501-2.6.18.patch 433
+RMD160 457e16a863a78d0690b27155e7eab53f4af7b84d files/spca-20060501-2.6.18.patch 433
+SHA256 c8cf5190ec60756eb531a8d0cf2bdb03c55d825daff83d6e5d5b2d0096f317c7 files/spca-20060501-2.6.18.patch 433
 AUX spca-20060501-defines.patch 523 RMD160 fb552bb37282516f525c3d0a94907b962cf071dc SHA1 7391dd84ab489375714b0e079aceed66456acf46 SHA256 7f89425e507fd3685dca5f0e980fc83267bec0f0e24c707b6299b5a9a61d93a5
 MD5 2896ecaf4977c19608d10a92ba3d8135 files/spca-20060501-defines.patch 523
 RMD160 fb552bb37282516f525c3d0a94907b962cf071dc files/spca-20060501-defines.patch 523
 SHA256 7f89425e507fd3685dca5f0e980fc83267bec0f0e24c707b6299b5a9a61d93a5 files/spca-20060501-defines.patch 523
-DIST spca5xx-20060202.tar.gz 193391 RMD160 c39344edd063bc8159737279c773d9e5daca243d SHA256 514a8c57240b0c7767ba359d85b7980b7eaae6021f3117ae26fa562c2c562724
-DIST spca5xx-20060301.tar.gz 194600 RMD160 02e2cfd8952dcebde0f8b9a87d27a13627d354bc SHA256 8442d95b80b90bc4b21d44f2e1dd7582a35d8d3c7ad1bd4bb25116f89d729669
+DIST spca5xx-20060202.tar.gz 193391 RMD160 c39344edd063bc8159737279c773d9e5daca243d SHA1 eb204ee311d80ef27daba6c02fc1babaf8c78560 SHA256 514a8c57240b0c7767ba359d85b7980b7eaae6021f3117ae26fa562c2c562724
+DIST spca5xx-20060301.tar.gz 194600 RMD160 02e2cfd8952dcebde0f8b9a87d27a13627d354bc SHA1 a05611f83c7d57f1ed1deed93685b2c9d9976313 SHA256 8442d95b80b90bc4b21d44f2e1dd7582a35d8d3c7ad1bd4bb25116f89d729669
 DIST spca5xx-20060402.tar.gz 195622 RMD160 8b18c6e6ce4b394ce657f8abc32a202d66736b3e SHA1 630378040d386aa5d11836d3a89a8b0c8cb78e2a SHA256 f144f476e393e0ebd75d2eca4fde28c20b78b887c925fdff5e5139adece7fcf5
 DIST spca5xx-20060501.tar.gz 192817 RMD160 68997c92f29f4abf7487bd6d80662738aadb6471 SHA1 0e56e2aa986345f0beba1dd14c9807a26f366dc7 SHA256 b8049142742cc81bc945aadefb40d173aeb447e428ec62a93e781032ea9b40c2
 EBUILD spca5xx-20060202.ebuild 717 RMD160 0ffc54103d7714c7d57c1af34a432cc689172cda SHA1 4c942a2abc2bc3267711abf2ab8afd22ef18503c SHA256 484619ed97cd19526a5e866143276dd457efd03ee0cf313194e20dce0d814ec6
@@ -21,14 +22,18 @@ EBUILD spca5xx-20060402.ebuild 720 RMD160 6efe8e67e63a1959c7dcba3a1ad68de34e3406
 MD5 8892aedfa7f4f1e2246460ca2d9a3db2 spca5xx-20060402.ebuild 720
 RMD160 6efe8e67e63a1959c7dcba3a1ad68de34e3406ab spca5xx-20060402.ebuild 720
 SHA256 23ea650723a6b0907b7d59c9340fd11bd74866d2a1bc815b4b7159a4c4e07719 spca5xx-20060402.ebuild 720
+EBUILD spca5xx-20060501-r1.ebuild 915 RMD160 74d2c53fd8b7b2f29f9aff8415ae4c0056483fa7 SHA1 3eab4c7808a929384df5dc8c4809e62413e90e55 SHA256 e9e81c0e9606351ada35d420b00526dc763c357a88bbb4d2f7340b01cc26ab07
+MD5 be7ee62c46dd4dd2eb9574a05831347c spca5xx-20060501-r1.ebuild 915
+RMD160 74d2c53fd8b7b2f29f9aff8415ae4c0056483fa7 spca5xx-20060501-r1.ebuild 915
+SHA256 e9e81c0e9606351ada35d420b00526dc763c357a88bbb4d2f7340b01cc26ab07 spca5xx-20060501-r1.ebuild 915
 EBUILD spca5xx-20060501.ebuild 848 RMD160 9e69056fc6a16d5641782bc503a866546cbcf199 SHA1 e1290bb725958800390dd2a83d0d5f016d9d7539 SHA256 61e3789ca18b98f337b492e0f78348273774a04c32b9b835774c082166b978fc
 MD5 674b827a6e25374f13deec09f019dd0c spca5xx-20060501.ebuild 848
 RMD160 9e69056fc6a16d5641782bc503a866546cbcf199 spca5xx-20060501.ebuild 848
 SHA256 61e3789ca18b98f337b492e0f78348273774a04c32b9b835774c082166b978fc spca5xx-20060501.ebuild 848
-MISC ChangeLog 3532 RMD160 4824c9c6af9922db0fc9db0a18a1a94676ae8b3b SHA1 24e92acfa28dbe56927d795a963de6fce39b3d41 SHA256 436602ccb590241bc7a7e2eee302060c7dbd3771cefe46ed684db6dd442b2cac
-MD5 6ecfd1d9b4fe42d2f66c0b07cc9cc8cd ChangeLog 3532
-RMD160 4824c9c6af9922db0fc9db0a18a1a94676ae8b3b ChangeLog 3532
-SHA256 436602ccb590241bc7a7e2eee302060c7dbd3771cefe46ed684db6dd442b2cac ChangeLog 3532
+MISC ChangeLog 3789 RMD160 ed60cd7426a6186d4cc5720e9755cc0b286e5ace SHA1 58d8416875841a6f9732ba5d8774117b17a38ebf SHA256 83e0febdcb18c7bd79151b1ecc04b58c99855933040598b1a61f76f16b0701b1
+MD5 a797fd970495cbc85544363796b3fe2e ChangeLog 3789
+RMD160 ed60cd7426a6186d4cc5720e9755cc0b286e5ace ChangeLog 3789
+SHA256 83e0febdcb18c7bd79151b1ecc04b58c99855933040598b1a61f76f16b0701b1 ChangeLog 3789
 MISC metadata.xml 224 RMD160 38404e7e41fb07335d42010dc13acf089800ff81 SHA1 7a8b4b22614bfad69b006ed05d773db39af7194a SHA256 5c462d2f7ca491a9e8be04d0a498050b974c31258b264a3ee7a1495d63780502
 MD5 334e4f71306cef3c0456b8ba59bbbfe8 metadata.xml 224
 RMD160 38404e7e41fb07335d42010dc13acf089800ff81 metadata.xml 224
@@ -45,10 +50,6 @@ SHA256 7e017ecf0e49ec63a73f375a76bbb423134e0925a303a765f411daa5ed432998 files/di
 MD5 cf47d0f77665bce00f04fd3a0bd0d44a files/digest-spca5xx-20060501 250
 RMD160 3d3f61a3c574a3828520809c3cf7f99bbb1d0de2 files/digest-spca5xx-20060501 250
 SHA256 f19c6d77b0c2e40209575780dcae6e3ecdea36012c668947d85805699f5ddfdd files/digest-spca5xx-20060501 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEusSlmdTrptrqvGERAmNpAJ9dlz6oI9FMHLZETpk6mbGE6yEsfACcCXP5
-bHRKX0BwD1uKcRTk0CAVePg=
-=mX9U
------END PGP SIGNATURE-----
+MD5 cf47d0f77665bce00f04fd3a0bd0d44a files/digest-spca5xx-20060501-r1 250
+RMD160 3d3f61a3c574a3828520809c3cf7f99bbb1d0de2 files/digest-spca5xx-20060501-r1 250
+SHA256 f19c6d77b0c2e40209575780dcae6e3ecdea36012c668947d85805699f5ddfdd files/digest-spca5xx-20060501-r1 250
diff --git a/media-video/spca5xx/files/digest-spca5xx-20060501-r1 b/media-video/spca5xx/files/digest-spca5xx-20060501-r1
new file mode 100644
index 000000000000..7700fdc72b15
--- /dev/null
+++ b/media-video/spca5xx/files/digest-spca5xx-20060501-r1
@@ -0,0 +1,3 @@
+MD5 8fcec25715aea10f9ebec5728c37e752 spca5xx-20060501.tar.gz 192817
+RMD160 68997c92f29f4abf7487bd6d80662738aadb6471 spca5xx-20060501.tar.gz 192817
+SHA256 b8049142742cc81bc945aadefb40d173aeb447e428ec62a93e781032ea9b40c2 spca5xx-20060501.tar.gz 192817
diff --git a/media-video/spca5xx/files/spca-20060501-2.6.18.patch b/media-video/spca5xx/files/spca-20060501-2.6.18.patch
new file mode 100644
index 000000000000..2a188b6c2c98
--- /dev/null
+++ b/media-video/spca5xx/files/spca-20060501-2.6.18.patch
@@ -0,0 +1,13 @@
+--- spca5xx/drivers/usb/spca5xx.h	2006-05-08 07:01:40.000000000 -0400
++++ spca5xx.new/drivers/usb/spca5xx.h	2006-09-05 13:42:26.000000000 -0400
+@@ -14,6 +14,10 @@
+ #include <linux/usb.h>
+ #include <linux/version.h>
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++#include <media/v4l2-common.h>
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) && LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 
+ #define urb_t struct urb
diff --git a/media-video/spca5xx/spca5xx-20060501-r1.ebuild b/media-video/spca5xx/spca5xx-20060501-r1.ebuild
new file mode 100644
index 000000000000..846f10c0d024
--- /dev/null
+++ b/media-video/spca5xx/spca5xx-20060501-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20060501-r1.ebuild,v 1.1 2006/10/22 15:04:58 kingtaco Exp $
+
+inherit linux-mod
+
+DESCRIPTION="spca5xx driver for webcams."
+HOMEPAGE="http://mxhaard.free.fr/spca5xx.html"
+SRC_URI="http://mxhaard.free.fr/spca50x/Download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT=""
+DEPEND=""
+RDEPEND=""
+
+MODULE_NAMES="spca5xx(usb/video:)"
+BUILD_TARGETS="default"
+CONFIG_CHECK="VIDEO_DEV VIDEO_V4L1_COMPAT"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	convert_to_m ${S}/Makefile
+	cd "${S}"
+	epatch "${FILESDIR}"/spca-20060501-defines.patch
+	epatch "${FILESDIR}"/spca-20060501-2.6.18.patch
+}
+
+src_install() {
+	dodoc CHANGELOG INSTALL README
+	linux-mod_src_install
+}