|
|
|
|
@ -36,8 +36,7 @@
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with gdcm
|
|
|
|
|
%endif
|
|
|
|
|
# As of 2019-09-12 vtk dependency is broken on Fedora 32
|
|
|
|
|
%if 0%{?fedora} > 29 && 0%{?fedora} < 32
|
|
|
|
|
%if 0%{?fedora} > 29
|
|
|
|
|
%bcond_without vtk
|
|
|
|
|
%else
|
|
|
|
|
#VTK support disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.7.1.1 + Qt4 in <= F29
|
|
|
|
|
@ -65,7 +64,7 @@
|
|
|
|
|
|
|
|
|
|
Name: opencv
|
|
|
|
|
Version: 3.4.6
|
|
|
|
|
Release: 8%{?dist}
|
|
|
|
|
Release: 9%{?dist}
|
|
|
|
|
Summary: Collection of algorithms for computer vision
|
|
|
|
|
# This is normal three clause BSD.
|
|
|
|
|
License: BSD
|
|
|
|
|
@ -114,6 +113,7 @@ BuildRequires: pkgconfig
|
|
|
|
|
BuildRequires: python3-devel
|
|
|
|
|
BuildRequires: python3-flake8
|
|
|
|
|
BuildRequires: python3-numpy
|
|
|
|
|
BuildRequires: pylint
|
|
|
|
|
BuildRequires: swig >= 1.3.24
|
|
|
|
|
%{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9}
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
|
|
|
|
@ -291,7 +291,7 @@ pushd build
|
|
|
|
|
-DINSTALL_PYTHON_EXAMPLES=ON \
|
|
|
|
|
-DPYTHON2_EXECUTABLE=false \
|
|
|
|
|
-DPYTHON3_EXECUTABLE=%{__python3} \
|
|
|
|
|
-DENABLE_PYLINT=OFF \
|
|
|
|
|
-DENABLE_PYLINT=ON \
|
|
|
|
|
-DBUILD_PROTOBUF=OFF \
|
|
|
|
|
-DPROTOBUF_UPDATE_FILES=ON \
|
|
|
|
|
%{?with_opencl: -DOPENCL_INCLUDE_DIR=%{_includedir}/CL } \
|
|
|
|
|
@ -434,6 +434,9 @@ popd
|
|
|
|
|
%{_libdir}/libopencv_xphoto.so.%{abiver}*
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Fri Sep 13 2019 Sérgio Basto <sergio@serjux.com> - 3.4.6-9
|
|
|
|
|
- Reenable pylint and vtk, they are working now.
|
|
|
|
|
|
|
|
|
|
* Wed Sep 11 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.6-8
|
|
|
|
|
- F-32: remove vtk gcdm dependency for now because they have broken dependency
|
|
|
|
|
(bug 1751406)
|
|
|
|
|
|
Sérgio M. Basto
5 years ago