From 686463e9ac68a745b06f2e5131de6fd030c178bc Mon Sep 17 00:00:00 2001
From: Jesse Gilles <jgilles@multitech.com>
Date: Wed, 13 Feb 2013 17:04:14 -0600
Subject: udev-165: fix compile with newer linux headers

---
 .../udev/udev-165/udev-164-remove-v4l1.patch       | 47 ++++++++++++++++++++++
 multitech/recipes/udev/udev_165.bbappend           |  5 ++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 multitech/recipes/udev/udev-165/udev-164-remove-v4l1.patch

(limited to 'multitech/recipes/udev')

diff --git a/multitech/recipes/udev/udev-165/udev-164-remove-v4l1.patch b/multitech/recipes/udev/udev-165/udev-164-remove-v4l1.patch
new file mode 100644
index 0000000..288da53
--- /dev/null
+++ b/multitech/recipes/udev/udev-165/udev-164-remove-v4l1.patch
@@ -0,0 +1,47 @@
+Author: Kay Sievers <kay.sievers@vrfy.org>
+Date:   Tue Feb 15 17:24:32 2011 +0100
+
+    v4l_id: kill the v4l1 ioctl
+    
+    Recent kernels do not have v4l1 anymore.
+
+diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c
+index d530a6d..21cb328 100644
+--- a/extras/v4l_id/v4l_id.c
++++ b/extras/v4l_id/v4l_id.c
+@@ -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 main (int argc, char *argv[])
+ 	};
+ 	int fd;
+ 	char *device;
+-	struct video_capability v1cap;
+ 	struct v4l2_capability v2cap;
+ 
+ 	while (1) {
+@@ -82,19 +80,6 @@ int main (int argc, char *argv[])
+ 		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);
diff --git a/multitech/recipes/udev/udev_165.bbappend b/multitech/recipes/udev/udev_165.bbappend
index 2028ba4..e6d011c 100644
--- a/multitech/recipes/udev/udev_165.bbappend
+++ b/multitech/recipes/udev/udev_165.bbappend
@@ -1,11 +1,14 @@
 FILESEXTRA := "${THISDIR}"
 FILESPATHBASE =. "${FILESEXTRA}:"
 
-PR .= ".corecdp3"
+PR .= ".corecdp5"
 
 # add custom rules for persistent modem device names
 SRC_URI += "file://corecdp.rules"
 
+# patch for building against newer linux headers
+SRC_URI += "file://udev-164-remove-v4l1.patch"
+
 do_install_append() {
 	install -d ${D}${sysconfdir}/udev/rules.d
 	install -m 644 ${WORKDIR}/corecdp.rules ${D}${sysconfdir}/udev/rules.d/
-- 
cgit v1.2.3