blob: 2086fe1e2729759aed7003b72b80ba45d70a0375 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
Upstream-Status: Backport
Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org>
Date: 2011-03-26
Initial Package Version: 166
Upstream Status: From upstream
Origin: http://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff;h=4ace8a43ac2cbbd4d6f5c29fc461c3caa8f8545b
Description: Fixes a compilation error caused by the removal of the
Video for Linux 1 API from Linux kernels from 2.6.38
onwards.
diff -Naur udev-166.orig/extras/v4l_id/v4l_id.c udev-166/extras/v4l_id/v4l_id.c
--- udev-166.orig/extras/v4l_id/v4l_id.c 2009-12-03 12:45:03.000000000 +0000
+++ udev-166/extras/v4l_id/v4l_id.c 2011-03-25 20:26:33.000000000 +0000
@@ -28,7 +28,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
-#include <linux/videodev.h>
#include <linux/videodev2.h>
int main (int argc, char *argv[])
@@ -39,7 +38,6 @@
};
int fd;
char *device;
- struct video_capability v1cap;
struct v4l2_capability v2cap;
while (1) {
@@ -82,19 +80,6 @@
if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0)
printf("radio:");
printf("\n");
- } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
- printf("ID_V4L_VERSION=1\n");
- printf("ID_V4L_PRODUCT=%s\n", v1cap.name);
- printf("ID_V4L_CAPABILITIES=:");
- if ((v1cap.type & VID_TYPE_CAPTURE) > 0)
- printf("capture:");
- if ((v1cap.type & VID_TYPE_OVERLAY) > 0)
- printf("video_overlay:");
- if (v1cap.audios > 0)
- printf("audio:");
- if ((v1cap.type & VID_TYPE_TUNER) > 0)
- printf("tuner:");
- printf("\n");
}
close (fd);
|
