From 7a0bd6ebe2660cc6070925cb71226be97200cfa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Sat, 14 Jan 2023 21:04:10 +0000
Subject: [PATCH] Update opencv to 4.7.0 (#2157121)

---
 .gitignore      |  1 +
 opencv-clean.sh |  2 +-
 opencv.spec     | 20 +++++++++++---------
 sources         |  8 ++++----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 093975d..1ade250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ OpenCV*.tar.*
 opencv*.tar.*
 face_landmark_model.dat.xz
 /b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
+/fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip
diff --git a/opencv-clean.sh b/opencv-clean.sh
index d62ee9b..95dc96d 100755
--- a/opencv-clean.sh
+++ b/opencv-clean.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=4.6.0
+VERSION=4.7.0
 
 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
diff --git a/opencv.spec b/opencv.spec
index 0102490..e1bc1f5 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -1,8 +1,9 @@
 %undefine __cmake_in_source_build
+
 %bcond_without  tests
 %bcond_without  extras
 # linters are enabled by default if BUILD_DOCS OR BUILD_EXAMPLES
-%bcond_without  linters
+%bcond_with     linters
 %bcond_with     ffmpeg
 %bcond_without  gstreamer
 %bcond_with     eigen2
@@ -63,13 +64,13 @@
 %endif
 
 Name:           opencv
-Version:        4.6.0
+Version:        4.7.0
 %global javaver %(foo=%{version}; echo ${foo//./})
 %global majorver %(foo=%{version}; a=(${foo//./ }); echo ${a[0]} )
 %global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} )
 %global padding  %(digits=00; num=%{minorver}; echo ${digits:${#num}:${#digits}} )
 %global abiver   %(echo %{majorver}%{padding}%{minorver} )
-Release:        10%{?dist}
+Release:        1%{?dist}
 Summary:        Collection of algorithms for computer vision
 # This is normal three clause BSD.
 License:        BSD
@@ -86,8 +87,9 @@ Source1:        %{name}_contrib-clean-%{version}.tar.gz
 Source2:        %{name}_extra-clean-%{version}.tar.gz
 }
 Source3:        face_landmark_model.dat.xz
-# from https://github.com/opencv/ade/archive/v0.1.1f.zip
-Source4:        b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
+# from https://github.com/opencv/ade/archive/v0.1.2a.zip
+# mv v0.1.2a.zip $(md5sum v0.1.2a.zip | cut -d' ' -f1)-v0.1.2a.zip
+Source4:        fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip
 Source5:        xorg.conf
 
 Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch
@@ -270,7 +272,7 @@ distribution, since the library maintains binary compatibility, and tries
 to provide decent performance and stability.
 
 %prep
-%setup -q -a1 %{?with_extras:-a2}
+%autosetup -p1 -a1 %{?with_extras:-a2}
 %if 1
 # we don't use pre-built contribs except quirc
 pushd 3rdparty
@@ -281,9 +283,6 @@ shopt -u extglob
 popd &>/dev/null
 %endif
 
-%patch0 -p1 -b .install_3rdparty_licenses
-%patch3 -p1 -b .python_install_binary
-
 pushd %{name}_contrib-%{version}
 #patch1 -p1 -b .install_cvv
 popd
@@ -512,6 +511,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 %{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}}
 
 %changelog
+* Fri Jan 13 2023 Sérgio Basto <sergio@serjux.com> - 4.7.0-1
+- Update opencv to 4.7.0 (#2157121)
+
 * Fri Dec 23 2022 Sandro Mani <manisandro@gmail.com> - 4.6.0-10
 - Rebuild (tesseract)
 
diff --git a/sources b/sources
index 22c9213..867fa73 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (opencv-clean-4.6.0.tar.gz) = 73815df0df4b93b3df19d66e0957a781de25c78ee51d0f026129df9302d45b114bf3cd249ed13121c160df7b4c01b9e348fe2ba75949d3e25fe6f6168d2b0576
-SHA512 (opencv_contrib-clean-4.6.0.tar.gz) = 8f4a6569671eb161beac6c9bc52f51b3a9e1ac257478477d5238ddcac959612055ab8554a5815f5b55fe8405a34885e63c1c9995468e5641b9d47d1120ef0113
-SHA512 (opencv_extra-clean-4.6.0.tar.gz) = 2b576a2ed87e1a41fddb351bbc66fa23397aa6952866aec3d172976d261f035dc0c1f3e7c66e85e0684bb050862c368fe7fdc34804a9c6171cf1b2a96b621a33
+SHA512 (opencv-clean-4.7.0.tar.gz) = 75d33e006f5a00d6eda67076b368bbf7afa7cc2c31b843040f2df54246a978f055c12902ce7a8095cf0ce493a9ebedcbfb12b1e772ed688ef49bc8cb4ce9e57e
+SHA512 (opencv_contrib-clean-4.7.0.tar.gz) = 5eb985d258afa17e50426e19a0172b14036082e7e3b93e05de43734af470edf45db3fabb0eb7a440aa95e9c87f9e94ef4bec19f629f2048ff08a75a01e787608
+SHA512 (opencv_extra-clean-4.7.0.tar.gz) = a2ac18661b7709269b5efc6405080c2df4195b6a0d9e6fa011789f7217fbde90b4c832bafa243e2c6cccfd8fa06fe976e33b7f3f56fd40ab40cbf360c18dbbe1
 SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307
-SHA512 (b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip) = f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836
+SHA512 (fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip) = ce5af0bd5d7fb04022f92fed130898959aecb954cc09da2fc923c76b37ee92d2233888592a4c6bca8006ac4d3fda9c6da80f316c924a407a7a5961d9832a681c