Backport patch for V4L
This commit is contained in:
parent
30f5576b15
commit
ae0a180080
26
OpenCV-2.2-backport-v4l.patch
Normal file
26
OpenCV-2.2-backport-v4l.patch
Normal file
@ -0,0 +1,26 @@
|
||||
Index: modules/highgui/src/cap.cpp
|
||||
===================================================================
|
||||
--- modules/highgui/src/cap.cpp (révision 4961)
|
||||
+++ modules/highgui/src/cap.cpp (révision 4964)
|
||||
@@ -173,7 +173,7 @@
|
||||
if (capture)
|
||||
return capture;
|
||||
#endif
|
||||
- #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2)
|
||||
+ #if defined (HAVE_CAMV4L) && defined (HAVE_CAMV4L2)
|
||||
capture = cvCreateCameraCapture_V4L (index);
|
||||
if (capture)
|
||||
return capture;
|
||||
Index: modules/highgui/src/cap_v4l.cpp
|
||||
===================================================================
|
||||
--- modules/highgui/src/cap_v4l.cpp (révision 4961)
|
||||
+++ modules/highgui/src/cap_v4l.cpp (révision 4964)
|
||||
@@ -202,7 +202,7 @@
|
||||
|
||||
#include "precomp.hpp"
|
||||
|
||||
-#if !defined WIN32 && (defined HAVE_CAMV4L || defined HAVE_CAMV4L2)
|
||||
+#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
|
||||
|
||||
#define CLEAR(x) memset (&(x), 0, sizeof (x))
|
||||
|
@ -1,25 +0,0 @@
|
||||
diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp
|
||||
--- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2011-02-02 16:55:22.844244001 +0100
|
||||
+++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-02-02 16:53:22.224244002 +0100
|
||||
@@ -214,7 +214,9 @@ make & enjoy!
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.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;
|
@ -23,6 +23,7 @@ Patch3: OpenCV-2.2-fixpc.patch
|
||||
Patch4: opencv-2.1.0-opencvconfig.patch
|
||||
Patch5: OpenCV-2.2-numpy.patch
|
||||
Patch6: OpenCV-2.2-gcc46.patch
|
||||
Patch7: OpenCV-2.2-backport-v4l.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: libtool
|
||||
@ -104,6 +105,7 @@ This package contains Python bindings for the OpenCV library.
|
||||
%patch4 -p1 -b .opencvconfig
|
||||
%patch5 -p1 -b .numpy
|
||||
%patch6 -p1 -b .gcc46
|
||||
%patch7 -p0
|
||||
|
||||
#Save some convant headers for now:
|
||||
cp -p 3rdparty/include/cblas.h 3rdparty
|
||||
|
Loading…
Reference in New Issue
Block a user