From 4074e8369276dab9f7b2a96bd81e98fb981c4f5a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 4 Jul 2023 13:45:09 +0000
Subject: [PATCH] extra/opencv to 4.7.0-13

---
 extra/opencv/PKGBUILD          |  6 +++++-
 extra/opencv/protobuf-23.patch | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 extra/opencv/protobuf-23.patch

diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 443fe61e6..3cbadc13b 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -9,7 +9,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples python-opencv)
 pkgver=4.7.0
-pkgrel=12
+pkgrel=13
 pkgdesc='Open Source Computer Vision Library'
 arch=(x86_64)
 license=(BSD)
@@ -27,15 +27,18 @@ optdepends=('opencv-samples: samples'
 source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
         https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
         https://github.com/opencv/opencv/commit/82616eec.patch
+        protobuf-23.patch
         vtk9.patch)
 sha256sums=('8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973'
             '42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584'
             'a71e8ffad606d518a846296a06e59beac38887b30021a72b08321aeffd43a75d'
+            '572f7b774678e2fc46b524ce72d4b0ddf175b2a576c6dcfd013d16165ba39863'
             'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
 
 prepare() {
   patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends
   patch -d $pkgname-$pkgver -p1 < 82616eec.patch # https://github.com/opencv/opencv/issues/23323
+  patch -d $pkgname-$pkgver -p1 < protobuf-23.patch # Fix build with protobuf 23
 }
 
 build() {
@@ -44,6 +47,7 @@ build() {
   _opts="-DWITH_OPENCL=ON \
          -DWITH_OPENGL=ON \
          -DOpenGL_GL_PREFERENCE=LEGACY \
+         -DCMAKE_CXX_STANDARD=17 \
          -DWITH_TBB=ON \
          -DWITH_VULKAN=ON \
          -DWITH_QT=ON \
diff --git a/extra/opencv/protobuf-23.patch b/extra/opencv/protobuf-23.patch
new file mode 100644
index 000000000..6bd266800
--- /dev/null
+++ b/extra/opencv/protobuf-23.patch
@@ -0,0 +1,12 @@
+diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake
+index 8835347d1d..473f5fd850 100644
+--- a/cmake/OpenCVFindProtobuf.cmake
++++ b/cmake/OpenCVFindProtobuf.cmake
+@@ -31,6 +31,7 @@ if(BUILD_PROTOBUF)
+   set(HAVE_PROTOBUF TRUE)
+ else()
+   unset(Protobuf_VERSION CACHE)
++  find_package(Protobuf CONFIG QUIET)
+   find_package(Protobuf QUIET)
+ 
+   # Backwards compatibility