Bump, improves error handling, fixes various bugs. Fix build failure with recent linux-headers (bug #437012, thanks to Jason Lamb et al.)

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

4 files changed, 93 insertions, 24 deletions

diff --git a/media-plugins/gst-plugins-v4l2/ChangeLog b/media-plugins/gst-plugins-v4l2/ChangeLog
index 1248dcbb8d89..774e24ad1bdc 100644
--- a/media-plugins/gst-plugins-v4l2/ChangeLog
+++ b/media-plugins/gst-plugins-v4l2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/gst-plugins-v4l2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/ChangeLog,v 1.90 2011/10/15 18:35:18 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/ChangeLog,v 1.91 2012/10/23 07:58:04 tetromino Exp $
+
+*gst-plugins-v4l2-0.10.31 (23 Oct 2012)
+
+  23 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gst-plugins-v4l2-0.10.31.ebuild,
+  +files/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch:
+  Bump, improves error handling, fixes various bugs. Fix build failure with
+  recent linux-headers (bug #437012, thanks to Jason Lamb et al.)
 
   15 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
   gst-plugins-v4l2-0.10.30.ebuild:
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 5ad61016da6f..27820c096eb4 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -1,28 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gst-plugins-good-0.10.23.tar.bz2 2882183 RMD160 b19a61d796e0c384e074f61fc0515826fb6f6061 SHA1 d819a2690e5bfe83f1277c850b737a13f8f28c12 SHA256 2e7771a611cedb1e8208601cb26744fbf33109598e222afee1be8811ba4babcf
-DIST gst-plugins-good-0.10.28.tar.bz2 3092703 RMD160 e637bea83f0fba4ac830e40ed96405d4f28876b9 SHA1 1f013be97f66fa1130555b4504eadca3156356c1 SHA256 adfbce68b9fbadb7a7aeda2227af6afe1928ef025af4158726617b9d6834b028
-DIST gst-plugins-good-0.10.30.tar.bz2 3361361 RMD160 e39555de8efa87af9764cad32f11e00954e82a91 SHA1 9c78a751bb2f20ad50a1daf6860e0098e0495f5a SHA256 b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6
-EBUILD gst-plugins-v4l2-0.10.23.ebuild 522 RMD160 cd930dd052e12f5d32d231da94f9913b4ad13116 SHA1 291f9a0a5f196216c3d525c8868391c55393acd6 SHA256 05b0bd240fc0cf70cb31d164cd61c122162fe806971ffb7c1603ac4f684cd2b4
-EBUILD gst-plugins-v4l2-0.10.28-r1.ebuild 612 RMD160 8f8aaa810d6eef960a8863ff075c4f3e36e08104 SHA1 69a3b7e6705d0e896f4c17e6845d83bfbb8c989e SHA256 01276c99676b1c00d7b64cc4a22c1f125e60f899ff3ac893e2221e1a18125896
-EBUILD gst-plugins-v4l2-0.10.30.ebuild 609 RMD160 41a14cd9661c1425d3d99d1521f5c1a1443b68bb SHA1 9ce0d9a5076a35f30fb9d653ed9b4d6b75079e47 SHA256 6eebffdabd6e3b0da1ef1b53c0a9596871434460f895d56187eea6da1dbadb90
-MISC ChangeLog 12590 RMD160 c406e78a7503da866e401b42e8c562c69953e953 SHA1 a10511adacc5639033468f4690faa605078868b9 SHA256 776d806c7b62ac055aebb6b79cfffe5804c4da147e24c0b6e4ab74a26fc38d21
-MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
+AUX gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch 1523 SHA256 7e12dae18afee4fdb36238344dae0d309d0e6fb06e271dd1c220e8d40f2fd8f8 SHA512 a1aab63fcbe6bd62d7675ea0830b6147eb7fe17ebef247d6020586c57048c0162133c1662202ad7ad7376543ac830d1ab9975f98aeb89206cb993e3d4f5d50a8 WHIRLPOOL 2ecc209d53ad24e625430d0a81b581418242e05b8048ac8027fbfdc2a1c80bf5f2440460cc0a54c57c85665353f2c94baa2aa624532c5f687d66f56b5bd0298e
+DIST gst-plugins-good-0.10.23.tar.bz2 2882183 SHA256 2e7771a611cedb1e8208601cb26744fbf33109598e222afee1be8811ba4babcf SHA512 161252ea4ee51afa033075f4ecb2158e9d60a8aa2b15e5ec0b56a8a74e729be7ba1cafff7bcf36ac677b56878e0fb176ff55f6a7267626fe7b8dd2de36bfc686 WHIRLPOOL 532ade7e9b7c0dda2d501b585131f055922e112d6f2ac49e0ae2073a286fd7c062b22812cbb136d26fc27c1a4b706e22b4dd0aa35061104fda8a0c1b5c6a0a29
+DIST gst-plugins-good-0.10.28.tar.bz2 3092703 SHA256 adfbce68b9fbadb7a7aeda2227af6afe1928ef025af4158726617b9d6834b028 SHA512 ecf6f6f2e57e8570dc94a22b2fe661f2a00ec518c9d43a22f963f1912c0ef2d0e016defb11fe2a566c61186ed45c4791d2b673c854d14f08b0895fd0d4c21084 WHIRLPOOL 42ec2f8a2da75e43bec5c02cd01b0a52f2152fb01780f6a7edfd1a11d86388bd65d47bb804a860d16487c26428177782667cc219dc2a6188fed994dbb90a0ed0
+DIST gst-plugins-good-0.10.30.tar.bz2 3361361 SHA256 b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6 SHA512 2b3421700870624db956aaccb855d64a346178483f26901c78268cd4f4b0043fda6679c24a60a505713d142712f53bc999c24aad45c0fdf531cbb91799da7af2 WHIRLPOOL 2bd9a865c249abb7aa96357c91282ceb5734b8647fea2810c8be7f71e5b0fd0f13b33ba79bab53d2f2aa7d0f506594f74fa1e1072e845b07f8c951fb6a751ff3
+DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
+EBUILD gst-plugins-v4l2-0.10.23.ebuild 522 SHA256 05b0bd240fc0cf70cb31d164cd61c122162fe806971ffb7c1603ac4f684cd2b4 SHA512 65c0c8fc87790b0598543e516e6389818c230928c6e8b71168839805e06b55e3f65c4e3f14879790a34153900ed96128a80740bc482601ed6d651f1a87d5b81a WHIRLPOOL 84c7cbaf3dbba20536f20990f572a9608deed7d05855d8f8d457894ba191375ffc4d29f476aa5e7649fedf40c7f60d7e8672eab97d89bbc2306f02eafd1087b4
+EBUILD gst-plugins-v4l2-0.10.28-r1.ebuild 612 SHA256 01276c99676b1c00d7b64cc4a22c1f125e60f899ff3ac893e2221e1a18125896 SHA512 a678dfd767ab48f796f8a3f4b847e56039f7e416e39889dd1ab71605daaf847bb86ec9799b0cb8dd8b4be08a0649cae5b183e82c80dfc0ad40db8db72c1fa904 WHIRLPOOL 4bc87e3aa17afbe4287ae75489b28f8daa66d9ae023c9ce8478908d1c75cf0e2be93af44871d90410197983bf968cb71989bbe4213baa7f5a357ebcfdef9c5b4
+EBUILD gst-plugins-v4l2-0.10.30.ebuild 609 SHA256 6eebffdabd6e3b0da1ef1b53c0a9596871434460f895d56187eea6da1dbadb90 SHA512 d93a07e3be0a64f3b30c7d7f6f26d8aee0073d43e0a924686522381636db5281938f38ffcad475ae3e534058d414f38abd5e2e47b2339083e4e4c36f68718d0e WHIRLPOOL b2a4a3467746cf4279f4f4dff52c9084ffc3cffb36a2b08b9266cea4974a23e278431701319172efd65d4ebb7a221050430caa76422a718446c8a7a8f60ed4c1
+EBUILD gst-plugins-v4l2-0.10.31.ebuild 719 SHA256 6b6c7477c23fb212cfca75f3f9a3feb00e051cd6b13b7fba622defeac25d2108 SHA512 e7019f8626230d1f7bc0337a2adeb3eea4ac784ac4c2be2bf88c620aa161100957e0c3735f3a98693b3981c621973b753f6e26504dbe38d186d73a2507d5fceb WHIRLPOOL a359226a25dd4a139f01c781fdda229a4cbd1d59c0e9322d7bd6de3ac1a5520891de44c77ef3f067bce0f525db35604d4d5ed5d1c64fad57dcc6a9933a98869b
+MISC ChangeLog 12927 SHA256 79e8fc05a5bc44cf77fa0937a2f308817630df4a61c60179267320bc7044b0d0 SHA512 0891b3a3bcd1fa6b3a7ccf059c0be27989714e39c869c99cf2fe59c14b0849bc9e30ae97f798b42eb9880174aca6a035a110f33c908ceac4bfaf7690b3d68a39 WHIRLPOOL 9283a5976d5e3a0375926d0cf592c89d7b55ab5550ff2af98fd3ae4ca222d68799d7664bf220ac6b79d401826249de85b4137ab43f4e64e53c70dba0b32ff19b
+MISC metadata.xml 162 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 SHA512 8b02f1dfc23c5609db66995b8b5f3b371d7c9ec232bd8117177af0522cd521f0217f5b49fb512213cb3db606c00df2511e0874ca0cac490ded306a8ddcfb5185 WHIRLPOOL b6621e0156545e7b124a3f55c2fe03a8878eb44d1b54fc3373adf9915dfe9c57a411741daf8863af74fdec93bacf929e905aa50954f906cec098bf0c4ddf2652
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOmdKLAAoJEF0huFKJUZL5cnYP/i60i4odWZGZvTMmhTRVfA8N
-HI7i7NPz/IH3X7yTLZ/siIPD0cGN8M0kUW24mVszfBCPhQChb25j9Yb63MeUDQKm
-Y9ae2RhZPL41cnML4PGS/QmiicXtCw0SHv5Y8F9vtZZ30BGCTpo3isqciLoX8yg/
-ZGYhrnBx+gY/7Y42uWU3CAT7reqgcLSdl+7d1rIKQsOx/HX6atCNflbk7Y1xua2J
-7Ha8NZkf2/VAXuTldrCzToKqBc7RFe1GHS24RBqVPK6ddnR6QttC1AF663myQ7pA
-ubZ/NRGe4JIUTaE60tPjxhocckHvSKfew+cvl9UgzswlC/F8Kudkm6h2DP2UfMpq
-RRrLZPpvM+GTCPAifgom0Mu1lzQZGG3+lOTRjLBt/4WNO4Oqtf7ePWNGB+9A8MNj
-M0RnSA1IuUJroa6Vm+Pj+Uw4X8pfn4hjCT2exc/4wBNUrFqcXiP8kxYdIjVkvWyM
-/Mn3T982c7IpU8edCD8XVSQeNuq1sbz0ginTAwWxXgXwD3wnGJdGAmxjt5FFl+Iy
-C0dkqUr9GhdzYY+ac4JoXrqIdFaunL/skXQFB4t6xfq+A62L6ONH3XRomZHGnsO7
-VhOpATpaeF+N2YGbYCs37ZPjfdGvh56sEa56W0hyH8gq5pQra3hlopRZ/0ZQ8b9K
-+6xGxNUVBJr8mijhdUui
-=f6hd
+iQEcBAEBCAAGBQJQhk4NAAoJEJ0WA1zPCt1hlB4IAJmm1LBi6TgglbYRZc1UpCFN
+rM2ObUdQJqW4z+O/ZM7bEXolACtx0u+0n8I3hO5gfFSsemF6L7D5N9gVCof3PRra
+RuGBRIHA9w3JAY7H0M802Pdd3fQCu2Hs7mUaLdJhpri8zTmi3bD9fHzMUeMiiWZO
+91UW1QvFNqocQreXH2aTzOpqQT2oudxgiPBeQwL/J91knrCjjJG6w8vqmPL7yET5
+Vp5YgfuNAESQ/i+P8eixK+7FJSLE6Tk/PIlTlqte4NKwhxffqL4W1LQo1nrBKhSy
+BTvMnnT+qUgVB3GQO27m1PO7UtXVqXlX69+eYgkA/M8fE0cODPtq4z+3FUxIZGw=
+=69da
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch b/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch
new file mode 100644
index 000000000000..919b19b7dc4b
--- /dev/null
+++ b/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch
@@ -0,0 +1,38 @@
+From 968a3dac9959c2a6ae4ff619535db15b37446ce4 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Thu, 9 Aug 2012 08:35:23 +0100
+Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input
+ field was removed
+
+This was unused apparently and removed in the kernel in commit:
+
+ From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001
+ From: Sakari Ailus <sakari.ailus@iki.fi>
+ Date: Wed, 2 May 2012 09:40:03 -0300
+ Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT
+
+ Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which
+ tells the former is valid. The flag is used by no driver currently.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=681491
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 0.10.31]
+---
+ sys/v4l2/gstv4l2bufferpool.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
+index b81c6a4..51cc0ce 100644
+--- a/sys/v4l2/gstv4l2bufferpool.c
++++ b/sys/v4l2/gstv4l2bufferpool.c
+@@ -181,7 +181,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
+     GST_LOG_OBJECT (pool->v4l2elem, "  MMAP offset:  %u",
+         ret->vbuffer.m.offset);
+   GST_LOG_OBJECT (pool->v4l2elem, "  length:    %u", ret->vbuffer.length);
+-  GST_LOG_OBJECT (pool->v4l2elem, "  input:     %u", ret->vbuffer.input);
+ 
+   data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
+       PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
+-- 
+1.7.12.3
+
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.31.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.31.ebuild
new file mode 100644
index 000000000000..1ef9c6af2b20
--- /dev/null
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.31.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.31.ebuild,v 1.1 2012/10/23 07:58:04 tetromino Exp $
+
+EAPI=4
+
+inherit eutils gst-plugins-good
+
+DESCRIPION="plugin to allow capture from video4linux2 devices"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/gst-plugins-base-0.10.36
+	media-libs/libv4l"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+GST_PLUGINS_BUILD="gst_v4l2"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.10.31-linux-headers-3.6.patch" #437012
+}
+
+src_configure() {
+	gst-plugins-good_src_configure --with-libv4l2
+}