From e28ea95f551498407a2bfda1eb961f02cdb6fdbe Mon Sep 17 00:00:00 2001
From: Kolan Sh <mecareful@gmail.com>
Date: Wed, 19 Dec 2012 12:30:34 +0400
Subject: [PATCH] v4l2ucp updated to 2.0.2-r1.

---
 media-tv/v4l2ucp/Manifest                     |  3 ---
 media-video/v4l2ucp/Manifest                  |  4 ++++
 .../files/v4l2ucp-2.0.2-videodev2.patch       | 13 +++++++++++
 media-video/v4l2ucp/v4l2ucp-2.0.2-r1.ebuild   | 22 +++++++++++++++++++
 .../v4l2ucp/v4l2ucp-2.0.2.ebuild              |  0
 5 files changed, 39 insertions(+), 3 deletions(-)
 delete mode 100644 media-tv/v4l2ucp/Manifest
 create mode 100644 media-video/v4l2ucp/Manifest
 create mode 100644 media-video/v4l2ucp/files/v4l2ucp-2.0.2-videodev2.patch
 create mode 100644 media-video/v4l2ucp/v4l2ucp-2.0.2-r1.ebuild
 rename {media-tv => media-video}/v4l2ucp/v4l2ucp-2.0.2.ebuild (100%)

diff --git a/media-tv/v4l2ucp/Manifest b/media-tv/v4l2ucp/Manifest
deleted file mode 100644
index 090e46bc..00000000
--- a/media-tv/v4l2ucp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST v4l2ucp-2.0.2.tar.bz2 41380 RMD160 c82e139f5733843087832968a8c11df64ab93a1b SHA1 12960ae7b8bceaff017ac26d377fe4ef13628289 SHA256 e525add8788fa9ce613705a2a88947d4d1ef1c2bde8aa9f3e8ef19207271c1be
-EBUILD v4l2ucp-2.0.2.ebuild 423 RMD160 0928c2743a7ae76136cf7d7da89f9f6bec6198c2 SHA1 b77a2e7f45ae41c6b480bd5b01bc1ae9a96d8e68 SHA256 4f84dda44c6c8c828d0b395517f9a3dd4c3cf9f798a5d065fa4097765cf15091
-MISC Manifest.bkp 397 RMD160 c29e3cc96a81fcf7dba1dfeb8f1a574f569222f1 SHA1 bd51a62c8b0c2e6130528891de918e626c300c28 SHA256 e650c23a79beac4ec35d06eb881e9af704a29d45ecb96984113a6be2b3230dc3
diff --git a/media-video/v4l2ucp/Manifest b/media-video/v4l2ucp/Manifest
new file mode 100644
index 00000000..5c4b5129
--- /dev/null
+++ b/media-video/v4l2ucp/Manifest
@@ -0,0 +1,4 @@
+AUX v4l2ucp-2.0.2-videodev2.patch 323 SHA256 4193b9b014ba57be3ed47917cbf130414f98b8e6004cd8979afb1c4724b78a88 SHA512 87fb2e42b93645f6c12f4ed6c93a8dd28a3955ddf333ee1f426a0d5946a1e868886785c2e5baf0a2f8c6dba0f7747999af8948217f3e214ca14a192f9e842856 WHIRLPOOL cdbdb97fdad899a34b7d77731cb166a9f5427df78142aa9f45df14032561042d74ec48950a26a9157ddaf7707c24d8974e44f58a57800ff3204798222971c01a
+DIST v4l2ucp-2.0.2.tar.bz2 41380 SHA256 e525add8788fa9ce613705a2a88947d4d1ef1c2bde8aa9f3e8ef19207271c1be SHA512 4c1e4e9fa5f8388a179632918edda2f5b84737370bf6eb67fe4b05215f0fc67f59df4749d7e86aa4da288da0eedf646978e0c84332054ec561a7c814b079fefc WHIRLPOOL 753323c49f821e7121dcc3a7c0a7861ae14bdba3e7ef72f2ab483ef4c4971bcb3e23d993ad815a6f1d75d77cdf027f79522eb3947d4b5efd0399acf6804d57d7
+EBUILD v4l2ucp-2.0.2-r1.ebuild 498 SHA256 675d754e64b25d63c48906e78373d1012d14edae582848212d6b1388a7b31845 SHA512 7ae08e0ae585d10a4cbe25540dc726293e04eff4c673c0485b3939956f06ca212959b5e2839ff51528e91573fda5703a3dc76f614c29591ca901a2aedf476ce7 WHIRLPOOL 927f084a7dd9850058ea88b6025721a6a2af17b39703af33621d22f9512a3a5440e5ac46fedf9ba8bd678148029d8c9bbe396fa5f112d4d60a2b476c90482647
+EBUILD v4l2ucp-2.0.2.ebuild 423 SHA256 4f84dda44c6c8c828d0b395517f9a3dd4c3cf9f798a5d065fa4097765cf15091 SHA512 953648db2539461907b084d20d95ba6bd2009111550694c579f236ddbed67471284e9f9084609a02daaddeef8d03746aef07122e3eb0c1ece723baeb60485c5c WHIRLPOOL bf40ac33307dc22c0abaa2be4fda9fa4bfed5f238e54c5ccf859463ad9e11d317911e133ca15bd2c5790323aac78ca58c10aad3b6dac3e979582d0372ef93627
diff --git a/media-video/v4l2ucp/files/v4l2ucp-2.0.2-videodev2.patch b/media-video/v4l2ucp/files/v4l2ucp-2.0.2-videodev2.patch
new file mode 100644
index 00000000..a913a361
--- /dev/null
+++ b/media-video/v4l2ucp/files/v4l2ucp-2.0.2-videodev2.patch
@@ -0,0 +1,13 @@
+diff --git a/src/v4l2ctrl.c b/src/v4l2ctrl.c
+index 4eccb7b..393303c 100644
+--- a/src/v4l2ctrl.c
++++ b/src/v4l2ctrl.c
+@@ -26,7 +26,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <linux/types.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+ #include <libv4l2.h>
+ 
+ #define FORMATW "%u:%31s:%d\n"
diff --git a/media-video/v4l2ucp/v4l2ucp-2.0.2-r1.ebuild b/media-video/v4l2ucp/v4l2ucp-2.0.2-r1.ebuild
new file mode 100644
index 00000000..a80ecea8
--- /dev/null
+++ b/media-video/v4l2ucp/v4l2ucp-2.0.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit cmake-utils eutils
+
+DESCRIPTION="A universal control panel for all Video for Linux Two (V4L2) devices"
+HOMEPAGE="http://v4l2ucp.sf.net/"
+SRC_URI="mirror://sourceforge/v4l2ucp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libv4l
+	x11-libs/qt-gui:4"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-videodev2.patch" )
\ No newline at end of file
diff --git a/media-tv/v4l2ucp/v4l2ucp-2.0.2.ebuild b/media-video/v4l2ucp/v4l2ucp-2.0.2.ebuild
similarity index 100%
rename from media-tv/v4l2ucp/v4l2ucp-2.0.2.ebuild
rename to media-video/v4l2ucp/v4l2ucp-2.0.2.ebuild