diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-07-11 18:35:04 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-07-11 18:35:04 +0000 |
commit | 1a1b748f1738b1989a834d75b1623be21bf9bab5 (patch) | |
tree | d99e645120dc197bc3bcbcd96b1bb89e4e68bf4f /extra/opencv | |
parent | 139460a7a8b085588b699c488fd19b166db18a74 (diff) |
Mon Jul 11 18:34:51 UTC 2011
Diffstat (limited to 'extra/opencv')
-rw-r--r-- | extra/opencv/gcc46.patch | 10 | ||||
-rw-r--r-- | extra/opencv/ptrcvcapture.patch | 17 | ||||
-rw-r--r-- | extra/opencv/v4l-mmap.patch | 14 | ||||
-rw-r--r-- | extra/opencv/v4l_2.6.38.patch | 33 |
4 files changed, 0 insertions, 74 deletions
diff --git a/extra/opencv/gcc46.patch b/extra/opencv/gcc46.patch deleted file mode 100644 index a69499b4f..000000000 --- a/extra/opencv/gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: /trunk/opencv/modules/core/include/opencv2/core/core.hpp -=================================================================== ---- /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4804) -+++ /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4861) -@@ -56,4 +56,5 @@ - #include <algorithm> - #include <cmath> -+#include <cstddef> - #include <complex> - #include <map> diff --git a/extra/opencv/ptrcvcapture.patch b/extra/opencv/ptrcvcapture.patch deleted file mode 100644 index c1316f0ea..000000000 --- a/extra/opencv/ptrcvcapture.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: modules/highgui/src/cap.cpp -=================================================================== ---- modules/highgui/src/cap.cpp (revision 4283) -+++ modules/highgui/src/cap.cpp (working copy) -@@ -52,10 +52,10 @@ - namespace cv - { - --template<> inline void Ptr<CvCapture>::delete_obj() -+template<> void Ptr<CvCapture>::delete_obj() - { cvReleaseCapture(&obj); } - --template<> inline void Ptr<CvVideoWriter>::delete_obj() -+template<> void Ptr<CvVideoWriter>::delete_obj() - { cvReleaseVideoWriter(&obj); } - - } diff --git a/extra/opencv/v4l-mmap.patch b/extra/opencv/v4l-mmap.patch deleted file mode 100644 index b7bbc9b74..000000000 --- a/extra/opencv/v4l-mmap.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://code.ros.org/trac/opencv/ticket/141 -http://bugs.gentoo.org/313649 - ---- src/highgui/cvcap_libv4l.cpp -+++ src/highgui/cvcap_libv4l.cpp -@@ -782,7 +782,7 @@ - - capture->buffers[n_buffers].length = buf.length; - capture->buffers[n_buffers].start = -- mmap (NULL /* start anywhere */, -+ v4l2_mmap (NULL /* start anywhere */, - buf.length, - PROT_READ | PROT_WRITE /* required */, - MAP_SHARED /* recommended */, diff --git a/extra/opencv/v4l_2.6.38.patch b/extra/opencv/v4l_2.6.38.patch deleted file mode 100644 index dd23cd133..000000000 --- a/extra/opencv/v4l_2.6.38.patch +++ /dev/null @@ -1,33 +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 2010-12-05 11:35:25.000000000 +0800 -+++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-04-18 10:40:01.984950054 +0800 -@@ -214,7 +214,7 @@ - #include <sys/types.h> - #include <sys/mman.h> - --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - - #include <string.h> - #include <stdlib.h> -diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.cpp ---- OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800 -+++ OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp 2011-04-18 10:39:07.568578185 +0800 -@@ -224,7 +224,7 @@ - #include "highgui.h" - #include "precomp.hpp" - --#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2 -+#if !defined WIN32 && defined HAVE_CAMV4L2 - - #define CLEAR(x) memset (&(x), 0, sizeof (x)) - -@@ -241,7 +241,7 @@ - #include <sys/stat.h> - #include <sys/ioctl.h> - --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - #include <linux/videodev2.h> - - #include <libv4l1.h> |