X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopencv.git;a=blobdiff_plain;f=opencv.spec;h=10730430cb1ef52c89d9e02c7214fabe623513f7;hp=d068527ede9396d80d17a0fd4ae2c9a9fb7ff011;hb=c9cb1c24bf4a0e7cd03638394e356466035c54fc;hpb=61c09020245cec5b1e03939c9d7198094e037c09

diff --git a/opencv.spec b/opencv.spec
index d068527..1073043 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -7,6 +7,13 @@
 #   opencv_contrib-3.1.0/modules/hdf/CMakeLists.txt:find_package(HDF5)
 #   opencv_contrib-3.1.0/modules/sfm/CMakeLists.txt:find_package(Ceres QUIET)
 #   opencv_contrib-3.1.0/modules/text/CMakeLists.txt:find_package(Tesseract)
+# unpackaged (3.4.0)
+#/usr/share/OpenCV/3rdparty/usr/lib64/libcorrespondence.a
+#/usr/share/OpenCV/3rdparty/usr/lib64/libmultiview.a
+#/usr/share/OpenCV/3rdparty/usr/lib64/libnumeric.a
+#/usr/share/OpenCV/valgrind.supp
+#/usr/share/OpenCV/valgrind_3rdparty.supp
+
 #
 # - Smartek GigEVisionSDK (http://www.smartekvision.com/ but I can't see SDK with Linux library?)
 # - CUDA, CUFFT, CUBLAS, NVCUVID support (on bcond)
@@ -52,8 +59,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:	3.1.0
-Release:	5
+Version:	3.4.1
+Release:	0.1
 Epoch:		1
 %if %{with unicap} || %{with xine}
 License:	GPL (enforced by used libraries), BSD (opencv itself)
@@ -62,14 +69,11 @@ License:	BSD
 %endif
 Group:		Libraries
 Source0:	https://github.com/Itseez/opencv/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	70e1dd07f0aa06606f1bc0e3fa15abd3
+# Source0-md5:	a0b7a47899e67b3490ea31edc4f6e8e6
 Source1:	https://github.com/Itseez/opencv_contrib/archive/%{version}/%{name}_contrib-%{version}.tar.gz
-# Source1-md5:	a822839ad3ab79ff837c16785ea9dd10
-Patch0:		%{name}-cflags.patch
+# Source1-md5:	dd0c63f4185ab8a4829d8154ae382266
 Patch1:		%{name}-ximea.patch
-Patch2:		java-ant-sourcelevel.patch
 Patch3:		cmake-install-path.patch
-Patch4:		vtk7.patch
 URL:		http://www.opencv.org/
 %{?with_pvapi:BuildRequires:	AVT_GigE_SDK-devel}
 %{?with_opencl:BuildRequires:	OpenCL-devel}
@@ -292,11 +296,8 @@ Wiązania Pythona 3 do OpenCV.
 
 %undos CMakeLists.txt
 
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 install -d build
@@ -316,6 +317,7 @@ fi
 %cmake .. \
 	$ccache \
 	-DENABLE_PRECOMPILED_HEADERS=OFF \
+	-DOPENCV_LIB_INSTALL_PATH=%{_libdir} \
 	-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%{version}/modules \
 	-DENABLE_AVX=%{?with_avx:ON}%{!?with_avx:OFF} \
 	-DENABLE_SSE=%{?with_sse:ON}%{!?with_sse:OFF} \
@@ -399,7 +401,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/opencv_annotation
 %attr(755,root,root) %{_bindir}/opencv_createsamples
+%attr(755,root,root) %{_bindir}/opencv_interactive-calibration
 %attr(755,root,root) %{_bindir}/opencv_traincascade
+%attr(755,root,root) %{_bindir}/opencv_version
+%attr(755,root,root) %{_bindir}/opencv_visualisation
 %attr(755,root,root) %{_libdir}/libopencv_calib3d.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_calib3d.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_features2d.so.*.*.*
@@ -428,18 +433,28 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libopencv_datasets.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_dnn.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_dnn.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_dnn_objdetect.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_dnn_objdetect.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_dpm.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_dpm.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_face.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_face.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_freetype.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_freetype.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_fuzzy.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_fuzzy.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_hdf.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_hdf.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_hfs.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_hfs.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_img_hash.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_img_hash.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_line_descriptor.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_line_descriptor.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_optflow.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_optflow.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_phase_unwrapping.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_phase_unwrapping.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_plot.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_plot.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_reg.so.%{sover}
@@ -468,6 +483,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libopencv_xobjdetect.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_xphoto.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_xphoto.so.*.*.*
+
 %dir %{_datadir}/OpenCV
 %{_datadir}/OpenCV/haarcascades
 %{_datadir}/OpenCV/lbpcascades
@@ -527,12 +543,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libopencv_ccalib.so
 %attr(755,root,root) %{_libdir}/libopencv_datasets.so
 %attr(755,root,root) %{_libdir}/libopencv_dnn.so
+%attr(755,root,root) %{_libdir}/libopencv_dnn_objdetect.so
 %attr(755,root,root) %{_libdir}/libopencv_dpm.so
 %attr(755,root,root) %{_libdir}/libopencv_face.so
+%attr(755,root,root) %{_libdir}/libopencv_freetype.so
 %attr(755,root,root) %{_libdir}/libopencv_fuzzy.so
 %attr(755,root,root) %{_libdir}/libopencv_hdf.so
+%attr(755,root,root) %{_libdir}/libopencv_hfs.so
+%attr(755,root,root) %{_libdir}/libopencv_img_hash.so
 %attr(755,root,root) %{_libdir}/libopencv_line_descriptor.so
 %attr(755,root,root) %{_libdir}/libopencv_optflow.so
+%attr(755,root,root) %{_libdir}/libopencv_phase_unwrapping.so
 %attr(755,root,root) %{_libdir}/libopencv_plot.so
 %attr(755,root,root) %{_libdir}/libopencv_reg.so
 %attr(755,root,root) %{_libdir}/libopencv_rgbd.so
@@ -547,7 +568,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libopencv_ximgproc.so
 %attr(755,root,root) %{_libdir}/libopencv_xobjdetect.so
 %attr(755,root,root) %{_libdir}/libopencv_xphoto.so
-%{_libdir}/libopencv_ts.a
+#%{_libdir}/libopencv_ts.a
 # viz
 %if %{with vtk}
 %attr(755,root,root) %{_libdir}/libopencv_viz.so