From e2122bf4f058b132f55688ec5c72c855d204d263 Mon Sep 17 00:00:00 2001
From: Marcus Hudritsch <marcus.hudritsch@bfh.ch>
Date: Fri, 5 Apr 2024 10:28:04 +0200
Subject: [PATCH] Updated OpenCV for Mac64 to 4.7.0

---
 cmake/DownloadPrebuilts.cmake                        |  4 ++--
 .../build_opencv_w_contrib_for_mac64.sh              | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/cmake/DownloadPrebuilts.cmake b/cmake/DownloadPrebuilts.cmake
index 5c9f80a4..367244d5 100644
--- a/cmake/DownloadPrebuilts.cmake
+++ b/cmake/DownloadPrebuilts.cmake
@@ -540,8 +540,8 @@ elseif ("${SYSTEM_NAME_UPPER}" STREQUAL "DARWIN" AND
     #set(OpenCV_VERSION "3.4.1")
     #set(OpenCV_VERSION "4.1.1")
     #set(OpenCV_VERSION "4.5.0")
-    set(OpenCV_VERSION "4.5.2")
-    #set(OpenCV_VERSION "4.7.0") // does not work with ffmpeg
+    #set(OpenCV_VERSION "4.5.2")
+    set(OpenCV_VERSION "4.7.0")
     set(OpenCV_PREBUILT_DIR "mac64_opencv_${OpenCV_VERSION}")
     set(OpenCV_DIR "${PREBUILT_PATH}/${OpenCV_PREBUILT_DIR}")
     set(OpenCV_INCLUDE_DIR "${OpenCV_DIR}/include")
diff --git a/externals/prebuild_scripts/build_opencv_w_contrib_for_mac64.sh b/externals/prebuild_scripts/build_opencv_w_contrib_for_mac64.sh
index 404bf1ad..8e70ec9f 100755
--- a/externals/prebuild_scripts/build_opencv_w_contrib_for_mac64.sh
+++ b/externals/prebuild_scripts/build_opencv_w_contrib_for_mac64.sh
@@ -73,10 +73,16 @@ cmake \
 -DBUILD_TESTS=OFF \
 -DWITH_MATLAB=OFF \
 -DBUILD_ZLIB=ON \
+-DWITH_PNG=ON \
 -DBUILD_PNG=ON \
 -DBUILD_JPEG=ON \
+-DWITH_JPEG=ON \
 -DBUILD_TIFF=ON \
+-DWITH_WEBP=ON \
 -DBUILD_WEBP=ON \
+-DWITH_FFMPEG=ON \
+-DBUILD_FFMPEG=ON \
+-DWITH_OPENEXR=ON \
 -DBUILD_OPENEXR=ON \
 -DOPENCV_ENABLE_NONFREE=ON \
 -DOPENCV_EXTRA_MODULES_PATH=../../../opencv_contrib/modules \
@@ -109,10 +115,16 @@ cmake \
 -DBUILD_TESTS=OFF \
 -DWITH_MATLAB=OFF \
 -DBUILD_ZLIB=ON \
+-DWITH_PNG=ON \
 -DBUILD_PNG=ON \
 -DBUILD_JPEG=ON \
+-DWITH_JPEG=ON \
 -DBUILD_TIFF=ON \
+-DWITH_WEBP=ON \
 -DBUILD_WEBP=ON \
+-DWITH_FFMPEG=ON \
+-DBUILD_FFMPEG=ON \
+-DWITH_OPENEXR=ON \
 -DBUILD_OPENEXR=ON \
 -DOPENCV_ENABLE_NONFREE=ON \
 -DOPENCV_EXTRA_MODULES_PATH=../../../opencv_contrib/modules \