Update to 4.1.0

This commit is contained in:
Sérgio Basto 2019-09-13 19:41:44 +02:00 committed by Nicolas Chauvet
parent 6d86e3fb86
commit a7f630433d
1 changed files with 17 additions and 11 deletions

View File

@ -309,6 +309,8 @@ popd
-DWITH_LIBV4L=ON \ -DWITH_LIBV4L=ON \
-DWITH_OPENMP=ON \ -DWITH_OPENMP=ON \
-DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \ -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_PC_FILE_NAME=opencv.pc \
%{?with_gdcm: -DWITH_GDCM=ON } \ %{?with_gdcm: -DWITH_GDCM=ON } \
%{?with_libmfx: -DWITH_MFX=ON } \ %{?with_libmfx: -DWITH_MFX=ON } \
%{?with_clp: -DWITH_CLP=ON } \ %{?with_clp: -DWITH_CLP=ON } \
@ -357,14 +359,14 @@ popd
%files %files
%doc README.md %doc README.md
%{_bindir}/opencv_* %{_bindir}/opencv_*
%dir %{_datadir}/OpenCV %dir %{_datadir}/opencv4
%{_datadir}/OpenCV/haarcascades %{_datadir}/opencv4/haarcascades
%{_datadir}/OpenCV/lbpcascades %{_datadir}/opencv4/lbpcascades
%{_datadir}/OpenCV/valgrind* %{_datadir}/opencv4/valgrind*
%files core %files core
%license LICENSE %license LICENSE
%{_datadir}/licenses/opencv3/ %{_datadir}/licenses/opencv4/
%{_libdir}/libopencv_core.so.%{abiver}* %{_libdir}/libopencv_core.so.%{abiver}*
%{_libdir}/libopencv_cvv.so.%{abiver}* %{_libdir}/libopencv_cvv.so.%{abiver}*
%{_libdir}/libopencv_features2d.so.%{abiver}* %{_libdir}/libopencv_features2d.so.%{abiver}*
@ -387,18 +389,18 @@ popd
%endif %endif
%files devel %files devel
%{_includedir}/opencv #{_includedir}/opencv
%{_includedir}/opencv2 %{_includedir}/opencv4/opencv2
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/pkgconfig/opencv.pc %{_libdir}/pkgconfig/opencv.pc
%{_libdir}/cmake/OpenCV/*.cmake %{_libdir}/cmake/opencv4/*.cmake
%files doc %files doc
%{_datadir}/OpenCV/samples %{_datadir}/opencv4/samples
%{_datadir}/OpenCV/doc #{_datadir}/opencv4/doc
%files -n python3-opencv %files -n python3-opencv
%{_bindir}/setup_vars_opencv3.sh %{_bindir}/setup_vars_opencv4.sh
%{python3_sitearch}/cv2.cpython-3*.so %{python3_sitearch}/cv2.cpython-3*.so
%if %{with java} %if %{with java}
@ -431,6 +433,7 @@ popd
%{_libdir}/libopencv_plot.so.%{abiver}* %{_libdir}/libopencv_plot.so.%{abiver}*
%{_libdir}/libopencv_reg.so.%{abiver}* %{_libdir}/libopencv_reg.so.%{abiver}*
%{_libdir}/libopencv_rgbd.so.%{abiver}* %{_libdir}/libopencv_rgbd.so.%{abiver}*
%{_libdir}/libopencv_quality.so.%{abiver}*
%{_libdir}/libopencv_saliency.so.%{abiver}* %{_libdir}/libopencv_saliency.so.%{abiver}*
%{_libdir}/libopencv_stereo.so.%{abiver}* %{_libdir}/libopencv_stereo.so.%{abiver}*
%{_libdir}/libopencv_structured_light.so.%{abiver}* %{_libdir}/libopencv_structured_light.so.%{abiver}*
@ -445,6 +448,9 @@ popd
* Fri Sep 13 2019 Nicolas Chauvet <kwizart@gmail.com> - 4.1.1-1 * Fri Sep 13 2019 Nicolas Chauvet <kwizart@gmail.com> - 4.1.1-1
- Update to 4.1.1 - Update to 4.1.1
* Fri Sep 13 2019 Sérgio Basto <sergio@serjux.com> - 4.1.0-1
- Update opencv to 4.1.0
* Fri Sep 13 2019 Sérgio Basto <sergio@serjux.com> - 3.4.6-9 * Fri Sep 13 2019 Sérgio Basto <sergio@serjux.com> - 3.4.6-9
- Reenable pylint and vtk, they are working now. - Reenable pylint and vtk, they are working now.