fixing V4L2

jonazpiazu · Nov 20, 2012 · e27fd17 · e27fd17
1 parent 3007a0a
commit e27fd17
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/3rdparty.old/libcvd/configure b/3rdparty.old/libcvd/configure
@@ -6972,7 +6972,7 @@ echo $ECHO_N "checking for v4l2... $ECHO_C" >&6; }
 			cat >conftest.$ac_ext <<_ACEOF
 	#include <sys/types.h>
 								#include <linux/types.h>
-								#include <linux/videodev.h>
+								#include <linux/videodev2.h>
 								int main(){V4L2_PIX_FMT_GREY;return 0;}
 _ACEOF
 rm -f conftest.$ac_objext
@@ -7093,7 +7093,7 @@ _ACEOF
 		save_CXXFLAGS="$CXXFLAGS"
 		a=
 
-for ac_header in linux/videodev.h
+for ac_header in linux/videodev2.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

diff --git a/3rdparty.old/libcvd/cvd/Linux/v4l2frame.h b/3rdparty.old/libcvd/cvd/Linux/v4l2frame.h
@@ -37,7 +37,7 @@
 #ifdef CVD_INTERNAL_HAVE_STRANGE_V4L2
 	#include <videodevx/videodev.h>
 #else
-	#include <linux/videodev.h>
+	#include <linux/videodev2.h>
 #endif
 
 namespace CVD {

diff --git a/3rdparty.old/libcvd/cvd_src/Linux/v4l2buffer.cc b/3rdparty.old/libcvd/cvd_src/Linux/v4l2buffer.cc
@@ -76,7 +76,8 @@ void ErrorInfo(int e)
 	#define K26(X) X
 	#define K24(X) 
 #else
-	#error "Can't do v4l2 for this kernel version"
+	#define K26(X) X
+	#define K24(X) 
 #endif