summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz2011-08-01 03:17:03 (GMT)
committerDonnie Berkholz2011-08-01 03:17:03 (GMT)
commit9651078fe901cf002649069fb70891980538c631 (patch)
tree026fd0a1460bf08cc94033780267d82b1ed7c9b7
parent8d91f54dcb67c1e6c02e9539839070e50d1c8c1d (diff)
v4l2ucp: fix compilation with newer kernels.
-rw-r--r--media-video/v4l2ucp/Manifest3
-rw-r--r--media-video/v4l2ucp/files/fix-videodev-header-failure.patch12
-rw-r--r--media-video/v4l2ucp/v4l2ucp-9999.ebuild6
3 files changed, 19 insertions, 2 deletions
diff --git a/media-video/v4l2ucp/Manifest b/media-video/v4l2ucp/Manifest
index 3201a10..af67625 100644
--- a/media-video/v4l2ucp/Manifest
+++ b/media-video/v4l2ucp/Manifest
@@ -1 +1,2 @@
-EBUILD v4l2ucp-9999.ebuild 539 RMD160 997969cc3be80c9bf28a2bdcd8fe27f330fec2b6 SHA1 00ab833d2acbec61e4205d002191086ddaf5f571 SHA256 e419ff2ca32d2273f41b892c579afb8de3cc8f620c5cbfc2bbb1a794bf782146
+AUX fix-videodev-header-failure.patch 421 RMD160 d12d4cad8adb4018bde46e3925d2bddbfd0fb182 SHA1 c84bbad1ed920540586adf5df62172d6215d9693 SHA256 40559bb1ec8a6d67b1beb2012b9138b4b9c969a77b0e880702df9baf19b3573a
+EBUILD v4l2ucp-9999.ebuild 621 RMD160 31fefe75b4d5f0082a8b23d4621de2bed465f869 SHA1 38da66b99a2427d8eb30181015bf278674f9c332 SHA256 2c59563004839a118f1cb7e6c1a34a5833eaa02d4c2f961ff8468499c7baeb51
diff --git a/media-video/v4l2ucp/files/fix-videodev-header-failure.patch b/media-video/v4l2ucp/files/fix-videodev-header-failure.patch
new file mode 100644
index 0000000..703a1b0
--- /dev/null
+++ b/media-video/v4l2ucp/files/fix-videodev-header-failure.patch
@@ -0,0 +1,12 @@
+diff -ur v4l2ucp-9999.orig//src/v4l2ctrl.c v4l2ucp-9999//src/v4l2ctrl.c
+--- v4l2ucp-9999.orig//src/v4l2ctrl.c 2011-07-31 20:02:22.103512256 -0700
++++ v4l2ucp-9999//src/v4l2ctrl.c 2011-07-31 20:02:56.883478980 -0700
+@@ -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-9999.ebuild b/media-video/v4l2ucp/v4l2ucp-9999.ebuild
index 08fd464..3ca836e 100644
--- a/media-video/v4l2ucp/v4l2ucp-9999.ebuild
+++ b/media-video/v4l2ucp/v4l2ucp-9999.ebuild
@@ -5,7 +5,7 @@
EAPI="2"
EGIT_REPO_URI="git://v4l2ucp.git.sourceforge.net/gitroot/v4l2ucp/v4l2ucp"
-inherit cmake-utils git
+inherit cmake-utils git eutils
DESCRIPTION="A universal control panel for all Video for Linux Two (V4L2) devices"
HOMEPAGE="http://v4l2ucp.sourceforge.net/"
@@ -18,3 +18,7 @@ RDEPEND="x11-libs/qt-core:4
media-libs/libv4l"
DEPEND="${RDEPEND}"
DOCS="README"
+
+src_prepare() {
+ epatch "${FILESDIR}"/fix-videodev-header-failure.patch
+}