From a7f630433db89546a3920d05fb1a23ff0686c63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Basto?= Date: Fri, 13 Sep 2019 19:41:44 +0200 Subject: [PATCH] Update to 4.1.0 --- opencv.spec | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/opencv.spec b/opencv.spec index 1ae32b1..a0d3605 100644 --- a/opencv.spec +++ b/opencv.spec @@ -309,6 +309,8 @@ popd -DWITH_LIBV4L=ON \ -DWITH_OPENMP=ON \ -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_PC_FILE_NAME=opencv.pc \ %{?with_gdcm: -DWITH_GDCM=ON } \ %{?with_libmfx: -DWITH_MFX=ON } \ %{?with_clp: -DWITH_CLP=ON } \ @@ -357,14 +359,14 @@ popd %files %doc README.md %{_bindir}/opencv_* -%dir %{_datadir}/OpenCV -%{_datadir}/OpenCV/haarcascades -%{_datadir}/OpenCV/lbpcascades -%{_datadir}/OpenCV/valgrind* +%dir %{_datadir}/opencv4 +%{_datadir}/opencv4/haarcascades +%{_datadir}/opencv4/lbpcascades +%{_datadir}/opencv4/valgrind* %files core %license LICENSE -%{_datadir}/licenses/opencv3/ +%{_datadir}/licenses/opencv4/ %{_libdir}/libopencv_core.so.%{abiver}* %{_libdir}/libopencv_cvv.so.%{abiver}* %{_libdir}/libopencv_features2d.so.%{abiver}* @@ -387,18 +389,18 @@ popd %endif %files devel -%{_includedir}/opencv -%{_includedir}/opencv2 +#{_includedir}/opencv +%{_includedir}/opencv4/opencv2 %{_libdir}/lib*.so %{_libdir}/pkgconfig/opencv.pc -%{_libdir}/cmake/OpenCV/*.cmake +%{_libdir}/cmake/opencv4/*.cmake %files doc -%{_datadir}/OpenCV/samples -%{_datadir}/OpenCV/doc +%{_datadir}/opencv4/samples +#{_datadir}/opencv4/doc %files -n python3-opencv -%{_bindir}/setup_vars_opencv3.sh +%{_bindir}/setup_vars_opencv4.sh %{python3_sitearch}/cv2.cpython-3*.so %if %{with java} @@ -431,6 +433,7 @@ popd %{_libdir}/libopencv_plot.so.%{abiver}* %{_libdir}/libopencv_reg.so.%{abiver}* %{_libdir}/libopencv_rgbd.so.%{abiver}* +%{_libdir}/libopencv_quality.so.%{abiver}* %{_libdir}/libopencv_saliency.so.%{abiver}* %{_libdir}/libopencv_stereo.so.%{abiver}* %{_libdir}/libopencv_structured_light.so.%{abiver}* @@ -445,6 +448,9 @@ popd * Fri Sep 13 2019 Nicolas Chauvet - 4.1.1-1 - Update to 4.1.1 +* Fri Sep 13 2019 Sérgio Basto - 4.1.0-1 +- Update opencv to 4.1.0 + * Fri Sep 13 2019 Sérgio Basto - 3.4.6-9 - Reenable pylint and vtk, they are working now.