Fix building with linux-headers >= 3.9 wrt #468618 using upstream patch by Rafał Mużyło and "Ulenrich"

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 46 insertions, 9 deletions

diff --git a/media-plugins/gst-plugins-v4l2/ChangeLog b/media-plugins/gst-plugins-v4l2/ChangeLog
index 6b1b708520b5..c805ae6b7d60 100644
--- a/media-plugins/gst-plugins-v4l2/ChangeLog
+++ b/media-plugins/gst-plugins-v4l2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/gst-plugins-v4l2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/ChangeLog,v 1.117 2013/04/01 13:03:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/ChangeLog,v 1.118 2013/06/01 10:59:28 ssuominen Exp $
+
+  01 Jun 2013; Samuli Suominen <ssuominen@gentoo.org>
+  gst-plugins-v4l2-0.10.31.ebuild,
+  +files/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch:
+  Fix building with linux-headers >= 3.9 wrt #468618 using upstream patch by
+  Rafał Mużyło and "Ulenrich"
 
 *gst-plugins-v4l2-1.0.6 (01 Apr 2013)
 
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 74ee2299267d..59efe7275bbf 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -2,18 +2,23 @@
 Hash: SHA256
 
 AUX gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch 1523 SHA256 7e12dae18afee4fdb36238344dae0d309d0e6fb06e271dd1c220e8d40f2fd8f8 SHA512 a1aab63fcbe6bd62d7675ea0830b6147eb7fe17ebef247d6020586c57048c0162133c1662202ad7ad7376543ac830d1ab9975f98aeb89206cb993e3d4f5d50a8 WHIRLPOOL 2ecc209d53ad24e625430d0a81b581418242e05b8048ac8027fbfdc2a1c80bf5f2440460cc0a54c57c85665353f2c94baa2aa624532c5f687d66f56b5bd0298e
+AUX gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch 738 SHA256 984fd8e722b3f80b59804f73bc03871208989d2f471cf0abb34dfd327a6f4797 SHA512 85b6f2fc3257b4aa6a67723eed77b2a30c57bc3ce2a008acef06cd53714af0c17d606e177028b473f21b8f2efff58f95f5e1f447757ac75be9ca2fe611651885 WHIRLPOOL be81e9802cc6e2ae447270187589a53c07b9848bb534c3c3fb1b856a600172eced21b3c87ef1fd69356a34a0fa92a224b6e0bdfa6d310b1179c60ebc0d747528
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.0.5.tar.xz 2710452 SHA256 53bd0b848e7896f1b22548ca4e8be56cf425e5100e121c472dff8272d5140bc5 SHA512 1a135c6bc271f52c99cddc29547260aeb4f01c15fd6afaedda8601f13f526c36718bb74d582b12bfd40a8e7f2e2a87755a7b961430e7a0ddfa719b96562ee192 WHIRLPOOL d0ca858a8d09b461665ae3b2b1cabfaaa16914e4ca88ccd8a9633da6f2fb8b396fe85e8ce0992219c2ca089ca7fdf00ed13d43caf502dc081be422a4a0f8ef26
 DIST gst-plugins-good-1.0.6.tar.xz 2715844 SHA256 67f7690a9826d9a6ab28b9af2536a6f3e833ee412bd59dd603c48fb3c6823e0d SHA512 9ab322a1826659a8a331c659f3fb244c3f1af6bd7a61d3904ee3884c70263f5100fd908cf618481c566787984225e2cb55316d98aae2485e98247ba848e4ca12 WHIRLPOOL 54ceb41e73248cf779c73250fd9b6812de7109f3587d7a0413586a96d99019f44a83230d71c68a87e77e511b22d0bd096979d6682eb6faf0934a13b36140726d
-EBUILD gst-plugins-v4l2-0.10.31.ebuild 804 SHA256 512079822cfe555c31e25d18dfa37df2b53956f1437dd7d9b187212ea36c544c SHA512 8b5b7f404db37bd9f244adb17e604085dc51878516e6540d5d08e887d9a8c9377b2f670759b0e400328f6a70d604366d9ae5feb0c46c60c531940665dda074d6 WHIRLPOOL 1c993f4e4600e4c8996ebb33e8ccc8c1d9e1fa2e94fead92f5e0d8c910968cd3f58b662d6733102462ff2d1a6f3cd8acfd4336f35cd100e3b7e9f2adfcc072eb
+EBUILD gst-plugins-v4l2-0.10.31.ebuild 878 SHA256 77f7686de78e244fbafec5aa438798a881a9c8f346f96788cdab05edb8c9b61d SHA512 d2d9a4f3cd777e8ae3bd7da6627263e0fdca2204e6ebd7718b0680a1a3152aa092611c4b1486aa6e5f30df18fefbbd814a976beb3e313cbd515f37fff398c35d WHIRLPOOL 8ad42a454fe02f8100a26dde441d11f6792d2dbc645230ecb87a6830bd7e2867da76666beb5fc988481defe429c8e9cb8410643b93da7505541c77934c2af694
 EBUILD gst-plugins-v4l2-1.0.5.ebuild 694 SHA256 8c01a9a4ae8aa57fcd9d370f8632a2212f49eba9b23f43f89f3bec6be82d5483 SHA512 d9b59e2e7ad6fa9714333838705a827a76cd2d52447d21b3b29b1569a18b649dcdf62f59d6f220e37c823fce580c77f05d9b17142441f7cb18b9048e860ee3bd WHIRLPOOL 3663d6fb1ffd1522d95ac9050f0093dbf91172bd88e7091a8fb49eb8dc6cd676a5ca80adccb6652e1a4486aa5b8dd9511ceeb3894b9d74dbe5d9501e457420d6
 EBUILD gst-plugins-v4l2-1.0.6.ebuild 702 SHA256 a7ac9a7e0235d49875b2bd8ac76d49e1350b6fa727651c771ca5ab7dd35ebc45 SHA512 11e5055c59cc6370eb94fc91ba8d526f6d8f6c03ee8aa6986f0e64f83b55f8cb0b8816f44ab1bb7c6e2c9b59de8ddbe8d5a1fa691385216dac0c2507f1e86c27 WHIRLPOOL 5550f2ab7c89c0019360be13c2638515c89d5ee351872316099cec2684e39bd94cf5d3aff9be603c11343ee9dd3004b2807759366305a2d2449e0b3d028709a0
