summaryrefslogtreecommitdiff
path: root/multitech/recipes/uvccapture
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2013-02-18 11:40:37 -0600
committerJesse Gilles <jgilles@multitech.com>2013-02-18 11:40:37 -0600
commit1e17638117e0985d3cfede851661858f5a7dda65 (patch)
treeaa4c013b7e2ee0f96eec703b4e5c096dc4c9373c /multitech/recipes/uvccapture
parent67aa6dd54b0239f29367077de157cf75868518f0 (diff)
uvccapture: fix compile without v4l1
Diffstat (limited to 'multitech/recipes/uvccapture')
-rw-r--r--multitech/recipes/uvccapture/files/uvccapture_use_videodev2.patch24
-rw-r--r--multitech/recipes/uvccapture/uvccapture_0.5.bb3
2 files changed, 26 insertions, 1 deletions
diff --git a/multitech/recipes/uvccapture/files/uvccapture_use_videodev2.patch b/multitech/recipes/uvccapture/files/uvccapture_use_videodev2.patch
new file mode 100644
index 0000000..b6e4617
--- /dev/null
+++ b/multitech/recipes/uvccapture/files/uvccapture_use_videodev2.patch
@@ -0,0 +1,24 @@
+--- a/uvccapture.c 2008-08-03 22:02:38 +0000
++++ b/uvccapture.c 2011-06-09 16:31:30 +0000
+@@ -31,7 +31,7 @@
+ #include <unistd.h>
+ #include <jpeglib.h>
+ #include <time.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+
+ #include "v4l2uvc.h"
+
+
+--- a/v4l2uvc.c 2008-03-28 19:13:23 +0000
++++ b/v4l2uvc.c 2011-06-09 16:31:30 +0000
+@@ -28,7 +28,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+ #include <sys/mman.h>
+ #include <sys/ioctl.h>
+ #include "v4l2uvc.h"
+
diff --git a/multitech/recipes/uvccapture/uvccapture_0.5.bb b/multitech/recipes/uvccapture/uvccapture_0.5.bb
index 184721f..e6a9679 100644
--- a/multitech/recipes/uvccapture/uvccapture_0.5.bb
+++ b/multitech/recipes/uvccapture/uvccapture_0.5.bb
@@ -1,10 +1,11 @@
DESCRIPTION = "Command-line tool to capture webcam images"
DEPENDS = "jpeg virtual/kernel"
-PR = "r0"
+PR = "r1"
inherit autotools
SRC_URI = "http://staticwave.ca/source/uvccapture/${PN}-${PV}.tar.bz2 \
+ file://uvccapture_use_videodev2.patch \
file://makefile.patch \
"