# TODO:
+# - 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)
+#/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)
# - ipp (libippi): http://software.intel.com/en-us/articles/intel-ipp/ (proprietary)
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
+Version: 3.4.8
Release: 1
Epoch: 1
%if %{with unicap} || %{with xine}
%endif
Group: Libraries
Source0: https://github.com/Itseez/opencv/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 70e1dd07f0aa06606f1bc0e3fa15abd3
-Patch0: %{name}-cflags.patch
-Patch5: %{name}-ximea.patch
-Patch7: java-ant-sourcelevel.patch
-Patch10: cmake-install-path.patch
+# Source0-md5: 5aa8240c28c00a7dacdf51698e0ced77
+Source1: https://github.com/Itseez/opencv_contrib/archive/%{version}/%{name}_contrib-%{version}.tar.gz
+# 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}
%{?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
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
BuildRequires: python >= 2.0
BuildRequires: python-devel >= 2.0
BuildRequires: python-numpy-devel
+BuildRequires: python3 >= 1:3.2
+BuildRequires: python3-devel >= 1:3.2
+BuildRequires: python3-numpy-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.606
BuildRequires: sed >= 4.0
Wiązania Javy do OpenCV.
%package -n python-opencv
-Summary: OpenCV Python bindings
-Summary(pl.UTF-8): Wiązania Pythona do OpenCV
+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
%description -n python-opencv
-OpenCV Python bindings.
+OpenCV Python 2 bindings.
%description -n python-opencv -l pl.UTF-8
-Wiązania Pythona do OpenCV.
+Wiązania Pythona 2 do OpenCV.
+
+%package -n python3-opencv
+Summary: OpenCV Python 3 bindings
+Summary(pl.UTF-8): Wiązania Pythona 3 do OpenCV
+Group: Libraries/Python
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: python3-libs
+
+%description -n python3-opencv
+OpenCV Python 3 bindings.
+
+%description -n python3-opencv -l pl.UTF-8
+Wiązania Pythona 3 do OpenCV.
%prep
-%setup -q
+%setup -q -a1
%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
%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} \
-DENABLE_SSE2=%{?with_sse2:ON}%{!?with_sse2:OFF} \
%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.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libopencv_superres.so.%{sover}
%attr(755,root,root) %{_libdir}/libopencv_videostab.so.*.*.*
%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_aruco.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_aruco.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}
+%attr(755,root,root) %{_libdir}/libopencv_bioinspired.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_ccalib.so.%{sover}
+%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_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}
+%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_sfm.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_sfm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_stereo.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_stereo.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_structured_light.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_structured_light.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_surface_matching.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_surface_matching.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_text.so.%{sover}
+%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_xfeatures2d.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_xfeatures2d.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_ximgproc.so.%{sover}
+%attr(755,root,root) %{_libdir}/libopencv_ximgproc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopencv_xobjdetect.so.%{sover}
+%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
%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_ts.a
+# 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_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
+%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
# viz
%if %{with vtk}
%attr(755,root,root) %{_libdir}/libopencv_viz.so
%files -n python-opencv
%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/cv2.so
-#%{py_sitedir}/cv.py[co]
+%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)
+%dir %{py3_sitedir}/cv2
+%dir %{py3_sitedir}/cv2/python-*
+%attr(755,root,root) %{py3_sitedir}/cv2/python-*/cv2.cpython-*.so
+%{py3_sitedir}/cv2/*.py
projects / packages / opencv.git / blobdiff