summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/udev/udev/udev-166-v4l1-1.patch
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-20 13:19:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:27 +0000
commite412dbf6cd67702bb50126a0f5ab9aecbe9c90bf (patch)
treeab1edacb91a0d7ffcee38a146bf964b88dbc5f4b /meta/recipes-core/udev/udev/udev-166-v4l1-1.patch
parent005b67f2824aeb207bef0c054d8ffa38d94ae87e (diff)
downloadpoky-e412dbf6cd67702bb50126a0f5ab9aecbe9c90bf.tar.gz
udev: reorganize files of 164 version
We merged both files and udev-164 directory onto a single directory and renamed udev-new.inc onto udev.inc as we have a single version of udev now. (From OE-Core rev: abde2a045a39a70a6247a7ae591a131120ab8ed3) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev/udev/udev-166-v4l1-1.patch')
-rw-r--r--meta/recipes-core/udev/udev/udev-166-v4l1-1.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/udev/udev/udev-166-v4l1-1.patch b/meta/recipes-core/udev/udev/udev-166-v4l1-1.patch
new file mode 100644
index 0000000000..2086fe1e27
--- /dev/null
+++ b/meta/recipes-core/udev/udev/udev-166-v4l1-1.patch
@@ -0,0 +1,50 @@
1Upstream-Status: Backport
2
3Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org>
4Date: 2011-03-26
5Initial Package Version: 166
6Upstream Status: From upstream
7Origin: http://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff;h=4ace8a43ac2cbbd4d6f5c29fc461c3caa8f8545b
8Description: Fixes a compilation error caused by the removal of the
9 Video for Linux 1 API from Linux kernels from 2.6.38
10 onwards.
11
12diff -Naur udev-166.orig/extras/v4l_id/v4l_id.c udev-166/extras/v4l_id/v4l_id.c
13--- udev-166.orig/extras/v4l_id/v4l_id.c 2009-12-03 12:45:03.000000000 +0000
14+++ udev-166/extras/v4l_id/v4l_id.c 2011-03-25 20:26:33.000000000 +0000
15@@ -28,7 +28,6 @@
16 #include <sys/types.h>
17 #include <sys/time.h>
18 #include <sys/ioctl.h>
19-#include <linux/videodev.h>
20 #include <linux/videodev2.h>
21
22 int main (int argc, char *argv[])
23@@ -39,7 +38,6 @@
24 };
25 int fd;
26 char *device;
27- struct video_capability v1cap;
28 struct v4l2_capability v2cap;
29
30 while (1) {
31@@ -82,19 +80,6 @@
32 if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0)
33 printf("radio:");
34 printf("\n");
35- } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
36- printf("ID_V4L_VERSION=1\n");
37- printf("ID_V4L_PRODUCT=%s\n", v1cap.name);
38- printf("ID_V4L_CAPABILITIES=:");
39- if ((v1cap.type & VID_TYPE_CAPTURE) > 0)
40- printf("capture:");
41- if ((v1cap.type & VID_TYPE_OVERLAY) > 0)
42- printf("video_overlay:");
43- if (v1cap.audios > 0)
44- printf("audio:");
45- if ((v1cap.type & VID_TYPE_TUNER) > 0)
46- printf("tuner:");
47- printf("\n");
48 }
49
50 close (fd);