From 0ec6aabcf6a0d5d8aeea4faad285228a770ad9d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Tue, 4 Oct 2022 16:50:17 +0100
Subject: [PATCH] rebuild vtk dependent packages

---
 mingw-w64-opencascade/PKGBUILD           |  2 +-
 mingw-w64-opencv/0021-requires-vtk.patch | 11 +++++++++++
 mingw-w64-opencv/PKGBUILD                | 12 +++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 mingw-w64-opencv/0021-requires-vtk.patch

diff --git a/mingw-w64-opencascade/PKGBUILD b/mingw-w64-opencascade/PKGBUILD
index dd7f392fcf..018ec2eb33 100644
--- a/mingw-w64-opencascade/PKGBUILD
+++ b/mingw-w64-opencascade/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=7.6.2
 _pkgver2=V${pkgver//./_}
-pkgrel=3
+pkgrel=4
 pkgdesc='Open CASCADE Technology, 3D modeling & numerical simulation (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
diff --git a/mingw-w64-opencv/0021-requires-vtk.patch b/mingw-w64-opencv/0021-requires-vtk.patch
new file mode 100644
index 0000000000..bb5ad0d0c1
--- /dev/null
+++ b/mingw-w64-opencv/0021-requires-vtk.patch
@@ -0,0 +1,11 @@
+--- a/cmake/OpenCVDetectVTK.cmake
++++ b/cmake/OpenCVDetectVTK.cmake
+@@ -2,7 +2,7 @@
+   find_package(VTK QUIET NAMES vtk VTK)
+   if(VTK_FOUND)
+     if(NOT (VTK_VERSION VERSION_LESS "9.0.0") AND (VTK_VERSION VERSION_LESS "10.0.0")) # VTK 9.x
+-      find_package(VTK 9 QUIET NAMES vtk COMPONENTS
++      find_package(VTK 9 REQUIRED NAMES vtk COMPONENTS
+               FiltersExtraction
+               FiltersSources
+               FiltersTexture
diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD
index 58b965c4ec..4c565323fc 100644
--- a/mingw-w64-opencv/PKGBUILD
+++ b/mingw-w64-opencv/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=4.6.0
-pkgrel=8
+pkgrel=9
 pkgdesc="Open Source Computer Vision Library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -44,7 +44,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-python-pylint"
              "${MINGW_PACKAGE_PREFIX}-qt5-base"
              "${MINGW_PACKAGE_PREFIX}-tiny-dnn"
-             $([[ "${MSYSTEM}" == "CLANGARM64" ]] || echo "${MINGW_PACKAGE_PREFIX}-vtk")
+             $([[ "${MSYSTEM}" == "CLANGARM64" ]] || echo \
+               "${MINGW_PACKAGE_PREFIX}-vtk" \
+               "${MINGW_PACKAGE_PREFIX}-nlohmann-json" \
+               "${MINGW_PACKAGE_PREFIX}-utf8cpp")
              "${MINGW_PACKAGE_PREFIX}-eigen3"
             )
 optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-base: for the HighGUI module"
@@ -65,6 +68,7 @@ source=("${_realname}-${pkgver}.tar.gz"::https://github.com/opencv/opencv/archiv
         '0019-cmake-fix-directx-detection.patch'
         # https://github.com/opencv/opencv/commit/984e42b0bc7f3c02d7ea257a0f7f409a27b1b8b3
         '0020-videoio-Include-missing-locale-header-for-stdwstring_convert.patch'
+        '0021-requires-vtk.patch'
         '0101-somehow-uint-not-detected.patch'
         '0102-mingw-w64-have-sincos.patch'
         '0104-rgbd-module-missing-include.patch'
@@ -88,6 +92,7 @@ sha256sums=('1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277'
             'cedb7593a377eb9e40c72762e79b2af56415ec410309ae8ff698557fe3f953f5'
             '13ae5cd905f3abfa56bae495e9ec31c532decb53b31ca78c2155d2b216d33dd5'
             '40cb0e7983415bd21bc11229a17c5bfb04195c4faecc8c2f9f6a4a10bf22b1b0'
+            'f572f94eb3e438eb1e0700ee04b9c999cd3216b39ba04321148137cecf6bbcb5'
             '7d2ff25f97c84b59793502786dd64e25c8ca991b0523ffea56b45ce031e80c3f'
             '2001804c5245af1894a308d6521f9cd044fb6dbd713b6e2e45106399a409c14d'
             'c6c92cf39dfe45b8fb41d80ac0de3cd304e8b695420b307fd4320a105d8fe9f4'
@@ -129,7 +134,8 @@ prepare() {
         0016-use-pkgconfig-and-link-pthread.patch \
         0018-aarch64-fp16-mingw.patch \
         0019-cmake-fix-directx-detection.patch \
-        0020-videoio-Include-missing-locale-header-for-stdwstring_convert.patch
+        0020-videoio-Include-missing-locale-header-for-stdwstring_convert.patch \
+        0021-requires-vtk.patch
 
   cd "${srcdir}/${_realname}_contrib-${pkgver}"
   apply_patch_with_msg \