X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopencv.git;a=blobdiff_plain;f=opencv.spec;h=51ef98923620794fcb1d41448196f4e70841ad1c;hp=fe3f9d26783cf98d9bcc0c832573aac9df072024;hb=54ee5fb58c264a029c626d2a944fccec1b28afe1;hpb=c30754630ae0f2d05520a5178b96ec313683cd4a

diff --git a/opencv.spec b/opencv.spec
index fe3f9d2..51ef989 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -2,11 +2,6 @@
 # - Smartek GigEVisionSDK (http://www.smartekvision.com/ but I can't see SDK with Linux library?)
 # - CUDA, CUFFT, CUBLAS, NVCUVID support (on bcond)
 # - ipp (libippi): http://software.intel.com/en-us/articles/intel-ipp/ (proprietary)
-# - GUI: VTK support
-# - Use GCD NO
-# - Use Concurrency NO
-# - Use C= (CSTRIPES): NO
-#   C/C++ Examples: NO
 #
 # Conditional build:
 # - general options:
@@ -22,7 +17,7 @@
 %bcond_with	opencl_amdblas	# AMD OpenCL BLAS routines
 %bcond_with	opencl_amdfft	# AMD OpenCL FFT routines
 %bcond_without	opengl		# OpenGL support
-%bcond_without	gomp		# OpenMP support
+%bcond_without	openmp		# OpenMP support (available when not using tbb)
 %bcond_without	examples	# Install examples
 # - bindings
 %bcond_without	java		# Java binding
@@ -36,18 +31,20 @@
 %bcond_without	v4l		# Video4Linux in highgui
 %bcond_with	ximea		# m3API (XIMEA cameras) support in highgui (proprietary)
 %bcond_with	xine		# XINE support in highgui (GPL)
+# - other modules
+%bcond_without	vtk		# VTK library support (opencv_viz module)
 
-%ifarch pentium3 pentium4 %{x8664}
+%ifarch pentium3 pentium4 %{x8664} x32
 %define		with_sse	1
 %endif
-%ifarch pentium4 %{x8664}
+%ifarch pentium4 %{x8664} x32
 %define		with_sse2	1
 %endif
 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.9
-Release:	2
+Version:	2.4.11
+Release:	6
 Epoch:		1
 %if %{with unicap} || %{with xine}
 License:	GPL (enforced by used libraries), BSD (opencv itself)
@@ -56,9 +53,9 @@ License:	BSD
 %endif
 Group:		Libraries
 Source0:	https://github.com/Itseez/opencv/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	cc0a8307403ff471f554197401ec0eb9
+# Source0-md5:	fa06384719cb0be48183b4de972f0b2a
 Patch0:		%{name}-cflags.patch
-Patch1:		%{name}-link.patch
+Patch1:		%{name}-cmake.patch
 Patch2:		%{name}-unicap-c++.patch
 Patch3:		%{name}-c.patch
 Patch4:		%{name}-gcc.patch
@@ -66,6 +63,8 @@ Patch5:		%{name}-ximea.patch
 Patch6:		%{name}-ocl-fft.patch
 Patch7:		java-ant-sourcelevel.patch
 Patch8:		%{name}-shared.patch
+Patch9:		no-sysctl.patch
+Patch10:	cmake-install-path.patch
 URL:		http://www.opencv.org/
 %{?with_pvapi:BuildRequires:	AVT_GigE_SDK-devel}
 %{?with_opencl:BuildRequires:	OpenCL-devel}
@@ -82,15 +81,15 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	doxygen
 BuildRequires:	eigen3 >= 3
 %{?with_ffmpeg:BuildRequires:	ffmpeg-devel >= 0.7}
-%{?with_gomp:BuildRequires:	gcc-c++ >= 6:4.2}
+%{?with_openmp:BuildRequires:	gcc-c++ >= 6:4.2}
 %if %{with gstreamer}
-BuildRequires:	gstreamer-devel >= 0.10
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10
+BuildRequires:	gstreamer-devel >= 1.0
+BuildRequires:	gstreamer-plugins-base-devel >= 1.0
 %endif
 BuildRequires:	jasper-devel
 %{?with_java:BuildRequires:	jdk}
