|
|
|
|
@ -49,8 +49,8 @@
|
|
|
|
|
%bcond_without vulkan
|
|
|
|
|
|
|
|
|
|
%global srcname opencv
|
|
|
|
|
%global abiver 4.1
|
|
|
|
|
%global javaver 412
|
|
|
|
|
%global abiver 4.2
|
|
|
|
|
%global javaver 420
|
|
|
|
|
|
|
|
|
|
# Required because opencv-core has lot of spurious dependencies
|
|
|
|
|
# (despite supposed to be "-core")
|
|
|
|
|
@ -59,8 +59,8 @@
|
|
|
|
|
%global optflags %(echo %{optflags} -Wl,--as-needed )
|
|
|
|
|
|
|
|
|
|
Name: opencv
|
|
|
|
|
Version: 4.1.2
|
|
|
|
|
Release: 3%{?dist}
|
|
|
|
|
Version: 4.2.0
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
Summary: Collection of algorithms for computer vision
|
|
|
|
|
# This is normal three clause BSD.
|
|
|
|
|
License: BSD
|
|
|
|
|
@ -73,11 +73,8 @@ URL: https://opencv.org
|
|
|
|
|
Source0: %{name}-clean-%{version}.tar.gz
|
|
|
|
|
Source1: %{name}_contrib-clean-%{version}.tar.gz
|
|
|
|
|
Source3: face_landmark_model.dat.xz
|
|
|
|
|
# Deprecated headers from 3.x adapted for 4.x
|
|
|
|
|
Source4: opencv-4.x-deprecated-headers.tar.xz
|
|
|
|
|
|
|
|
|
|
Patch0: opencv-4.1.0-install_3rdparty_licenses.patch
|
|
|
|
|
Patch1: opencv-4.1.2-includes.patch
|
|
|
|
|
|
|
|
|
|
BuildRequires: gcc-c++
|
|
|
|
|
BuildRequires: libtool
|
|
|
|
|
@ -250,7 +247,6 @@ mkdir 3rdparty/
|
|
|
|
|
mv quirc/ 3rdparty/
|
|
|
|
|
|
|
|
|
|
%patch0 -p1 -b .install_3rdparty_licenses
|
|
|
|
|
%patch1 -p1 -b .inc2
|
|
|
|
|
|
|
|
|
|
pushd %{name}_contrib-%{version}
|
|
|
|
|
popd
|
|
|
|
|
@ -344,10 +340,6 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
|
|
|
|
|
ln -s opencv4/opencv2 %{buildroot}%{_includedir}
|
|
|
|
|
ln -s opencv4 %{buildroot}%{_datadir}/opencv
|
|
|
|
|
|
|
|
|
|
# Deprecated headers from 3.x adapted for 4.x
|
|
|
|
|
mkdir -p %{buildroot}%{_includedir}/opencv
|
|
|
|
|
tar Jxf %{SOURCE4} -C %{buildroot}%{_includedir}/opencv
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
|
# Check fails since we don't support most video
|
|
|
|
|
@ -405,8 +397,6 @@ popd
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files devel
|
|
|
|
|
# Deprecated headers from 3.x
|
|
|
|
|
%{_includedir}/opencv
|
|
|
|
|
# Symlink for compatibilty with older version
|
|
|
|
|
%{_includedir}/opencv2
|
|
|
|
|
%dir %{_includedir}/opencv4
|
|
|
|
|
@ -465,6 +455,9 @@ popd
|
|
|
|
|
%{_libdir}/libopencv_xphoto.so.%{abiver}*
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Tue Dec 31 2019 Nicolas Chauvet <kwizart@gmail.com> - 4.2.0-1
|
|
|
|
|
- Update to 4.2.0
|
|
|
|
|
|
|
|
|
|
* Sat Dec 28 2019 Sandro Mani <manisandro@gmail.com> - 4.1.2-3
|
|
|
|
|
- Rebuild (tesseract)
|
|
|
|
|
|
|
|
|
|
|
kwizart
5 years ago
committed by