-MISC ChangeLog 16307 SHA256 77d739b8b198e4ac0be4220cf29bd7c7e0b426ed7be36e791a7119e8be56d137 SHA512 2749a984ce97afd8eaf3b3663ac0ec6b391965b321742f01629eca98499f263207276bdc45345cde3708cb6cb5a8294733d34a12a5514d8f7783456592f9fdf6 WHIRLPOOL fb3870e601e95a43f28a0d2eca07dd256dd51f019293a28190aa20d95736ea6e7c69cdf2ff781c1bab29b860ddd133c74035a1386a735fe15d00bf1e8411f6e1
+MISC ChangeLog 16572 SHA256 526961c8bef49d28d42be16c8df1e5f05990c6db45d2e187e4f0b56822feff87 SHA512 4acddabc17344e7e281a1cdb71830b18a239257cf8716a830a3e34fdff8484b5d524d82fc0fa1d8c7621303fced3ade51b59e16a1a299f6f06c3f82e77c6f4c8 WHIRLPOOL ad6f7bf212236150a9f779fd95554f7002a122213dd1bb1485d4bb0905688d8604564849b76586a54ce2b09eeebb82822883418d09575c2d5c643fe107a40706
 MISC metadata.xml 162 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 SHA512 8b02f1dfc23c5609db66995b8b5f3b371d7c9ec232bd8117177af0522cd521f0217f5b49fb512213cb3db606c00df2511e0874ca0cac490ded306a8ddcfb5185 WHIRLPOOL b6621e0156545e7b124a3f55c2fe03a8878eb44d1b54fc3373adf9915dfe9c57a411741daf8863af74fdec93bacf929e905aa50954f906cec098bf0c4ddf2652
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlFZhYUACgkQ1fmVwcYIWAbKygCghmYvEpnHTH81rRYa2GO9gI1d
-4C8AniUhZ+BDFP24V/+lzccdP3GaVKJ1
-=UV8o
+iQEcBAEBCAAGBQJRqdOoAAoJEEdUh39IaPFNTy0H/iRoKxah49F1jmH8jDtTkkWg
+A2b8/JsX505B4yQCE2fSJb56t86syAh9Ot+d0d0NrWDvd2ZrdQaU5qNjBp9Vvn5g
+5iuekueHH+Y8BJtWp3qqFip9BAUqq1Dd9Vyp448M8eUVqs+yXup7tCdPMaVPENTn
+slYqITxycKwH/0z3BTfgAM1Nce9yG8LIVYbE6rHjAwwjHo3mvGMa0+Tgc+YZBnpm
+j+qxudFKxVf2YtmgCqJDn2YxF2KlO0TVc+mkkrF4vydgpObqSjoNHAOE8xytFT0N
+RTHAn+5PaTDC5wjkeo3LJm+ERlD6PEzTElTtsQUSBoURDkoxFdTjWKYTYAVvy9M=
+=QoJ6
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch b/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch
new file mode 100644
index 000000000000..25c25505449d
--- /dev/null
+++ b/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch
@@ -0,0 +1,25 @@
+From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 18 Mar 2013 14:59:35 +0000
+Subject: v4l2: fix compilation against newer kernel headers as on FC19
+
+---
+diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
+index 07d390a..4c10f4f 100644
+--- a/sys/v4l2/v4l2_calls.c
++++ b/sys/v4l2/v4l2_calls.c
+@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
+         break;
+       case V4L2_CID_HFLIP:
+       case V4L2_CID_VFLIP:
++#ifndef V4L2_CID_PAN_RESET
+       case V4L2_CID_HCENTER:
++#endif
++#ifndef V4L2_CID_TILT_RESET
+       case V4L2_CID_VCENTER:
++#endif
+ #ifdef V4L2_CID_PAN_RESET
+       case V4L2_CID_PAN_RESET:
+ #endif
+--
+cgit v0.9.0.2-2-gbebe
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
index 9126b5fe52d7..2f7be410ee12 100644
--- 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.12 2013/02/10 22:38:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-0.10.31.ebuild,v 1.13 2013/06/01 10:59:28 ssuominen Exp $
 
 EAPI="5"
 
@@ -21,7 +21,8 @@ DEPEND="${RDEPEND}
 GST_PLUGINS_BUILD="gst_v4l2"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.10.31-linux-headers-3.6.patch" #437012
+	epatch "${FILESDIR}"/${PN}-0.10.31-linux-headers-3.6.patch #437012
+	epatch "${FILESDIR}"/${PN}-0.10.31-linux-headers-3.9.patch #468618
 }
 
 src_configure() {