packages: opencv/opencv.spec, opencv/opencv-unicap-c++.patch (NEW) - added ...

[qboosh]

Author: qboosh                       Date: Mon Jan 24 16:08:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added unicap-c++ patch (workaround for "private" field name being a keyword in C++)
- added tbb support (on bcond)
- BR: eigen 2

---- Files affected:
packages/opencv:
   opencv.spec (1.23 -> 1.24) , opencv-unicap-c++.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.23 packages/opencv/opencv.spec:1.24
--- packages/opencv/opencv.spec:1.23	Sun Jan 23 19:06:59 2011
+++ packages/opencv/opencv.spec	Mon Jan 24 17:08:29 2011
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	gstreamer	# GStreamer support
 %bcond_with	pvapi		# PvAPI (AVT GigE cameras) support
+%bcond_with	tbb		# Threading Building Blocks support
 %bcond_with	unicap		# Unicap support (GPL)
 %bcond_with	xine		# XINE support (GPL)
 #
@@ -23,11 +24,13 @@
 Patch0:		%{name}-multilib.patch
 Patch1:		%{name}-cflags.patch
 Patch2:		%{name}-link.patch
+Patch3:		%{name}-unicap-c++.patch
 URL:		http://opencv.willowgarage.com/
 %{?with_pvapi:BuildRequires:	AVT_GigE_SDK-devel}
 BuildRequires:	OpenEXR-devel
 BuildRequires:	cmake >= 2.4
 BuildRequires:	doxygen
+BuildRequires:	eigen >= 2
 BuildRequires:	ffmpeg-devel
 %if %{with gstreamer}
 BuildRequires:	gstreamer-devel >= 0.10
@@ -54,13 +57,12 @@
 BuildRequires:	rpmbuild(macros) >= 1.577
 BuildRequires:	sed >= 4.0
 BuildRequires:	swig-python
+%{?with_tbb:BuildRequires:	tbb-devel}
 BuildRequires:	zlib-devel
 %{?with_xine:BuildRequires:	xine-lib-devel}
 # TODO:
 # - Qt (bcond replacing GTK+?)
-# - tbb (tbb.pc)
 # - cuda (on bcond)
-# - eigen2/eigen3 (Eigen/Core headers)
 # - ipp (libippi)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -129,6 +131,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
@@ -147,6 +150,7 @@
 	-DUSE_O3=OFF \
 	%{!?with_gstreamer:-DWITH_GSTREAMER=OFF} \
 	%{!?with_pvapi:-DWITH_PVAPI=OFF} \
+	%{?with_tbb:-DWITH_TBB=ON} \
 	%{?with_unicap:-DWITH_UNICAP=ON} \
 	%{?with_xine:-DWITH_XINE=ON}
 
@@ -200,6 +204,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2011/01/24 16:08:29  qboosh
+- added unicap-c++ patch (workaround for "private" field name being a keyword in C++)
+- added tbb support (on bcond)
+- BR: eigen 2
+
 Revision 1.23  2011/01/23 18:06:59  qboosh
 - gstreamer enabled by default
 - added options/bconds/BRs for unicap and pvapi

================================================================
Index: packages/opencv/opencv-unicap-c++.patch
diff -u /dev/null packages/opencv/opencv-unicap-c++.patch:1.1
--- /dev/null	Mon Jan 24 17:08:34 2011
+++ packages/opencv/opencv-unicap-c++.patch	Mon Jan 24 17:08:29 2011
@@ -0,0 +1,15 @@
+--- OpenCV-2.2.0/modules/highgui/src/cap_unicap.cpp.orig	2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0/modules/highgui/src/cap_unicap.cpp	2011-01-23 21:17:45.126368322 +0100
+@@ -43,10 +43,12 @@
+ 
+ #include "precomp.hpp"
+ #include <unistd.h>
++#define private privat
+ #include <unicap.h>
+ extern "C" {
+ #include <ucil.h>
+ }
++#undef private
+ 
+ #ifdef NDEBUG
+ #define CV_WARN(message)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv.spec?r1=1.23&r2=1.24&f=u