Restore deprecated headers

This commit is contained in:
Nicolas Chauvet 2019-10-18 14:50:24 +02:00 committed by kwizart
parent 63414db18c
commit 1553529958
2 changed files with 9 additions and 0 deletions

View File

@ -73,6 +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
@ -342,6 +344,10 @@ 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
@ -399,6 +405,8 @@ popd
%endif
%files devel
# Deprecated headers from 3.x
%{_includedir}/opencv
# Symlink for compatibilty with older version
%{_includedir}/opencv2
%dir %{_includedir}/opencv4

View File

@ -1,3 +1,4 @@
SHA512 (opencv-4.x-deprecated-headers.tar.xz) = 224354952f78948d0cefaa8f1e4d760ab17cc3765bd41cb1560865230551cdac69522556d23600f5dec9170a66f7adef0a341710ca2eb05f566eeef124ebacd9
SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307
SHA512 (opencv-clean-4.1.2.tar.gz) = baa1250178e6e2cf96004fc64c2b667eb970f2420109b4c00e80cbed640faa3e21f5d1f78beb50dddd9cbccd028c49796504c7a18f7c412bf090f34511901cdf
SHA512 (opencv_contrib-clean-4.1.2.tar.gz) = 72f7a4c46d44ab19ad3ec8569c1d1b77f41128609ccf3779ff6080be6144e6dd123f3590b37ab577d57631814186f1b0917973b660baaabbb5a7249051240c5a