[gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/, media-libs/opencv/

[Tomas Chvatal]

commit:     319b0d020d15c9af2c492c44b785256cf9bd4657
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 19:24:42 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 19:24:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=319b0d02

[media-libs/opencv] Add few patches so we compile a bit more.

---
 media-libs/opencv/files/2.2.0-gcc46.patch        |   10 ++++++
 media-libs/opencv/files/2.2.0-ptrcvcapture.patch |   17 +++++++++++
 media-libs/opencv/files/2.2.0-v4l_2.6.38.patch   |   33 ++++++++++++++++++++++
 media-libs/opencv/opencv-2.2.0.ebuild            |    3 ++
 4 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/media-libs/opencv/files/2.2.0-gcc46.patch b/media-libs/opencv/files/2.2.0-gcc46.patch
new file mode 100644
index 0000000..a69499b
--- /dev/null
+++ b/media-libs/opencv/files/2.2.0-gcc46.patch
@@ -0,0 +1,10 @@
+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/media-libs/opencv/files/2.2.0-ptrcvcapture.patch b/media-libs/opencv/files/2.2.0-ptrcvcapture.patch
new file mode 100644
index 0000000..c1316f0
--- /dev/null
+++ b/media-libs/opencv/files/2.2.0-ptrcvcapture.patch
@@ -0,0 +1,17 @@
+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/media-libs/opencv/files/2.2.0-v4l_2.6.38.patch b/media-libs/opencv/files/2.2.0-v4l_2.6.38.patch
new file mode 100644
index 0000000..dd23cd1
--- /dev/null
+++ b/media-libs/opencv/files/2.2.0-v4l_2.6.38.patch
@@ -0,0 +1,33 @@
+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>

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 7d6ad6e..35691dd 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -56,6 +56,9 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PV}-convert_sets_to_options.patch"
+	"${FILESDIR}/${PV}-gcc46.patch"
+	"${FILESDIR}/${PV}-ptrcvcapture.patch"
+	"${FILESDIR}/${PV}-v4l_2.6.38.patch"
 )
 
 S=${WORKDIR}/${MY_P}