[med-svn] r8838 - trunk/packages/vxl/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-08 14:48:04 +0000 (Thu, 08 Dec 2011)
New Revision: 8838

Modified:
   trunk/packages/vxl/trunk/debian/patches/video4linux.patch
Log:
redo patch for recent change in kFreeBSD

Modified: trunk/packages/vxl/trunk/debian/patches/video4linux.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/video4linux.patch	2011-12-08 12:48:30 UTC (rev 8837)
+++ trunk/packages/vxl/trunk/debian/patches/video4linux.patch	2011-12-08 14:48:04 UTC (rev 8838)
@@ -4,8 +4,8 @@
 
 Index: vxl-1.14.0/contrib/oul/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/contrib/oul/CMakeLists.txt	2011-04-08 16:36:12.000000000 +0200
-+++ vxl-1.14.0/contrib/oul/CMakeLists.txt	2011-04-08 16:39:05.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oul/CMakeLists.txt	2011-12-08 15:42:19.000000000 +0100
++++ vxl-1.14.0/contrib/oul/CMakeLists.txt	2011-12-08 15:43:58.000000000 +0100
 @@ -17,6 +17,11 @@
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul ${oul_sources})
  
@@ -18,3 +18,39 @@
    SUBDIRS(oufgl)
  ENDIF(CMAKE_SYSTEM MATCHES "Linux*")
 +ENDIF(OUL_HAVE_LINUX_VIDEODEV_H)
+Index: vxl-1.14.0/core/vidl/vidl_v4l2_control.h
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/vidl_v4l2_control.h	2011-12-08 15:44:12.000000000 +0100
++++ vxl-1.14.0/core/vidl/vidl_v4l2_control.h	2011-12-08 15:44:15.000000000 +0100
+@@ -15,7 +15,6 @@
+ #include <vcl_vector.h>
+ 
+ extern "C" {
+-#include <asm/types.h>          /* for videodev2.h */
+ #include <linux/videodev2.h>
+ };
+ 
+Index: vxl-1.14.0/core/vidl/vidl_v4l2_device.h
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/vidl_v4l2_device.h	2011-12-08 15:44:30.000000000 +0100
++++ vxl-1.14.0/core/vidl/vidl_v4l2_device.h	2011-12-08 15:44:33.000000000 +0100
+@@ -18,7 +18,6 @@
+ #include <vcl_iosfwd.h>
+ #include <vcl_iostream.h>
+ extern "C" {
+-#include <asm/types.h>          /* for videodev2.h */
+ #include <linux/videodev2.h>
+ };
+ 
+Index: vxl-1.14.0/core/vidl/vidl_v4l2_pixel_format.cxx
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/vidl_v4l2_pixel_format.cxx	2011-12-08 15:44:20.000000000 +0100
++++ vxl-1.14.0/core/vidl/vidl_v4l2_pixel_format.cxx	2011-12-08 15:44:26.000000000 +0100
+@@ -11,7 +11,6 @@
+ #include "vidl_v4l2_pixel_format.h"
+ 
+ extern "C" {
+-#include <asm/types.h>          /* for videodev2.h */
+ #include <sys/time.h>
+ #include <linux/videodev2.h>
+ };