From c3d15c74946e752b2eb3712c4cd402b3f5d66fb3 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Fri, 4 Feb 2011 15:27:54 +0100
Subject: [PATCH] Fix double FTBFS

---
 OpenCV-2.2-nov4l1.patch | 14 +++++++++++++-
 opencv.spec             |  1 -
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/OpenCV-2.2-nov4l1.patch b/OpenCV-2.2-nov4l1.patch
index 3cedf72..cacdd77 100644
--- a/OpenCV-2.2-nov4l1.patch
+++ b/OpenCV-2.2-nov4l1.patch
@@ -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;
diff --git a/opencv.spec b/opencv.spec
index 68bba8f..ac80a38 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -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