rpms/opencv
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix double FTBFS

Browse Source
This commit is contained in:
Nicolas Chauvet 2011-02-04 15:27:54 +01:00
parent 6f18b86f65
commit c3d15c7494
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenCV-2.2-nov4l1.patch
View File

@ -5,9 +5,21 @@ diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/module
#include <sys/types.h>
#include <sys/mman.h>
+#ifdef HAVE_LINUX_VIDEODEV_H
+#ifdef HAVE_CAMV4L
#include <linux/videodev.h>
+#endif
#include <string.h>
#include <stdlib.h>
diff -up OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap.cpp
--- OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 2011-02-04 15:10:51.461243999 +0100
+++ OpenCV-2.2.0/modules/highgui/src/cap.cpp 2011-02-04 15:11:22.040244001 +0100
@@ -171,7 +171,7 @@ CV_IMPL CvCapture * cvCreateCameraCaptur
if (capture)
return capture;
#endif
- #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2)
+ #if defined (HAVE_CAMV4L)
capture = cvCreateCameraCapture_V4L (index);
if (capture)
return capture;

1
opencv.spec
View File

@ -247,7 +247,6 @@ rm -rf $RPM_BUILD_ROOT
* Wed Feb 02 2011 Nicolas Chauvet <kwizart@gmail.com> - 2.2.0-2
- Fix with gcc46
- Disable V4L as V4L1 is disabled for Fedora 15
This still needs work to escape from FTBFS
* Thu Jan 06 2011 Nicolas Chauvet <kwizart@gmail.com> - 2.2.0-1
- Update to 2.2.0