| 1 |
commit: 9651078fe901cf002649069fb70891980538c631 |
| 2 |
Author: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 1 03:17:03 2011 +0000 |
| 4 |
Commit: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 1 03:17:03 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dberkholz.git;a=commit;h=9651078f |
| 7 |
|
| 8 |
v4l2ucp: fix compilation with newer kernels. |
| 9 |
|
| 10 |
--- |
| 11 |
media-video/v4l2ucp/Manifest | 3 ++- |
| 12 |
.../files/fix-videodev-header-failure.patch | 12 ++++++++++++ |
| 13 |
media-video/v4l2ucp/v4l2ucp-9999.ebuild | 6 +++++- |
| 14 |
3 files changed, 19 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/v4l2ucp/Manifest b/media-video/v4l2ucp/Manifest |
| 17 |
index 3201a10..af67625 100644 |
| 18 |
--- a/media-video/v4l2ucp/Manifest |
| 19 |
+++ b/media-video/v4l2ucp/Manifest |
| 20 |
@@ -1 +1,2 @@ |
| 21 |
-EBUILD v4l2ucp-9999.ebuild 539 RMD160 997969cc3be80c9bf28a2bdcd8fe27f330fec2b6 SHA1 00ab833d2acbec61e4205d002191086ddaf5f571 SHA256 e419ff2ca32d2273f41b892c579afb8de3cc8f620c5cbfc2bbb1a794bf782146 |
| 22 |
+AUX fix-videodev-header-failure.patch 421 RMD160 d12d4cad8adb4018bde46e3925d2bddbfd0fb182 SHA1 c84bbad1ed920540586adf5df62172d6215d9693 SHA256 40559bb1ec8a6d67b1beb2012b9138b4b9c969a77b0e880702df9baf19b3573a |
| 23 |
+EBUILD v4l2ucp-9999.ebuild 621 RMD160 31fefe75b4d5f0082a8b23d4621de2bed465f869 SHA1 38da66b99a2427d8eb30181015bf278674f9c332 SHA256 2c59563004839a118f1cb7e6c1a34a5833eaa02d4c2f961ff8468499c7baeb51 |
| 24 |
|
| 25 |
diff --git a/media-video/v4l2ucp/files/fix-videodev-header-failure.patch b/media-video/v4l2ucp/files/fix-videodev-header-failure.patch |
| 26 |
new file mode 100644 |
| 27 |
index 0000000..703a1b0 |
| 28 |
--- /dev/null |
| 29 |
+++ b/media-video/v4l2ucp/files/fix-videodev-header-failure.patch |
| 30 |
@@ -0,0 +1,12 @@ |
| 31 |
+diff -ur v4l2ucp-9999.orig//src/v4l2ctrl.c v4l2ucp-9999//src/v4l2ctrl.c |
| 32 |
+--- v4l2ucp-9999.orig//src/v4l2ctrl.c 2011-07-31 20:02:22.103512256 -0700 |
| 33 |
++++ v4l2ucp-9999//src/v4l2ctrl.c 2011-07-31 20:02:56.883478980 -0700 |
| 34 |
+@@ -26,7 +26,7 @@ |
| 35 |
+ #include <sys/stat.h> |
| 36 |
+ #include <sys/types.h> |
| 37 |
+ #include <linux/types.h> |
| 38 |
+-#include <linux/videodev.h> |
| 39 |
++#include <linux/videodev2.h> |
| 40 |
+ #include <libv4l2.h> |
| 41 |
+ |
| 42 |
+ #define FORMATW "%u:%31s:%d\n" |
| 43 |
|
| 44 |
diff --git a/media-video/v4l2ucp/v4l2ucp-9999.ebuild b/media-video/v4l2ucp/v4l2ucp-9999.ebuild |
| 45 |
index 08fd464..3ca836e 100644 |
| 46 |
--- a/media-video/v4l2ucp/v4l2ucp-9999.ebuild |
| 47 |
+++ b/media-video/v4l2ucp/v4l2ucp-9999.ebuild |
| 48 |
@@ -5,7 +5,7 @@ |
| 49 |
EAPI="2" |
| 50 |
EGIT_REPO_URI="git://v4l2ucp.git.sourceforge.net/gitroot/v4l2ucp/v4l2ucp" |
| 51 |
|
| 52 |
-inherit cmake-utils git |
| 53 |
+inherit cmake-utils git eutils |
| 54 |
|
| 55 |
DESCRIPTION="A universal control panel for all Video for Linux Two (V4L2) devices" |
| 56 |
HOMEPAGE="http://v4l2ucp.sourceforge.net/" |
| 57 |
@@ -18,3 +18,7 @@ RDEPEND="x11-libs/qt-core:4 |
| 58 |
media-libs/libv4l" |
| 59 |
DEPEND="${RDEPEND}" |
| 60 |
DOCS="README" |
| 61 |
+ |
| 62 |
+src_prepare() { |
| 63 |
+ epatch "${FILESDIR}"/fix-videodev-header-failure.patch |
| 64 |
+} |
Archives