commit 2b89712dc10c4cab5ac6a668e076e38942f2d583 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sat Jul 8 21:21:02 2023 +0200
- updated to 4.5.5 (new sonames); updated ade to 0.1.2a to fix gcc13 build failure - moved shape contrib library from -core to base ogre2.patch | 29 -------------- opencv.spec | 126 ++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 71 insertions(+), 84 deletions(-) --- diff --git a/opencv.spec b/opencv.spec index 47e09b3..6d2396f 100644 --- a/opencv.spec +++ b/opencv.spec @@ -2,12 +2,8 @@ # - contrib subpackage(s) # - contrib BRs: # opencv_contrib-3.1.0/modules/cnn_3dobj/CMakeLists.txt:find_package(Caffe) -# opencv_contrib-3.1.0/modules/cnn_3dobj/CMakeLists.txt:find_package(Protobuf) -# opencv_contrib-3.1.0/modules/cnn_3dobj/CMakeLists.txt:find_package(Glog) -# 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) +# unpackaged (4.5.5) #/usr/share/OpenCV/3rdparty/usr/lib64/libcorrespondence.a #/usr/share/OpenCV/3rdparty/usr/lib64/libmultiview.a #/usr/share/OpenCV/3rdparty/usr/lib64/libnumeric.a @@ -59,8 +55,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: 4.5.1 -Release: 13.1 +Version: 4.5.5 +Release: 1 Epoch: 1 %if %{with unicap} || %{with xine} License: GPL (enforced by used libraries), BSD (opencv itself) @@ -69,9 +65,9 @@ License: BSD %endif Group: Libraries Source0: https://github.com/Itseez/opencv/archive/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 2205d3169238ec1f184438a96de68513 +# Source0-md5: a9782f01883fcf51451a183d05bda33d Source1: https://github.com/Itseez/opencv_contrib/archive/%{version}/%{name}_contrib-%{version}.tar.gz -# Source1-md5: 19a31bf7271978ab426112dbf5d1b83f +# Source1-md5: 073793e8085ec2490b3386e04ee20fbc # 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 @@ -99,15 +95,15 @@ Source23: https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12 # 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 -# See opencv-4.5.1/modules/gapi/CMakeLists.txt -Source40: https://github.com/opencv/ade/archive/v0.1.1f/v0.1.1f.zip -# Source40-md5: b624b995ec9c439cbc2e9e6ee940d3a2 +# See opencv-4.5.1/modules/gapi/cmake/DownloadADE.cmake +Source40: https://github.com/opencv/ade/archive/v0.1.2a/ade-0.1.2a.zip +# Source40-md5: fa4b3e25167319cb0fa9432ef8281945 Patch0: %{name}-ximea.patch Patch1: python-install.patch Patch2: pkgconfig-paths.patch Patch3: no-cxx-in-c-header.patch Patch4: gcc11.patch -Patch5: ogre2.patch +Patch5: %{name}-ade.patch URL: http://www.opencv.org/ %{?with_pvapi:BuildRequires: AVT_GigE_SDK-devel} %{?with_opencl:BuildRequires: OpenCL-devel} @@ -124,7 +120,7 @@ BuildRequires: libglvnd-libGL-devel BuildRequires: boost-devel %{?with_opencl_amdblas:BuildRequires: clAmdBlas-devel} %{?with_opencl_amdfft:BuildRequires: clAmdFft-devel} -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 3.5.1 BuildRequires: doxygen BuildRequires: eigen3 >= 3 %{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.7} @@ -159,8 +155,8 @@ BuildRequires: ogre-devel BuildRequires: pkgconfig BuildRequires: hdf5-devel BuildRequires: protobuf-devel -BuildRequires: python >= 2.0 -BuildRequires: python-devel >= 2.0 +BuildRequires: python >= 1:2.7 +BuildRequires: python-devel >= 1:2.7 BuildRequires: python-numpy-devel BuildRequires: python3 >= 1:3.2 BuildRequires: python3-devel >= 1:3.2 @@ -172,6 +168,7 @@ BuildRequires: sed >= 4.0 BuildRequires: sphinx-pdg BuildRequires: swig-python %{?with_tbb:BuildRequires: tbb-devel} +BuildRequires: tesseract-devel %if %{with vtk} BuildRequires: vtk-devel >= 5.8.0 BuildRequires: vtk-java >= 5.8.0 @@ -179,7 +176,7 @@ BuildRequires: vtk-python3-devel >= 5.8.0 %endif %{?with_xine:BuildRequires: xine-lib-devel} BuildRequires: xorg-lib-libX11-devel -BuildRequires: zlib-devel +BuildRequires: zlib-devel >= 1.2.3 %if %{with qt} BuildRequires: QtCore-devel >= 4 BuildRequires: QtGui-devel >= 4 @@ -193,7 +190,7 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define jver %(echo %{version} | cut -d. -f1-3 | tr -d .) -%define sover %(echo %{version} | cut -d. -f1-2) +%define sover 405 %description OpenCV (Open Source Computer Vision) is a library of programming @@ -287,12 +284,16 @@ Dokumentacja do OpenCV. %package examples Summary: OpenCV code examples +Summary(pl.UTF-8): Przykłady kodu OpenCV Group: Documentation BuildArch: noarch %description examples OpenCV code examples. +%description examples -l pl.UTF-8 +Przykłady kodu OpenCV. + %package -n java-opencv Summary: OpenCV Java bindings Summary(pl.UTF-8): Wiązania Javy do OpenCV @@ -311,7 +312,7 @@ Summary: OpenCV Python 2 bindings Summary(pl.UTF-8): Wiązania Pythona 2 do OpenCV Group: Libraries/Python Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: python-libs +Requires: python-libs >= 1:2.7 %description -n python-opencv OpenCV Python 2 bindings. @@ -342,6 +343,7 @@ Wiązania Pythona 3 do OpenCV. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cache_file() { f="$1" @@ -361,7 +363,6 @@ cache_file %{SOURCE30} data cache_file %{SOURCE40} ade cd opencv_contrib-%{version} -%patch5 -p1 # both files use Glog_FOUND variable, but set different variables for LIBS; unify them so they won't disturb each other cp -f modules/sfm/cmake/FindGlog.cmake modules/cnn_3dobj/FindGlog.cmake @@ -382,6 +383,8 @@ if [[ "%{__cc}" = *ccache* ]]; then " fi +# WITH_GTK_2_X=ON: force gtk+2 instead of gtk+3 +# (as of 4.5.5, OpenGL is not supported with gtk+3, leading to highgui linking errors) %cmake .. \ $ccache \ -DOpenGL_GL_PREFERENCE=GLVND \ @@ -403,6 +406,7 @@ fi %endif %{?with_ffmpeg:-DWITH_FFMPEG=ON} \ %{!?with_gstreamer:-DWITH_GSTREAMER=OFF} \ + -DWITH_GTK_2_X=ON \ %{?with_opencl:-DWITH_OPENCL=ON} \ %{!?with_opencl_amdblas:-DWITH_OPENCLAMDBLAS=OFF} \ %{!?with_opencl_amdfft:-DWITH_OPENCLAMDFFT=OFF} \ @@ -467,16 +471,19 @@ rm -rf $RPM_BUILD_ROOT %files %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_model_diagnostics %attr(755,root,root) %{_bindir}/opencv_version %attr(755,root,root) %{_bindir}/opencv_visualisation %attr(755,root,root) %{_bindir}/setup_vars_opencv4.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_dnn.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopencv_dnn.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_features2d.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_features2d.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_gapi.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopencv_gapi.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_highgui.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_highgui.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_objdetect.so.*.*.* @@ -489,8 +496,12 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %ghost %{_libdir}/libopencv_videostab.so.%{sover} # contrib modules %attr(755,root,root) %{_bindir}/opencv_waldboost_detector +%attr(755,root,root) %ghost %{_libdir}/libopencv_alphamat.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_alphamat.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_aruco.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_aruco.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopencv_barcode.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_barcode.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_bgsegm.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_bgsegm.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_bioinspired.so.%{sover} @@ -499,10 +510,10 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libopencv_ccalib.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_datasets.so.%{sover} %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_dnn_superres.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_dnn_superres.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} @@ -517,8 +528,12 @@ rm -rf $RPM_BUILD_ROOT %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_intensity_transform.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_intensity_transform.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_mcc.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_mcc.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} @@ -527,12 +542,18 @@ rm -rf $RPM_BUILD_ROOT %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_quality.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_quality.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopencv_rapid.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_rapid.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_reg.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_reg.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_rgbd.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_rgbd.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_saliency.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_saliency.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopencv_shape.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_shape.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_sfm.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_sfm.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_stereo.so.%{sover} @@ -545,6 +566,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libopencv_text.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_tracking.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_tracking.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopencv_wechat_qrcode.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_wechat_qrcode.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_xfeatures2d.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_xfeatures2d.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_ximgproc.so.%{sover} @@ -553,20 +576,6 @@ 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.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopencv_alphamat.so.%{sover} -%attr(755,root,root) %{_libdir}/libopencv_alphamat.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopencv_dnn_superres.so.%{sover} -%attr(755,root,root) %{_libdir}/libopencv_dnn_superres.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopencv_gapi.so.%{sover} -%attr(755,root,root) %{_libdir}/libopencv_gapi.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopencv_intensity_transform.so.%{sover} -%attr(755,root,root) %{_libdir}/libopencv_intensity_transform.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopencv_mcc.so.%{sover} -%attr(755,root,root) %{_libdir}/libopencv_mcc.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopencv_quality.so.%{sover} -%attr(755,root,root) %{_libdir}/libopencv_quality.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopencv_rapid.so.%{sover} -%attr(755,root,root) %{_libdir}/libopencv_rapid.so.*.*.* %dir %{_datadir}/opencv4 %{_datadir}/opencv4/haarcascades @@ -579,6 +588,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %ghost %{_libdir}/libopencv_core.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_flann.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_flann.so.%{sover} +%attr(755,root,root) %{_libdir}/libopencv_imgcodecs.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopencv_imgcodecs.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_imgproc.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_imgproc.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_ml.so.*.*.* @@ -587,10 +598,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %ghost %{_libdir}/libopencv_photo.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_video.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_video.so.%{sover} -%attr(755,root,root) %{_libdir}/libopencv_imgcodecs.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopencv_imgcodecs.so.%{sover} -%attr(755,root,root) %{_libdir}/libopencv_shape.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopencv_shape.so.%{sover} %attr(755,root,root) %{_libdir}/libopencv_videoio.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libopencv_videoio.so.%{sover} @@ -605,30 +612,31 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) # core %{_libdir}/libopencv_core.so +%{_libdir}/libopencv_dnn.so %{_libdir}/libopencv_flann.so +%{_libdir}/libopencv_imgcodecs.so %{_libdir}/libopencv_imgproc.so %{_libdir}/libopencv_ml.so %{_libdir}/libopencv_photo.so %{_libdir}/libopencv_video.so +%{_libdir}/libopencv_videoio.so # GUI/extensions (base package) %{_libdir}/libopencv_calib3d.so %{_libdir}/libopencv_features2d.so +%{_libdir}/libopencv_gapi.so %{_libdir}/libopencv_highgui.so %{_libdir}/libopencv_objdetect.so %{_libdir}/libopencv_stitching.so -%{_libdir}/libopencv_superres.so -%{_libdir}/libopencv_videostab.so -%{_libdir}/libopencv_imgcodecs.so -%{_libdir}/libopencv_shape.so -%{_libdir}/libopencv_videoio.so # contrib +%{_libdir}/libopencv_alphamat.so %{_libdir}/libopencv_aruco.so +%{_libdir}/libopencv_barcode.so %{_libdir}/libopencv_bgsegm.so %{_libdir}/libopencv_bioinspired.so %{_libdir}/libopencv_ccalib.so %{_libdir}/libopencv_datasets.so -%{_libdir}/libopencv_dnn.so %{_libdir}/libopencv_dnn_objdetect.so +%{_libdir}/libopencv_dnn_superres.so %{_libdir}/libopencv_dpm.so %{_libdir}/libopencv_face.so %{_libdir}/libopencv_freetype.so @@ -636,31 +644,32 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libopencv_hdf.so %{_libdir}/libopencv_hfs.so %{_libdir}/libopencv_img_hash.so +%{_libdir}/libopencv_intensity_transform.so %{_libdir}/libopencv_line_descriptor.so +%{_libdir}/libopencv_mcc.so %{_libdir}/libopencv_optflow.so %{_libdir}/libopencv_ovis.so %{_libdir}/libopencv_phase_unwrapping.so %{_libdir}/libopencv_plot.so +%{_libdir}/libopencv_quality.so +%{_libdir}/libopencv_rapid.so %{_libdir}/libopencv_reg.so %{_libdir}/libopencv_rgbd.so %{_libdir}/libopencv_saliency.so %{_libdir}/libopencv_sfm.so +%{_libdir}/libopencv_shape.so %{_libdir}/libopencv_stereo.so +%{_libdir}/libopencv_superres.so %{_libdir}/libopencv_structured_light.so %{_libdir}/libopencv_surface_matching.so %{_libdir}/libopencv_text.so %{_libdir}/libopencv_tracking.so +%{_libdir}/libopencv_videostab.so +%{_libdir}/libopencv_wechat_qrcode.so %{_libdir}/libopencv_xfeatures2d.so %{_libdir}/libopencv_ximgproc.so %{_libdir}/libopencv_xobjdetect.so %{_libdir}/libopencv_xphoto.so -%{_libdir}/libopencv_alphamat.so -%{_libdir}/libopencv_dnn_superres.so -%{_libdir}/libopencv_gapi.so -%{_libdir}/libopencv_intensity_transform.so -%{_libdir}/libopencv_mcc.so -%{_libdir}/libopencv_quality.so -%{_libdir}/libopencv_rapid.so # viz %if %{with vtk} %{_libdir}/libopencv_viz.so @@ -695,6 +704,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{py_sitedir}/cv2/python-* %attr(755,root,root) %{py_sitedir}/cv2/python-*/cv2.so %{py_sitedir}/cv2/*.py[co] +%{py_sitedir}/cv2/mat_wrapper +%{py_sitedir}/cv2/misc +%{py_sitedir}/cv2/utils %files -n python3-opencv %defattr(644,root,root,755) @@ -702,3 +714,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{py3_sitedir}/cv2/python-* %attr(755,root,root) %{py3_sitedir}/cv2/python-*/cv2.cpython-*.so %{py3_sitedir}/cv2/*.py +%{py3_sitedir}/cv2/gapi +%{py3_sitedir}/cv2/mat_wrapper +%{py3_sitedir}/cv2/misc +%{py3_sitedir}/cv2/utils diff --git a/ogre2.patch b/ogre2.patch deleted file mode 100644 index c68e9e8..0000000 --- a/ogre2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c7b27f8e77e673aa2cb2b9be69f908c464ab5d91 Mon Sep 17 00:00:00 2001 -From: Pavel Rojtberg <rojtb...@gmail.com> -Date: Mon, 10 May 2021 20:23:46 +0200 -Subject: [PATCH] ovis: allow using OGRE devel - -only compatible versions support CMake CONFIG mode. -Use that to make check more robust. ---- - modules/ovis/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/ovis/CMakeLists.txt b/modules/ovis/CMakeLists.txt -index dc190da980b..912b86a590d 100644 ---- a/modules/ovis/CMakeLists.txt -+++ b/modules/ovis/CMakeLists.txt -@@ -1,11 +1,11 @@ - set(the_description "OGRE 3D Visualiser.") - --find_package(OGRE QUIET) -+find_package(OGRE QUIET CONFIG) - - if(NOT OGRE_FOUND) - message(STATUS "Module opencv_ovis disabled because OGRE3D was not found") - ocv_module_disable(ovis) --elseif(OGRE_VERSION VERSION_LESS 1.11.5 OR OGRE_VERSION VERSION_GREATER 2.0) -+elseif(OGRE_VERSION VERSION_LESS 1.11.5) - message(STATUS "Module opencv_ovis disabled because of incompatible OGRE3D version (${OGRE_VERSION})") - ocv_module_disable(ovis) - else() # we need C++11 for OGRE 1.11 ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/2b89712dc10c4cab5ac6a668e076e38942f2d583 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit