You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
65 lines
2.2 KiB
65 lines
2.2 KiB
14 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
#
|
||
|
# Filename: package/.../udev/v4l-remove.patch
|
||
|
# Copyright (C) 2011 The OpenSDE Project
|
||
|
#
|
||
|
# More information can be found in the files COPYING and README.
|
||
|
#
|
||
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
# of the GNU General Public License as published by the Free Software
|
||
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
# version.
|
||
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
||
|
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);
|