Revision: 6736
http://ipcop.svn.sourceforge.net/ipcop/?rev=6736&view=rev
Author: gespinasse
Date: 2012-08-04 17:24:37 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
Change udev-166 to support 3.0 kernel headers
Modified Paths:
--------------
ipcop/trunk/lfs/udev
Added Paths:
-----------
ipcop/trunk/src/patches/udev-166_videodev.patch
Modified: ipcop/trunk/lfs/udev
===================================================================
--- ipcop/trunk/lfs/udev 2012-08-04 14:52:20 UTC (rev 6735)
+++ ipcop/trunk/lfs/udev 2012-08-04 17:24:37 UTC (rev 6736)
@@ -105,6 +105,8 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ # required with linux-header >= 2.6.38
+ cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_videodev.patch
install -dv /lib/{firmware,udev/devices/{pts,shm}}
# different from LFS due to initramfs usage
Added: ipcop/trunk/src/patches/udev-166_videodev.patch
===================================================================
--- ipcop/trunk/src/patches/udev-166_videodev.patch
(rev 0)
+++ ipcop/trunk/src/patches/udev-166_videodev.patch 2012-08-04 17:24:37 UTC
(rev 6736)
@@ -0,0 +1,79 @@
+This is in 167 but 167 behave differently with --disable-extras
+
+http://git.kernel.org/?p=linux/hotplug/udev.git;a=patch;h=0c0b3f97cad4c34140dda3aa85a9bc74badb4b16
+was reverted by
+http://git.kernel.org/?p=linux/hotplug/udev.git;a=patch;h=f3f70f8d9ef6a901bf1bdff10008d76e72bb6692
+
+http://git.kernel.org/?p=linux/hotplug/udev.git;a=patch;h=4ace8a43ac2cbbd4d6f5c29fc461c3caa8f8545b
+http://git.kernel.org/?p=linux/hotplug/udev.git;a=patch;h=89284ddac413d376fc3b56f742daaf1b9bc85bba
+
+
+From 4ace8a43ac2cbbd4d6f5c29fc461c3caa8f8545b Mon Sep 17 00:00:00 2001
+From: Kay Sievers <[email protected]>
+Date: Tue, 15 Feb 2011 17:24:32 +0100
+Subject: [PATCH] v4l_id: kill the v4l1 ioctl
+
+Recent kernels do not have v4l1 anymore.
+---
+ extras/v4l_id/v4l_id.c | 14 --------------
+ 1 files changed, 0 insertions(+), 14 deletions(-)
+
+diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c
+index d530a6d..f3fc648 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[])
+@@ -82,19 +81,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);
+--
+1.7.7.6
+
+From 89284ddac413d376fc3b56f742daaf1b9bc85bba Mon Sep 17 00:00:00 2001
+From: Kay Sievers <[email protected]>
+Date: Tue, 15 Feb 2011 17:27:29 +0100
+Subject: [PATCH] v4l_id: remove left-over variable
+
+---
+ extras/v4l_id/v4l_id.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c
+index f3fc648..21cb328 100644
+--- a/extras/v4l_id/v4l_id.c
++++ b/extras/v4l_id/v4l_id.c
+@@ -38,7 +38,6 @@ int main (int argc, char *argv[])
+ };
+ int fd;
+ char *device;
+- struct video_capability v1cap;
+ struct v4l2_capability v2cap;
+
+ while (1) {
+--
+1.7.7.6
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
