From 551d363545a8e01f83676f5eb7c34ce9bbd39b5f Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 11 Oct 2021 14:45:10 +0200
Subject: [PATCH] Update to 4.5.4

---
 .gitignore            |  1 +
 mingw-opencv.spec     | 15 +++++++++------
 opencv_bigobj.patch   |  8 ++++----
 opencv_unbundle.patch |  6 +++---
 sources               |  3 +--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 49cca4d..8af2f8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /opencv-clean-4.5.2.tar.gz
 /opencv-clean-4.5.3.tar.gz
 /opencv_contrib-clean-4.5.3.tar.gz
+/opencv-clean-4.5.4.tar.gz
diff --git a/mingw-opencv.spec b/mingw-opencv.spec
index b1b4900..1d34c16 100644
--- a/mingw-opencv.spec
+++ b/mingw-opencv.spec
@@ -3,8 +3,8 @@
 %global pkgname opencv
 
 Name:          mingw-%{pkgname}
-Version:       4.5.3
-Release:       2%{?dist}
+Version:       4.5.4
+Release:       1%{?dist}
 Summary:       MinGW Windows OpenCV library
 
 BuildArch:     noarch
@@ -202,9 +202,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd}
 
 %files -n mingw32-%{pkgname}
 %license install_licenses/*
-%{mingw32_bindir}/libopencv_*453.dll
+%{mingw32_bindir}/libopencv_*454.dll
 %{mingw32_includedir}/opencv4/
-%{mingw32_libdir}/libopencv_*453.dll.a
+%{mingw32_libdir}/libopencv_*454.dll.a
 %{mingw32_libdir}/cmake/OpenCV/
 %{mingw32_datadir}/opencv4
 
@@ -217,9 +217,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd}
 
 %files -n mingw64-%{pkgname}
 %license install_licenses/*
-%{mingw64_bindir}/libopencv_*453.dll
+%{mingw64_bindir}/libopencv_*454.dll
 %{mingw64_includedir}/opencv4/
-%{mingw64_libdir}/libopencv_*453.dll.a
+%{mingw64_libdir}/libopencv_*454.dll.a
 %{mingw64_libdir}/cmake/OpenCV/
 %{mingw64_datadir}/opencv4
 
@@ -231,6 +231,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd}
 
 
 %changelog
+* Mon Oct 11 2021 Sandro Mani <manisandro@gmail.com> - 4.5.4-1
+- Update to 4.5.4
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/opencv_bigobj.patch b/opencv_bigobj.patch
index 94b9f8b..bfe3cfa 100644
--- a/opencv_bigobj.patch
+++ b/opencv_bigobj.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference opencv-4.5.3/modules/python/common.cmake opencv-4.5.3-new/modules/python/common.cmake
---- opencv-4.5.3/modules/python/common.cmake	2021-07-05 14:03:22.000000000 +0200
-+++ opencv-4.5.3-new/modules/python/common.cmake	2021-07-20 16:56:09.242233544 +0200
-@@ -19,6 +19,11 @@ if(NOT WIN32 AND NOT APPLE AND NOT OPENC
+diff -rupN --no-dereference opencv-4.5.4/modules/python/common.cmake opencv-4.5.4-new/modules/python/common.cmake
+--- opencv-4.5.4/modules/python/common.cmake	2021-10-09 17:48:26.000000000 +0200
++++ opencv-4.5.4-new/modules/python/common.cmake	2021-10-11 10:51:01.156136860 +0200
+@@ -44,6 +44,11 @@ if(NOT WIN32 AND NOT APPLE AND NOT OPENC
    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--exclude-libs=ALL")
  endif()
  
diff --git a/opencv_unbundle.patch b/opencv_unbundle.patch
index 5c249e2..b2acfbe 100644
--- a/opencv_unbundle.patch
+++ b/opencv_unbundle.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference opencv-4.5.3/CMakeLists.txt opencv-4.5.3-new/CMakeLists.txt
---- opencv-4.5.3/CMakeLists.txt	2021-07-05 14:03:22.000000000 +0200
-+++ opencv-4.5.3-new/CMakeLists.txt	2021-07-20 16:56:08.861239103 +0200
+diff -rupN --no-dereference opencv-4.5.4/CMakeLists.txt opencv-4.5.4-new/CMakeLists.txt
+--- opencv-4.5.4/CMakeLists.txt	2021-10-09 17:48:26.000000000 +0200
++++ opencv-4.5.4-new/CMakeLists.txt	2021-10-11 10:51:00.772127027 +0200
 @@ -211,14 +211,14 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable
  
  # 3rd party libs
diff --git a/sources b/sources
index d749a92..2c43d84 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (opencv-clean-4.5.3.tar.gz) = 504bdfc4d5109b135922631e006e0cd459781a8bf2546147e492a948d6827fada240bed192704645e236b2f004f739a08b68cec6bf2664f2330e68a18c883c0c
-SHA512 (opencv_contrib-clean-4.5.3.tar.gz) = aaa593d686ec6ac87dc3206ec9b1029eff849157a9694346c48a5fe008ab5f06842eec0e313388e3e9f0ddcc39a353e6e013dc408c94a922066d85e6af19cd2b
+SHA512 (opencv-clean-4.5.4.tar.gz) = 8d5ea63684d210abd6c5e74dd1dfe2f9004ce6098428f659feb2efc0c62487617d5dfb5164343131fbe83496201201dc778daf2bf639a61d189e2e716449bc0c