diff --git a/opencv-clean.sh b/opencv-clean.sh index 21c4be2..6d34466 100755 --- a/opencv-clean.sh +++ b/opencv-clean.sh @@ -1,29 +1,28 @@ #!/bin/bash -VERSION=4.5.0 +VERSION=4.5.1 + +wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz +wget -c https://github.com/opencv/opencv_contrib/archive/${VERSION}/opencv_contrib-${VERSION}.tar.gz +wget -c https://github.com/opencv/opencv_extra/archive/${VERSION}/opencv_extra-${VERSION}.tar.gz rm -rf opencv-${VERSION}/ -wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz tar xf opencv-${VERSION}.tar.gz -cd opencv-${VERSION}/ -find -iname "*lena*" -exec rm {} ';' -print -find -iname "*lenna*" -exec rm {} ';' -print -rm -r modules/xfeatures2d/ -cd ..; tar zcf opencv-clean-${VERSION}.tar.gz opencv-${VERSION}/ +find opencv-${VERSION}/ -iname "*lena*" -exec rm {} ';' -print +find opencv-${VERSION}/ -iname "*lenna*" -exec rm {} ';' -print +rm -r opencv-${VERSION}/modules/xfeatures2d/ +tar zcf opencv-clean-${VERSION}.tar.gz opencv-${VERSION}/ rm -r opencv-${VERSION}/ rm -rf opencv_contrib-${VERSION}/ -wget -c https://github.com/opencv/opencv_contrib/archive/${VERSION}/opencv_contrib-${VERSION}.tar.gz tar xf opencv_contrib-${VERSION}.tar.gz -cd opencv_contrib-${VERSION}/ -find -iname "*lena*" -exec rm {} ';' -print -find -iname "*lenna*" -exec rm {} ';' -print -rm -r modules/xfeatures2d/ -cd ..; tar zcf opencv_contrib-clean-${VERSION}.tar.gz opencv_contrib-${VERSION}/ +find opencv_contrib-${VERSION}/ -iname "*lena*" -exec rm {} ';' -print +find opencv_contrib-${VERSION}/ -iname "*lenna*" -exec rm {} ';' -print +rm -r opencv_contrib-${VERSION}/modules/xfeatures2d/ +tar zcf opencv_contrib-clean-${VERSION}.tar.gz opencv_contrib-${VERSION}/ rm -r opencv_contrib-${VERSION}/ rm -rf opencv_extra-${VERSION}/ -wget -c https://github.com/opencv/opencv_extra/archive/${VERSION}/opencv_extra-${VERSION}.tar.gz tar xf opencv_extra-${VERSION}.tar.gz find opencv_extra-${VERSION} -iname "*lena*" -exec rm {} ';' -print find opencv_extra-${VERSION} -iname "*lenna*" -exec rm {} ';' -print diff --git a/opencv-gcc11.patch b/opencv-gcc11.patch new file mode 100644 index 0000000..a51a741 --- /dev/null +++ b/opencv-gcc11.patch @@ -0,0 +1,12 @@ +diff --git a/modules/gapi/test/gapi_async_test.cpp b/modules/gapi/test/gapi_async_test.cpp +index 66b8be4..aa0c9c7 100644 +--- a/modules/gapi/test/gapi_async_test.cpp ++++ b/modules/gapi/test/gapi_async_test.cpp +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + namespace opencv_test + { diff --git a/opencv.spec b/opencv.spec index 1135cf5..03673ef 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,5 +1,3 @@ -#global indice a -%undefine _strict_symbol_defs_build %undefine __cmake_in_source_build %bcond_without tests %bcond_with ffmpeg @@ -22,7 +20,11 @@ %bcond_with atlas %bcond_without openblas %bcond_without gdcm +%if 0%{?rhel} >= 8 +%bcond_with vtk +%else %bcond_without vtk +%endif %ifarch x86_64 %bcond_without libmfx @@ -34,18 +36,16 @@ %bcond_without java %bcond_without vulkan -%ifarch ppc64le %define _lto_cflags %{nil} -%endif %global srcname opencv Name: opencv -Version: 4.5.0 +Version: 4.5.1 %global javaver %(foo=%{version}; echo ${foo//./}) %global abiver %(foo=%{version}; echo ${foo:0:3}) -Release: 1%{?dist} +Release: 4%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. License: BSD @@ -64,6 +64,7 @@ Source4: b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip Source5: xorg.conf Patch0: opencv-4.1.0-install_3rdparty_licenses.patch +Patch1: %{name}-gcc11.patch BuildRequires: gcc-c++ BuildRequires: libtool @@ -124,7 +125,6 @@ BuildRequires: python3-beautifulsoup4 #for doc/doxygen/bib2xhtml.pl #BuildRequires: perl-open BuildRequires: gflags-devel -BuildRequires: SFML-devel BuildRequires: libucil-devel BuildRequires: qt5-qtbase-devel BuildRequires: libGL-devel @@ -242,6 +242,7 @@ popd &>/dev/null %endif %patch0 -p1 -b .install_3rdparty_licenses +%patch1 -p1 -b .gcc11 pushd %{name}_contrib-%{version} popd @@ -461,6 +462,27 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Wed Jan 27 2021 Tomas Popela - 4.5.1-4 +- Drop unused BR on SFML and disable VTK support on RHEL 8+ + +* Tue Jan 26 2021 Fedora Release Engineering - 4.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 12 14:20:57 CET 2021 Adrian Reber - 4.5.1-2 +- Rebuilt for protobuf 3.14 + +* Sat Jan 02 2021 Sérgio Basto - 4.5.1-1 +- Update to 4.5.1 + +* Fri Jan 01 2021 Richard Shaw - 4.5.0-4 +- Rebuild for OpenEXR 2.5.3. + +* Sat Dec 5 2020 Jeff Law - 4.5.0-3 +- Fix missing #include for gcc-11 + +* Fri Nov 6 22:47:45 CET 2020 Sandro Mani - 4.5.0-2 +- Rebuild (proj, gdal) + * Thu Oct 15 2020 Sérgio Basto - 4.5.0-1 - Update 4.5.0 diff --git a/sources b/sources index 7fdf782..1a230c9 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (opencv-clean-4.5.0.tar.gz) = 536897f0fddaadb4cf5b23df7703e0826852867fdef0d9b9ee029c2c8df374246b9cb78795d1e8e4ef6da3285e1b6e4c74bea7aee16e974694d1ffa7a1d1d09f -SHA512 (opencv_contrib-clean-4.5.0.tar.gz) = b9b42630847f0fbe083d2a3c8816ca676de668e25194b623973f351ba579a39144c858749087fc723333d41f44b0e0e30dd0ce86353e63ca3e4939fa590e0aea -SHA512 (opencv_extra-clean-4.5.0.tar.gz) = 410693ca3a976ccf146ea04d5efa3a808f89c880b88dfa10dc9e7f1f37f639d4a3629fd5c402f44f2a68b22f6e7986ceb285d18a13af56ca866d49c4c6936180 +SHA512 (opencv-clean-4.5.1.tar.gz) = b93df3e0bc9162b350d6e921a1a21eb351dab6f785b08be2cdd5a5b912565cafbe45d3125dbc66f0b7642ccffe00fb8eb199729e07d1426d4f0956f8c63e8653 +SHA512 (opencv_contrib-clean-4.5.1.tar.gz) = f85e9e1ce08efa1eb31a4286387b77a9cb3466ec278db5db1a30318887fe905165559e56249e6aebaf4e33dee98063a790b230942ddf838df0e57a1535fbbf0b +SHA512 (opencv_extra-clean-4.5.1.tar.gz) = 2c260978c6aacfc699e7e47cd70dc04d819c891f6bc7cc4d554cb0a6ad1bc05917d2d0ec1099c5c7c28c5fdf84531a14726fcd9ae4aff76e720650ddd6a88a21 SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307 SHA512 (b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip) = f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836