From 17d4b123bad941365e4e3c7821024d41c93d8ea1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 28 May 2020 17:11:38 +0200 Subject: [PATCH] Update to 4.3.0 --- opencv-clean.sh | 2 +- opencv.spec | 18 ++++++++++-------- sources | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/opencv-clean.sh b/opencv-clean.sh index 089b3a1..e2c3564 100755 --- a/opencv-clean.sh +++ b/opencv-clean.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=4.2.0 +VERSION=4.3.0 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 64d46ea..620b26e 100644 --- a/opencv.spec +++ b/opencv.spec @@ -49,8 +49,8 @@ %bcond_without vulkan %global srcname opencv -%global abiver 4.2 -%global javaver 420 +%global abiver 4.3 +%global javaver 430 # 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.2.0 -Release: 9%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. License: BSD @@ -76,8 +76,6 @@ Source3: face_landmark_model.dat.xz Source4: b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip Patch0: opencv-4.1.0-install_3rdparty_licenses.patch -Patch1: https://github.com/opencv/opencv/commit/fb3a334bbee3535d508af6510d9903d26ba37d34.patch -Patch2: https://github.com/opencv/opencv/commit/bd531bd82852808f7fa403e3ee159bd62b1c08cc.patch # Comment out removed vulkan symbols Patch3: opencv_vulkan.patch @@ -254,8 +252,6 @@ popd &>/dev/null %endif %patch0 -p1 -b .install_3rdparty_licenses -%patch1 -p1 -%patch2 -p1 %patch3 -p1 pushd %{name}_contrib-%{version} @@ -389,6 +385,7 @@ popd %files core %license LICENSE %{_datadir}/licenses/opencv4/ +%{_libdir}/libopencv_alphamat.so.%{abiver}* %{_libdir}/libopencv_core.so.%{abiver}* %{_libdir}/libopencv_cvv.so.%{abiver}* %{_libdir}/libopencv_features2d.so.%{abiver}* @@ -398,9 +395,11 @@ popd %{_libdir}/libopencv_highgui.so.%{abiver}* %{_libdir}/libopencv_imgcodecs.so.%{abiver}* %{_libdir}/libopencv_imgproc.so.%{abiver}* +%{_libdir}/libopencv_intensity_transform.so.%{abiver}* %{_libdir}/libopencv_ml.so.%{abiver}* %{_libdir}/libopencv_objdetect.so.%{abiver}* %{_libdir}/libopencv_photo.so.%{abiver}* +%{_libdir}/libopencv_rapid.so.%{abiver}* %{_libdir}/libopencv_shape.so.%{abiver}* %{_libdir}/libopencv_stitching.so.%{abiver}* %{_libdir}/libopencv_superres.so.%{abiver}* @@ -470,6 +469,9 @@ popd %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Tue May 26 2020 Nicolas Chauvet - 4.3.0-1 +- Update to 4.3.0 + * Thu May 28 2020 Charalampos Stratakis - 4.2.0-9 - Remove flake8 build requirement diff --git a/sources b/sources index 2c2c251..e50d2d3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ +SHA512 (opencv-clean-4.3.0.tar.gz) = f582ffc45d1143abf62eac7d6ed416986e6aa0e26d9a4a2cb4d88458e1eecb24ad33570dccd99004998a4899b0a9c05de7dfa405564c0e59bc91a48b7e9d2343 SHA512 (b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip) = f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836 -SHA512 (opencv_contrib-clean-4.2.0.tar.gz) = ef3dfb826817b5e9b1102e7fe834d1b2fe9691c6dc41fe2207dabf6d793310c05fa6263374399315cfda9453d01a1c4b1953c74db52e6f141f3bfc853fb748ad -SHA512 (opencv-clean-4.2.0.tar.gz) = eaf5196ff9db70b50c2146cf9eb61c06a95900413480f32f76d72596e3e606343c93af73956822ccfd81132c879d5d611c8b824f7882041d306d46bbc313a5c9 +SHA512 (opencv_contrib-clean-4.3.0.tar.gz) = bc4f88f3624cf4aed237f8cf36ef62b20f31205e891948797e416faa5e1dd215d1bad85506aa4afacb5c11988a6fc3f81f282fd82fe491f5ffa070f97cc793d5 SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307