updated on Thu Jan 26 16:09:46 UTC 2012
[aur-mirror.git] / opencv-old / linux-2.6.38.patch
blob3daf9c4fa07707bb4180842a981de76422e0dd0f
1 diff -urN OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
2 --- OpenCV-2.1.0.orig/CMakeLists.txt 2011-05-08 14:13:05.000000000 +0200
3 +++ OpenCV-2.1.0/CMakeLists.txt 2011-05-08 14:13:39.000000000 +0200
4 @@ -403,7 +403,7 @@
5 endif()
6 if(WITH_V4L)
7 CHECK_MODULE(libv4l1 HAVE_LIBV4L)
8 - CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
9 + CHECK_INCLUDE_FILE(libv4l1-videodev.h HAVE_CAMV4L)
10 CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
11 else()
12 set(HAVE_LIBV4L FALSE)
13 diff -urN OpenCV-2.1.0.orig/src/highgui/cvcap_libv4l.cpp OpenCV-2.1.0/src/highgui/cvcap_libv4l.cpp
14 --- OpenCV-2.1.0.orig/src/highgui/cvcap_libv4l.cpp 2011-05-08 14:13:04.000000000 +0200
15 +++ OpenCV-2.1.0/src/highgui/cvcap_libv4l.cpp 2011-05-08 14:14:03.000000000 +0200
16 @@ -219,7 +219,7 @@
17 #include <sys/stat.h>
18 #include <sys/ioctl.h>
20 -#include <linux/videodev.h>
21 +#include <libv4l1-videodev.h>
22 #include <linux/videodev2.h>
24 #include <libv4l1.h>
25 diff -urN OpenCV-2.1.0.orig/src/highgui/cvcap_v4l.cpp OpenCV-2.1.0/src/highgui/cvcap_v4l.cpp
26 --- OpenCV-2.1.0.orig/src/highgui/cvcap_v4l.cpp 2011-05-08 14:13:04.000000000 +0200
27 +++ OpenCV-2.1.0/src/highgui/cvcap_v4l.cpp 2011-05-08 14:14:41.000000000 +0200
28 @@ -214,7 +214,7 @@
29 #include <sys/types.h>
30 #include <sys/mman.h>
32 -#include <linux/videodev.h>
33 +#include <libv4l1-videodev.h>
35 #include <string.h>
36 #include <stdlib.h>