[packages/opencv] - up to 2.4.3 - reenabled pvapi: (by cmake option) and ximea (by patch)

[qboosh]

commit 809ce4139d481bcb108ce37af12fd9b8f38e7039
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Feb 14 20:19:30 2013 +0100

    - up to 2.4.3
    - reenabled pvapi: (by cmake option) and ximea (by patch)

 opencv-ximea.patch | 15 +++++++++++++++
 opencv.spec        | 16 +++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/opencv.spec b/opencv.spec
index 5e0f401..152e22b 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -1,5 +1,9 @@
 #
 # TODO:
+# - gtkglext ?
+# - OpenGL
+# - OpenCL
+# - Smartek GigEVisionSDK (http://www.smartekvision.com/ ?)
 # - CUDA support (on bcond)
 #
 # Conditional build:
@@ -26,8 +30,8 @@
 Summary:	A library of programming functions mainly aimed at real time computer vision
 Summary(pl.UTF-8):	Biblioteka funkcji do grafiki komputerowej w czasie rzeczywistym
 Name:		opencv
-Version:	2.4.2
-Release:	4
+Version:	2.4.3
+Release:	1
 Epoch:		1
 %if %{with unicap} || %{with xine}
 License:	GPL (enforced by used libraries), BSD (opencv itself)
@@ -36,12 +40,13 @@ License:	BSD
 %endif
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/opencvlibrary/OpenCV-%{version}.tar.bz2
-# Source0-md5:	059ef86fc1724d69b75832a0d2929ff5
+# Source0-md5:	c0a5af4ff9d0d540684c0bf00ef35dbe
 Patch0:		%{name}-cflags.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-unicap-c++.patch
 Patch3:		%{name}-c.patch
 Patch4:		%{name}-gcc.patch
+Patch5:		%{name}-ximea.patch
 URL:		http://opencv.willowgarage.com/
 %{?with_pvapi:BuildRequires:	AVT_GigE_SDK-devel}
 BuildRequires:	OpenEXR-devel
@@ -50,7 +55,7 @@ BuildRequires:	OpenEXR-devel
 %{?with_ximea:BuildRequires:	XIMEA-devel}
 BuildRequires:	cmake >= 2.4
 BuildRequires:	doxygen
-BuildRequires:	eigen >= 2
+BuildRequires:	eigen3 >= 3
 BuildRequires:	ffmpeg-devel >= 0.7
 %if %{with gstreamer}
 BuildRequires:	gstreamer-devel >= 0.10
@@ -158,6 +163,7 @@ Wiązania Pythona do OpenCV.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 install -d build
@@ -169,7 +175,7 @@ cd build
 	-DUSE_O3=OFF \
 	%{!?with_gstreamer:-DWITH_GSTREAMER=OFF} \
 	%{?with_openni:-DWITH_OPENNI=ON} \
-	%{!?with_pvapi:-DWITH_PVAPI=OFF} \
+	%{?with_pvapi:-DPVAPI_LIBRARY=%{_libdir}/libPvAPI.so}%{!?with_pvapi:-DWITH_PVAPI=OFF} \
 	%{?with_qt:-DWITH_QT=ON -DWITH_QT_OPENGL=ON -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4} \
 	%{?with_tbb:-DWITH_TBB=ON} \
 	%{?with_unicap:-DWITH_UNICAP=ON} \
diff --git a/opencv-ximea.patch b/opencv-ximea.patch
new file mode 100644
index 0000000..a824661
--- /dev/null
+++ b/opencv-ximea.patch
@@ -0,0 +1,15 @@
+--- OpenCV-2.4.3/cmake/OpenCVFindXimea.cmake.orig	2012-10-18 00:55:38.000000000 +0200
++++ OpenCV-2.4.3/cmake/OpenCVFindXimea.cmake	2013-02-14 19:10:24.278758230 +0100
+@@ -27,10 +27,10 @@
+     set(XIMEA_FOUND 0)
+   endif()
+ else()
+-  if(EXISTS /opt/XIMEA)
++  if(EXISTS /usr/include/ximea)
+     set(XIMEA_FOUND 1)
+     # set folders
+-    set(XIMEA_PATH /opt/XIMEA/include)
++    set(XIMEA_PATH /usr/include/ximea)
+   else()
+     set(XIMEA_FOUND 0)
+   endif()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/809ce4139d481bcb108ce37af12fd9b8f38e7039