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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-08 14:40:02 +0000 (Fri, 08 Apr 2011)
New Revision: 6488

Added:
   trunk/packages/vxl/trunk/debian/patches/video4linux.patch
Modified:
   trunk/packages/vxl/trunk/debian/patches/series
Log:
Remove V4L since it has been remove in 2.6.38. No V4L2 in VXL for now

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2011-04-07 20:27:27 UTC (rev 6487)
+++ trunk/packages/vxl/trunk/debian/patches/series	2011-04-08 14:40:02 UTC (rev 6488)
@@ -1 +1,2 @@
 vxl.soname.patch
+video4linux.patch

Added: trunk/packages/vxl/trunk/debian/patches/video4linux.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/video4linux.patch	                        (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/video4linux.patch	2011-04-08 14:40:02 UTC (rev 6488)
@@ -0,0 +1,16 @@
+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
+@@ -17,6 +17,11 @@
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul ${oul_sources})
+ 
+ SUBDIRS(ouel ouml)
++# V4L has been removed in 2.6.38
++# commit 88ae7624a6fe890e5a8ca57b25420f66e1389f8b
++CHECK_INCLUDE_FILE("linux/videodev.h"       OUL_HAVE_LINUX_VIDEODEV_H)
++IF(OUL_HAVE_LINUX_VIDEODEV_H)
+ IF(CMAKE_SYSTEM MATCHES "Linux*")
+   SUBDIRS(oufgl)
+ ENDIF(CMAKE_SYSTEM MATCHES "Linux*")
++ENDIF(OUL_HAVE_LINUX_VIDEODEV_H)