-BuildRequires:	libdc1394-devel
-%{?with_gomp:BuildRequires:	libgomp-devel}
+BuildRequires:	libdc1394-devel >= 2
+%{?with_openmp:BuildRequires:	libgomp-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libraw1394-devel
@@ -103,15 +102,22 @@ BuildRequires:	libunicap-devel
 %endif
 BuildRequires:	libv4l-devel
 BuildRequires:	pkgconfig
-BuildRequires:	python
-BuildRequires:	python-devel
+BuildRequires:	python >= 2.0
+BuildRequires:	python-devel >= 2.0
 BuildRequires:	python-numpy-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.606
 BuildRequires:	sed >= 4.0
+BuildRequires:	sphinx-pdg
 BuildRequires:	swig-python
 %{?with_tbb:BuildRequires:	tbb-devel}
+%if %{with vtk}
+BuildRequires:	vtk-devel >= 5.8.0
+BuildRequires:	vtk-java >= 5.8.0
+BuildRequires:	vtk-tcl >= 5.8.0
+%endif
 %{?with_xine:BuildRequires:	xine-lib-devel}
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	zlib-devel
 %if %{with qt}
 BuildRequires:	QtCore-devel >= 4
@@ -125,8 +131,7 @@ BuildRequires:	gtk+2-devel >= 2.0
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		sover	%(v=%{version}; k=${v#?.?.?}; echo ${v%$k})
-%define		jver	%(echo %{version} | tr -d .)
+%define		jver	%(echo %{version} | cut -d. -f1-3 | tr -d .)
 
 %description
 OpenCV (Open Source Computer Vision) is a library of programming
@@ -170,11 +175,26 @@ This package contains the OpenCV C/C++ core libraries.
 %description core -l pl.UTF-8
 Ten pakiet zawiera podstawowe biblioteki C/C++ OpenCV.
 
+%package viz
+Summary:	OpenCV viz library (VTK support)
+Summary(pl.UTF-8):	Biblioteka OpenCV viz (obsługa VTK)
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description viz
+OpenCV viz library (VTK support).
+
+%description viz -l pl.UTF-8
+Biblioteka OpenCV viz (obsługa VTK).
+
 %package devel
 Summary:	Header files for OpenCV library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki OpenCV
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+%if %{with vtk}
+Requires:	%{name}-viz = %{epoch}:%{version}-%{release}
+%endif
 Obsoletes:	opencv-static
 
 %description devel
@@ -257,6 +277,8 @@ Wiązania Pythona do OpenCV.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 install -d build
@@ -293,13 +315,14 @@ fi
 	%{!?with_opencl_amdblas:-DWITH_OPENCLAMDBLAS=OFF} \
 	%{!?with_opencl_amdfft:-DWITH_OPENCLAMDFFT=OFF} \
 	%{?with_opengl:-DWITH_OPENGL=ON} \
-	%{?with_gomp:-DWITH_OPENMP=ON} \
+	%{?with_openmp:-DWITH_OPENMP=ON} \
 	%{?with_openni:-DWITH_OPENNI=ON} \
 	%{?with_pvapi:-DPVAPI_LIBRARY=%{_libdir}/libPvAPI.so}%{!?with_pvapi:-DWITH_PVAPI=OFF} \
 	%{?with_qt:-DWITH_QT=ON %{?with_opengl:-DWITH_QT_OPENGL=ON} -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4} \
 	%{?with_tbb:-DWITH_TBB=ON} \
 	%{?with_unicap:-DWITH_UNICAP=ON} \
 	%{!?with_v4l:-DWITH_V4L=OFF} \
+	%{?with_vtk:-DWITH_VTK=ON} \
 	%{?with_ximea:-DWITH_XIMEA=ON} \
 	%{?with_xine:-DWITH_XINE=ON}
 
@@ -320,6 +343,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/OpenCV/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 cp -p build/unix-install/opencv.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
+# disable completeness check incompatible with split packaging
+%{__sed} -i -e '/^foreach(target .*IMPORT_CHECK_TARGETS/,/^endforeach/d' $RPM_BUILD_ROOT%{_datadir}/OpenCV/OpenCVModules.cmake
+
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
@@ -344,6 +370,9 @@ rm -rf $RPM_BUILD_ROOT
 %post   core -p /sbin/ldconfig
 %postun core -p /sbin/ldconfig
 
+%post   viz -p /sbin/ldconfig
+%postun viz -p /sbin/ldconfig
+
 %post   -n java-opencv -p /sbin/ldconfig
 %postun -n java-opencv -p /sbin/ldconfig
 
@@ -353,58 +382,88 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/opencv_haartraining
 %attr(755,root,root) %{_bindir}/opencv_performance
 %attr(755,root,root) %{_bindir}/opencv_traincascade
-%attr(755,root,root) %{_libdir}/libopencv_calib3d.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_calib3d.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_calib3d.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_contrib.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_contrib.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_contrib.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_features2d.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_features2d.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_features2d.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_highgui.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_gpu.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_gpu.so.2.4
+%attr(755,root,root) %{_libdir}/libopencv_highgui.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_highgui.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_legacy.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_legacy.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_legacy.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_objdetect.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_nonfree.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_nonfree.so.2.4
+%attr(755,root,root) %{_libdir}/libopencv_objdetect.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_objdetect.so.2.4
 %if %{with opencl}
-%attr(755,root,root) %{_libdir}/libopencv_ocl.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_ocl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_ocl.so.2.4
 %endif
-%attr(755,root,root) %{_libdir}/libopencv_stitching.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_stitching.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_stitching.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_ts.so.%{sover}
-%attr(755,root,root) %ghost %{_libdir}/libopencv_ts.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_superres.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_superres.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_superres.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_videostab.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_ts.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_ts.so.2.4
+%attr(755,root,root) %{_libdir}/libopencv_videostab.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_videostab.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_gpu.so.%{sover}
-%attr(755,root,root) %ghost %{_libdir}/libopencv_gpu.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_nonfree.so.%{sover}
-%attr(755,root,root) %ghost %{_libdir}/libopencv_nonfree.so.2.4
 %dir %{_datadir}/OpenCV
 %{_datadir}/OpenCV/haarcascades
 %{_datadir}/OpenCV/lbpcascades
 
 %files core
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libopencv_core.so.%{sover}
-%ghost %{_libdir}/libopencv_core.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_flann.so.%{sover}
-%ghost %{_libdir}/libopencv_flann.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_imgproc.so.%{sover}
-%ghost %{_libdir}/libopencv_imgproc.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_ml.so.%{sover}
-%ghost %{_libdir}/libopencv_ml.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_photo.so.%{sover}
-%ghost %{_libdir}/libopencv_photo.so.2.4
-%attr(755,root,root) %{_libdir}/libopencv_video.so.%{sover}
-%ghost %{_libdir}/libopencv_video.so.2.4
+%attr(755,root,root) %{_libdir}/libopencv_core.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_core.so.2.4
+%attr(755,root,root) %{_libdir}/libopencv_flann.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_flann.so.2.4
+%attr(755,root,root) %{_libdir}/libopencv_imgproc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_imgproc.so.2.4
+%attr(755,root,root) %{_libdir}/libopencv_ml.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_ml.so.2.4
+%attr(755,root,root) %{_libdir}/libopencv_photo.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_photo.so.2.4
+%attr(755,root,root) %{_libdir}/libopencv_video.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_video.so.2.4
+
+%if %{with vtk}
+%files viz
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libopencv_viz.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_viz.so.2.4
+%endif
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libopencv_*.so
-%if %{with java}
-%exclude %{_libdir}/libopencv_java%{jver}.so
+# core
+%attr(755,root,root) %{_libdir}/libopencv_core.so
+%attr(755,root,root) %{_libdir}/libopencv_flann.so
+%attr(755,root,root) %{_libdir}/libopencv_imgproc.so
+%attr(755,root,root) %{_libdir}/libopencv_ml.so
+%attr(755,root,root) %{_libdir}/libopencv_photo.so
+%attr(755,root,root) %{_libdir}/libopencv_video.so
+# GUI/extensions (base package)
+%attr(755,root,root) %{_libdir}/libopencv_calib3d.so
+%attr(755,root,root) %{_libdir}/libopencv_contrib.so
+%attr(755,root,root) %{_libdir}/libopencv_features2d.so
+%attr(755,root,root) %{_libdir}/libopencv_gpu.so
+%attr(755,root,root) %{_libdir}/libopencv_highgui.so
+%attr(755,root,root) %{_libdir}/libopencv_legacy.so
+%attr(755,root,root) %{_libdir}/libopencv_nonfree.so
+%attr(755,root,root) %{_libdir}/libopencv_objdetect.so
+%if %{with opencl}
+%attr(755,root,root) %{_libdir}/libopencv_ocl.so
+%endif
+%attr(755,root,root) %{_libdir}/libopencv_stitching.so
+%attr(755,root,root) %{_libdir}/libopencv_superres.so
+%attr(755,root,root) %{_libdir}/libopencv_ts.so
+%attr(755,root,root) %{_libdir}/libopencv_videostab.so
+# viz
+%if %{with vtk}
+%attr(755,root,root) %{_libdir}/libopencv_viz.so
 %endif
 %{_includedir}/opencv
 %{_includedir}/opencv2