X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopencv.git;a=blobdiff_plain;f=opencv.spec;h=6d02c99ee3425d6fa7bcf6326c3c8c20ce070682;hp=814c69ad46b1bd1e75b3663763d8e1e3cc6a1217;hb=HEAD;hpb=51573190a841c01f0376324c5137618ff162b406 diff --git a/opencv.spec b/opencv.spec index 814c69a..2135534 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: 3.4.1 -Release: 6 +Version: 4.8.1 +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: a0b7a47899e67b3490ea31edc4f6e8e6 +# Source0-md5: 7e3b6b5046e4e31226bbf4872091201c Source1: https://github.com/Itseez/opencv_contrib/archive/%{version}/%{name}_contrib-%{version}.tar.gz -# Source1-md5: dd0c63f4185ab8a4829d8154ae382266 +# Source1-md5: 16a34bb3c8107e5416e86ef003d5aeb6 # 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,17 +95,30 @@ 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 -Patch0: ix86-pause.patch -Patch1: %{name}-ximea.patch -Patch2: cplusplus.patch -Patch3: cmake-install-path.patch -Patch4: build.patch +# See opencv-4.5.1/modules/gapi/cmake/DownloadADE.cmake +Source40: https://github.com/opencv/ade/archive/v0.1.2a/v0.1.2a.zip +# Source40-md5: fa4b3e25167319cb0fa9432ef8281945 +# See opencv_contrib-4.5.5/modules/wechat_qrcode/CMakeLists.txt +Source50: https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/detect.caffemodel +# Source50-md5: 238e2b2d6f3c18d6c3a30de0c31e23cf +Source51: https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/detect.prototxt +# Source51-md5: 6fb4976b32695f9f5c6305c19f12537d +Source52: https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/sr.caffemodel +# Source52-md5: cbfcd60361a73beb8c583eea7e8e6664 +Source53: https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/sr.prototxt +# Source53-md5: 69db99927a70df953b471daaba03fbef +Patch0: %{name}-ximea.patch +Patch1: python-install.patch +Patch2: pkgconfig-paths.patch URL: http://www.opencv.org/ %{?with_pvapi:BuildRequires: AVT_GigE_SDK-devel} %{?with_opencl:BuildRequires: OpenCL-devel} BuildRequires: OpenEXR-devel %{?with_opengl:BuildRequires: OpenGL-GLU-devel} -%{?with_opengl:BuildRequires: OpenGL-devel} +%if %{with opengl} +BuildRequires: OpenGL-devel +BuildRequires: libglvnd-libGL-devel +%endif # as of OpenCV 2.3.1-2.4.3 there is also check for OpenNI-sensor-PrimeSense, but the result is not used %{?with_openni:BuildRequires: OpenNI-devel} %{?with_ximea:BuildRequires: XIMEA-devel >= 4} @@ -117,7 +126,7 @@ BuildRequires: OpenEXR-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} @@ -130,7 +139,13 @@ BuildRequires: gstreamer-devel >= 1.0 BuildRequires: gstreamer-plugins-base-devel >= 1.0 %endif BuildRequires: jasper-devel -%{?with_java:BuildRequires: jdk} +%if %{with java} +BuildRequires: java-xerces +BuildRequires: jdk +# jawt for installed jdk +BuildRequires: jre-X11 +%endif +BuildRequires: khrplatform-devel BuildRequires: libdc1394-devel >= 2 %{?with_openmp:BuildRequires: libgomp-devel} BuildRequires: libjpeg-devel @@ -144,27 +159,32 @@ BuildRequires: libucil-devel BuildRequires: libunicap-devel %endif BuildRequires: libv4l-devel +BuildRequires: ogre-devel BuildRequires: pkgconfig -BuildRequires: python >= 2.0 -BuildRequires: python-devel >= 2.0 +BuildRequires: hdf5-devel +BuildRequires: protobuf-devel +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 BuildRequires: python3-numpy-devel +BuildRequires: rpm-build >= 4.6 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.606 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 -BuildRequires: vtk-tcl >= 5.8.0 +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 @@ -178,7 +198,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 408 %description OpenCV (Open Source Computer Vision) is a library of programming @@ -242,7 +262,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %if %{with vtk} Requires: %{name}-viz = %{epoch}:%{version}-%{release} %endif -Obsoletes: opencv-static +Obsoletes: opencv-static < 1:2 %description devel Header files for OpenCV library. @@ -256,10 +276,7 @@ Summary(fr.UTF-8): Documentation pour OpenCV Summary(it.UTF-8): Documentazione di OpenCV Summary(pl.UTF-8): Podręcznik dla OpenCV Group: Documentation -# noarch subpackages only when building with rpm5 -%if "%{_rpmversion}" >= "5" BuildArch: noarch -%endif %description doc Documentation for OpenCV. @@ -275,14 +292,16 @@ Dokumentacja do OpenCV. %package examples Summary: OpenCV code examples +Summary(pl.UTF-8): Przykłady kodu OpenCV Group: Documentation -%if "%{_rpmversion}" >= "5" BuildArch: noarch -%endif %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 @@ -301,7 +320,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. @@ -330,17 +349,37 @@ Wiązania Pythona 3 do OpenCV. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 + +cache_file() { + f="$1" + d="$2" + md5="$(md5sum "$f" | awk '{print $1}')" + file="$(basename "$f")" + mkdir -p ".cache/$d" + ln -s --relative "$f" ".cache/$d/$md5-$file" +} +for f in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16}; do + cache_file $f xfeatures2d/boostdesc +done +for f in %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23}; do + cache_file $f xfeatures2d/vgg +done +cache_file %{SOURCE30} data +cache_file %{SOURCE40} ade +for f in %{SOURCE50} %{SOURCE51} %{SOURCE52} %{SOURCE53}; do + cache_file $f wechat_qrcode +done + +cd opencv_contrib-%{version} + +# 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 +%{__sed} -i -e 's/Glog_LIBS/GLOG_LIBRARIES/' modules/cnn_3dobj/CMakeLists.txt %build -install -d build/{share/OpenCV/testdata/cv/face,downloads/xfeatures2d} +mkdir -p build 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 @@ -352,8 +391,11 @@ 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 \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DOPENCV_LIB_INSTALL_PATH=%{_libdir} \ -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%{version}/modules \ @@ -365,12 +407,14 @@ fi -DENABLE_SSE41=%{?with_sse41:ON}%{!?with_sse41:OFF} \ -DENABLE_SSE42=%{?with_sse42:ON}%{!?with_sse42:OFF} \ -DBUILD_NEW_PYTHON_SUPPORT=ON \ + -DOPENCV_GENERATE_PKGCONFIG:BOOL=ON \ %if %{with examples} -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ %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} \ @@ -396,27 +440,27 @@ rm -rf $RPM_BUILD_ROOT %if %{with examples} install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -mv $RPM_BUILD_ROOT%{_datadir}/OpenCV/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +mv $RPM_BUILD_ROOT%{_datadir}/opencv4/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %endif -install -d $RPM_BUILD_ROOT%{_pkgconfigdir} -cp -p build/unix-install/opencv.pc $RPM_BUILD_ROOT%{_pkgconfigdir} - # disable completeness check incompatible with split packaging -%{__sed} -i -e '/^foreach(target .*IMPORT_CHECK_TARGETS/,/^endforeach/d' $RPM_BUILD_ROOT%{_datadir}/OpenCV/OpenCVModules.cmake +%{__sed} -i -e '/^foreach(target .*IMPORT_CHECK_TARGETS/,/^endforeach/d' $RPM_BUILD_ROOT%{_libdir}/cmake/opencv4/OpenCVModules.cmake %py_comp $RPM_BUILD_ROOT%{py_sitedir} %py_ocomp $RPM_BUILD_ROOT%{py_sitedir} %py_postclean +%py3_comp $RPM_BUILD_ROOT%{py3_sitedir} +%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir} + %if %{with java} # move to proper directories, create symlink install -d $RPM_BUILD_ROOT%{_javadir} -%{__mv} $RPM_BUILD_ROOT%{_datadir}/OpenCV/java/libopencv_java*.so $RPM_BUILD_ROOT%{_libdir} -sed -i -e 's#/share/OpenCV/java/libopencv_java%{jver}\.so#/%{_lib}/libopencv_java%{jver}.so#g' \ - $RPM_BUILD_ROOT%{_datadir}/OpenCV/OpenCVModules-pld.cmake -%{__mv} $RPM_BUILD_ROOT%{_datadir}/OpenCV/java/opencv-*.jar $RPM_BUILD_ROOT%{_javadir} -rmdir $RPM_BUILD_ROOT%{_datadir}/OpenCV/java +%{__mv} $RPM_BUILD_ROOT%{_javadir}/opencv4/libopencv_java*.so $RPM_BUILD_ROOT%{_libdir} +sed -i -e 's#/share/java/opencv4/libopencv_java%{jver}\.so#/%{_lib}/libopencv_java%{jver}.so#g' \ + $RPM_BUILD_ROOT%{_libdir}/cmake/opencv4/OpenCVModules-pld.cmake +%{__mv} $RPM_BUILD_ROOT%{_javadir}/opencv4/opencv-*.jar $RPM_BUILD_ROOT%{_javadir} +rmdir $RPM_BUILD_ROOT%{_javadir}/opencv4 ln -sf $(basename $RPM_BUILD_ROOT%{_javadir}/opencv-*.jar) $RPM_BUILD_ROOT%{_javadir}/opencv.jar %endif @@ -438,15 +482,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.*.*.* @@ -459,6 +507,8 @@ 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_bgsegm.so.%{sover} @@ -469,10 +519,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} @@ -487,20 +537,32 @@ 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} %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_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} @@ -513,6 +575,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} @@ -522,9 +586,10 @@ rm -rf $RPM_BUILD_ROOT %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 +%dir %{_datadir}/opencv4 +%{_datadir}/opencv4/haarcascades +%{_datadir}/opencv4/lbpcascades +%{_datadir}/opencv4/quality %files core %defattr(644,root,root,755) @@ -532,6 +597,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.*.*.* @@ -540,10 +607,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} @@ -557,64 +620,72 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) # core -%attr(755,root,root) %{_libdir}/libopencv_core.so -%attr(755,root,root) %{_libdir}/libopencv_flann.so -%attr(755,root,root) %{_libdir}/libopencv_imgproc.so -%attr(755,root,root) %{_libdir}/libopencv_ml.so -%attr(755,root,root) %{_libdir}/libopencv_photo.so -%attr(755,root,root) %{_libdir}/libopencv_video.so +%{_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) -%attr(755,root,root) %{_libdir}/libopencv_calib3d.so -%attr(755,root,root) %{_libdir}/libopencv_features2d.so -%attr(755,root,root) %{_libdir}/libopencv_highgui.so -%attr(755,root,root) %{_libdir}/libopencv_objdetect.so -%attr(755,root,root) %{_libdir}/libopencv_stitching.so -%attr(755,root,root) %{_libdir}/libopencv_superres.so -%attr(755,root,root) %{_libdir}/libopencv_videostab.so -%attr(755,root,root) %{_libdir}/libopencv_imgcodecs.so -%attr(755,root,root) %{_libdir}/libopencv_shape.so -%attr(755,root,root) %{_libdir}/libopencv_videoio.so +%{_libdir}/libopencv_calib3d.so +%{_libdir}/libopencv_features2d.so +%{_libdir}/libopencv_gapi.so +%{_libdir}/libopencv_highgui.so +%{_libdir}/libopencv_objdetect.so +%{_libdir}/libopencv_stitching.so # contrib -%attr(755,root,root) %{_libdir}/libopencv_aruco.so -%attr(755,root,root) %{_libdir}/libopencv_bgsegm.so -%attr(755,root,root) %{_libdir}/libopencv_bioinspired.so -%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 -%attr(755,root,root) %{_libdir}/libopencv_saliency.so -%attr(755,root,root) %{_libdir}/libopencv_sfm.so -%attr(755,root,root) %{_libdir}/libopencv_stereo.so -%attr(755,root,root) %{_libdir}/libopencv_structured_light.so -%attr(755,root,root) %{_libdir}/libopencv_surface_matching.so -%attr(755,root,root) %{_libdir}/libopencv_text.so -%attr(755,root,root) %{_libdir}/libopencv_tracking.so -%attr(755,root,root) %{_libdir}/libopencv_xfeatures2d.so -%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_alphamat.so +%{_libdir}/libopencv_aruco.so +%{_libdir}/libopencv_bgsegm.so +%{_libdir}/libopencv_bioinspired.so +%{_libdir}/libopencv_ccalib.so +%{_libdir}/libopencv_datasets.so +%{_libdir}/libopencv_dnn_objdetect.so +%{_libdir}/libopencv_dnn_superres.so +%{_libdir}/libopencv_dpm.so +%{_libdir}/libopencv_face.so +%{_libdir}/libopencv_freetype.so +%{_libdir}/libopencv_fuzzy.so +%{_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 # viz %if %{with vtk} -%attr(755,root,root) %{_libdir}/libopencv_viz.so +%{_libdir}/libopencv_viz.so %endif -%{_includedir}/opencv -%{_includedir}/opencv2 -%{_datadir}/OpenCV/OpenCV*.cmake -%{_pkgconfigdir}/opencv.pc +%{_includedir}/opencv4 +%dir %{_libdir}/cmake/opencv4 +%{_libdir}/cmake/opencv4/OpenCV*.cmake +%{_pkgconfigdir}/opencv4.pc %files doc %defattr(644,root,root,755) @@ -637,8 +708,22 @@ 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] +%{py_sitedir}/cv2/mat_wrapper +%{py_sitedir}/cv2/misc +%{py_sitedir}/cv2/utils %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 +%{py3_sitedir}/cv2/__pycache__ +%{py3_sitedir}/cv2/gapi +%{py3_sitedir}/cv2/mat_wrapper +%{py3_sitedir}/cv2/misc +%{py3_sitedir}/cv2/utils