From 1c95ab4489d4e8fa2ed6c1fd5b990ac166c84534 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Sat, 21 Sep 2019 16:36:40 +0100 Subject: [PATCH 1/4] Rebuild for gdcm 2.8.9 --- opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencv.spec b/opencv.spec index a09153a..04f19ff 100644 --- a/opencv.spec +++ b/opencv.spec @@ -59,7 +59,7 @@ Name: opencv Version: 3.4.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. License: BSD @@ -429,6 +429,9 @@ popd %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Sat Sep 21 2019 Ankur Sinha - 3.4.6-7 +- Rebuild for GDCM 2.8.9 + * Thu Jul 25 2019 Fedora Release Engineering - 3.4.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From af169b1f8d4ab36afe035b1244c0ad1d5a498cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 23 Nov 2019 03:26:09 +0000 Subject: [PATCH 2/4] Update to 3.4.8 --- .gitignore | 2 ++ opencv-clean.sh | 2 +- opencv.spec | 11 +++++++---- sources | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 34d8e24..8f8f0d3 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ OpenCV-2.1.0.tar.bz2 /opencv-clean-3.4.6.tar.gz /opencv_contrib-3.4.6.tar.gz /opencv_contrib-clean-3.4.6.tar.gz +/opencv-clean-3.4.8.tar.gz +/opencv_contrib-clean-3.4.8.tar.gz diff --git a/opencv-clean.sh b/opencv-clean.sh index 9e88d46..021c169 100755 --- a/opencv-clean.sh +++ b/opencv-clean.sh @@ -1,4 +1,4 @@ -export VERSION=3.4.6 +export VERSION=3.4.8 wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz tar xf opencv-${VERSION}.tar.gz diff --git a/opencv.spec b/opencv.spec index 04f19ff..65f6696 100644 --- a/opencv.spec +++ b/opencv.spec @@ -49,7 +49,6 @@ %global srcname opencv %global abiver 3.4 -%global javaver 346 # Required because opencv-core has lot of spurious dependencies # (despite supposed to be "-core") @@ -58,8 +57,9 @@ %global optflags %(echo %{optflags} -Wl,--as-needed ) Name: opencv -Version: 3.4.6 -Release: 7%{?dist} +Version: 3.4.8 +%global javaver %(foo=%{version}; echo ${foo//./}) +Release: 1%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. License: BSD @@ -386,7 +386,7 @@ popd %files -n python3-opencv %{_bindir}/setup_vars_opencv3.sh -%{python3_sitearch}/cv2.cpython-3*.so +%{python3_sitelib}/cv2.cpython-3*.so %if %{with java} %files java @@ -429,6 +429,9 @@ popd %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Fri Nov 22 2019 Sérgio Basto - 3.4.8-1 +- Update to 3.4.8 + * Sat Sep 21 2019 Ankur Sinha - 3.4.6-7 - Rebuild for GDCM 2.8.9 diff --git a/sources b/sources index cbf6216..be77b10 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opencv-clean-3.4.6.tar.gz) = df7f2ee5ab83c047e5caa8cb12f6cbd8e7c13e554fe4183c43fc4d59e6b42e7a6e8caf71de587c95e36ec720105b4e5c166f3e376bb7ad446bd1b94bc0a84192 -SHA512 (opencv_contrib-clean-3.4.6.tar.gz) = 261628e0ce607e9ff37d49dffb0378dd50b81b216c1223cb43489441131c522567b09c022dddcc99712268b77449a00b5f03ceceb4c104c4a111e7b246613ff6 +SHA512 (opencv-clean-3.4.8.tar.gz) = 4e1c5c1239addebc4a0676322fdb180d671166aaf14194cdfec05478e9bb44c490107977c3f38d268ba96971aeb4e43562827a050f52278e36c9b63367eb9525 +SHA512 (opencv_contrib-clean-3.4.8.tar.gz) = ec7135a0ef2a5d5e84efc1189e08462a980b95bb7f001b039b92d19d99a77cf73d1f840db73484ce999c3b7a6c54f826f93e31db42d29c1df76d282214841558 From 4ea0997c23cdf2f6b8eb8d65893c64a1022c6ccb Mon Sep 17 00:00:00 2001 From: kwizart Date: Thu, 19 Dec 2019 09:14:20 +0100 Subject: [PATCH 3/4] Drop libmfx from i686 - rhbz#1785079 --- opencv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencv.spec b/opencv.spec index 65f6696..f202959 100644 --- a/opencv.spec +++ b/opencv.spec @@ -38,7 +38,7 @@ %bcond_with vtk %endif -%ifarch %{ix86} x86_64 +%ifarch x86_64 %bcond_without libmfx %else %bcond_with libmfx From a89ebcb9be1bdfb20571c24bed0d88e5977ad845 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 5 Jun 2020 16:04:58 +0200 Subject: [PATCH 4/4] Update to 3.4.10 --- .gitignore | 39 ++------------------------------------- opencv-clean.sh | 2 +- opencv.spec | 5 ++++- sources | 4 ++-- 4 files changed, 9 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 8f8f0d3..d0438e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,2 @@ -OpenCV-2.1.0.tar.bz2 -/OpenCV-2.2.0.tar.bz2 -/OpenCV-2.3.1.tar.bz2 -/OpenCV-2.3.1a.tar.bz2 -/OpenCV-2.4.1.tar.bz2 -/OpenCV-2.4.2.tar.bz2 -/OpenCV-2.4.3.tar.bz2 -/OpenCV-2.4.4-beta.tar.bz2 -/OpenCV-2.4.4a.tar.bz2 -/OpenCV-2.4.4a-clean.tar.bz2 -/opencv-2.4.5-clean.tar.xz -/opencv-clean-2.4.6.1.tar.xz -/opencv-clean-2.4.7.tar.xz -/opencv-clean-2.4.9.tar.xz -/opencv-clean-2.4.11.tar.xz -/opencv-clean-2.4.12.3.tar.xz -/opencv_contrib-3.1.0.tar.gz -/opencv-3.1.0.tar.gz -/opencv_contrib-clean-3.1.0.tar.gz -/opencv-clean-3.2.0.tar.gz -/opencv-3.2.0.tar.gz -/opencv_contrib-clean-3.2.0.tar.gz -/opencv_contrib-clean-3.3.1.tar.gz -/opencv-clean-3.3.1.tar.gz -/opencv_contrib-clean-3.4.1.tar.gz -/opencv-clean-3.4.1.tar.gz -/opencv_contrib-clean-3.4.2.tar.gz -/opencv-clean-3.4.2.tar.gz -/opencv_contrib-clean-3.4.3.tar.gz -/opencv-clean-3.4.3.tar.gz -/opencv-clean-3.4.4.tar.gz -/opencv_contrib-clean-3.4.4.tar.gz -/opencv-clean-3.4.6.tar.gz -/opencv_contrib-3.4.6.tar.gz -/opencv_contrib-clean-3.4.6.tar.gz -/opencv-clean-3.4.8.tar.gz -/opencv_contrib-clean-3.4.8.tar.gz +OpenCV-*.tar.bz2 +opencv*.tar.gz diff --git a/opencv-clean.sh b/opencv-clean.sh index 021c169..57b1dad 100755 --- a/opencv-clean.sh +++ b/opencv-clean.sh @@ -1,4 +1,4 @@ -export VERSION=3.4.8 +export VERSION=3.4.10 wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz tar xf opencv-${VERSION}.tar.gz diff --git a/opencv.spec b/opencv.spec index f202959..8fab7a4 100644 --- a/opencv.spec +++ b/opencv.spec @@ -57,7 +57,7 @@ %global optflags %(echo %{optflags} -Wl,--as-needed ) Name: opencv -Version: 3.4.8 +Version: 3.4.10 %global javaver %(foo=%{version}; echo ${foo//./}) Release: 1%{?dist} Summary: Collection of algorithms for computer vision @@ -429,6 +429,9 @@ popd %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Fri Jun 05 2020 Nicolas Chauvet - 3.4.10-1 +- Update to 3.4.10 + * Fri Nov 22 2019 Sérgio Basto - 3.4.8-1 - Update to 3.4.8 diff --git a/sources b/sources index be77b10..cee3684 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opencv-clean-3.4.8.tar.gz) = 4e1c5c1239addebc4a0676322fdb180d671166aaf14194cdfec05478e9bb44c490107977c3f38d268ba96971aeb4e43562827a050f52278e36c9b63367eb9525 -SHA512 (opencv_contrib-clean-3.4.8.tar.gz) = ec7135a0ef2a5d5e84efc1189e08462a980b95bb7f001b039b92d19d99a77cf73d1f840db73484ce999c3b7a6c54f826f93e31db42d29c1df76d282214841558 +SHA512 (opencv-clean-3.4.10.tar.gz) = bffcb9c31084cc30799358003ac3add26ffc46b1894499129851464afcdbbf02715fdadeea40c51d3d889942d6071afbb1f5a66b6e38fd89500adbe6b173a0b8 +SHA512 (opencv_contrib-clean-3.4.10.tar.gz) = 203bc336ecab0cd3c6a6feb88571413498f461e63e136ebe88fe8df733daace63ca5e6362f8e7a8eaa525626a7a1a69b9b49850791f69d8bff88759e13f447d0