X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopencv.git;a=blobdiff_plain;f=opencv.spec;h=d83d576a0f00a7dc903bede1e599b23027456058;hp=e66f4b9ac154c9d8e1dc691f394a374c919f193b;hb=3752412bd1984e40ddc3d05df32134343298b7e7;hpb=ca2adc0862f76aed6a25f39c630198b623197868

diff --git a/opencv.spec b/opencv.spec
index e66f4b9..d83d576 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:	2
+Version:	3.4.8
+Release:	1
 Epoch:		1
 %if %{with unicap} || %{with xine}
 License:	GPL (enforced by used libraries), BSD (opencv itself)
@@ -62,13 +69,38 @@ License:	BSD
 %endif
 Group:		Libraries
 Source0:	https://github.com/Itseez/opencv/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	70e1dd07f0aa06606f1bc0e3fa15abd3
+# Source0-md5:	5aa8240c28c00a7dacdf51698e0ced77
 Source1:	https://github.com/Itseez/opencv_contrib/archive/%{version}/%{name}_contrib-%{version}.tar.gz
-# Source1-md5:	a822839ad3ab79ff837c16785ea9dd10
-Patch0:		%{name}-cflags.patch
-Patch5:		%{name}-ximea.patch
-Patch7:		java-ant-sourcelevel.patch
-Patch10:	cmake-install-path.patch
+# Source1-md5:	9c9f239364669b3315f9cae12dafb7b7
+# See opencv_contrib-3.4.1/modules/xfeatures2d/cmake/download_boostdesc.cmake
+Source10:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_bgm.i
+# Source10-md5:	0ea90e7a8f3f7876d450e4149c97c74f
+Source11:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_bgm_bi.i
+# Source11-md5:	232c966b13651bd0e46a1497b0852191
+Source12:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_bgm_hd.i
+# Source12-md5:	324426a24fa56ad9c5b8e3e0b3e5303e
+Source13:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_binboost_064.i
+# Source13-md5:	202e1b3e9fec871b04da31f7f016679f
+Source14:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_binboost_128.i
+# Source14-md5:	98ea99d399965c03d555cef3ea502a0b
+Source15:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_binboost_256.i
+# Source15-md5:	e6dcfa9f647779eb1ce446a8d759b6ea
+Source16:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_lbgm.i
+# Source16-md5:	0ae0675534aa318d9668f2a179c2a052
+# See opencv_contrib-3.4.1/modules/xfeatures2d/cmake/download_vgg.cmake
+Source20:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d/vgg_generated_48.i
+# Source20-md5:	e8d0dcd54d1bcfdc29203d011a797179
+Source21:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d/vgg_generated_64.i
+# Source21-md5:	7126a5d9a8884ebca5aea5d63d677225
+Source22:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d/vgg_generated_80.i
+# Source22-md5:	7cd47228edec52b6d82f46511af325c5
+Source23:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d/vgg_generated_120.i
+# Source23-md5:	151805e03568c9f490a5e3a872777b75
+# See opencv_contrib-3.4.1/modules/face/CMakeLists.txt
+Source30:	https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat
+# Source30-md5:	7505c44ca4eb54b4ab1e4777cb96ac05
+Patch0:		%{name}-ximea.patch
+Patch1:		python-install.patch
 URL:		http://www.opencv.org/
 %{?with_pvapi:BuildRequires:	AVT_GigE_SDK-devel}
 %{?with_opencl:BuildRequires:	OpenCL-devel}
@@ -79,6 +111,7 @@ BuildRequires:	OpenEXR-devel
 %{?with_openni:BuildRequires:	OpenNI-devel}
 %{?with_ximea:BuildRequires:	XIMEA-devel >= 4}
 %{?with_java:BuildRequires:	ant}
+BuildRequires:	boost-devel
 %{?with_opencl_amdblas:BuildRequires:	clAmdBlas-devel}
 %{?with_opencl_amdfft:BuildRequires:	clAmdFft-devel}
 BuildRequires:	cmake >= 2.8
@@ -86,7 +119,9 @@ BuildRequires:	doxygen
 BuildRequires:	eigen3 >= 3
 %{?with_ffmpeg:BuildRequires:	ffmpeg-devel >= 0.7}
 %{?with_openmp:BuildRequires:	gcc-c++ >= 6:4.2}
+BuildRequires:	gflags-devel
 BuildRequires:	gl2ps-devel
+BuildRequires:	glog-devel
 %if %{with gstreamer}
 BuildRequires:	gstreamer-devel >= 1.0
 BuildRequires:	gstreamer-plugins-base-devel >= 1.0
@@ -290,14 +325,16 @@ Wiązania Pythona 3 do OpenCV.
 %undos CMakeLists.txt
 
 %patch0 -p1
-%patch5 -p1
-%patch7 -p1
-%patch10 -p1
+%patch1 -p1
 
 %build
-install -d build
+install -d build/{share/OpenCV/testdata/cv/face,downloads/xfeatures2d}
 cd build
 
+install %{SOURCE30} share/OpenCV/testdata/cv/face/
+install %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} downloads/xfeatures2d/
+install %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} downloads/xfeatures2d/
+
 # handle cmake & ccache
 # http://stackoverflow.com/questions/1815688/how-to-use-ccache-with-cmakec
 if [[ "%{__cc}" = *ccache* ]]; then
@@ -311,6 +348,8 @@ 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} \
@@ -394,7 +433,11 @@ 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) %{_bindir}/setup_vars_opencv3.sh
 %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.*.*.*
@@ -423,18 +466,30 @@ 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_ovis.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_ovis.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}
@@ -463,6 +518,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
@@ -522,12 +578,18 @@ 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_ovis.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
@@ -542,7 +604,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
@@ -573,8 +635,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n python-opencv
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/cv2.so
+%dir %{py_sitedir}/cv2
+%dir %{py_sitedir}/cv2/python-*
+%attr(755,root,root) %{py_sitedir}/cv2/python-*/cv2.so
+%{py_sitedir}/cv2/*.py[co]
 
 %files -n python3-opencv
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py3_sitedir}/cv2.cpython-*.so
+%dir %{py3_sitedir}/cv2
+%dir %{py3_sitedir}/cv2/python-*
+%attr(755,root,root) %{py3_sitedir}/cv2/python-*/cv2.cpython-*.so
+%{py3_sitedir}/cv2/*.py