From ef19b3e8bb5467a66927940393d160c57c41e380 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Fri, 25 Aug 2023 01:20:15 +0200
Subject: [PATCH] [opencv4] fix feature ovis (#32578)

---
 ports/opencv4/0019-fix-ogre-dependency.patch | 9 +++++++++
 ports/opencv4/portfile.cmake                 | 2 ++
 ports/opencv4/vcpkg.json                     | 2 +-
 versions/baseline.json                       | 2 +-
 versions/o-/opencv4.json                     | 5 +++++
 5 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 ports/opencv4/0019-fix-ogre-dependency.patch

diff --git a/ports/opencv4/0019-fix-ogre-dependency.patch b/ports/opencv4/0019-fix-ogre-dependency.patch
new file mode 100644
index 0000000000..314ea821e7
--- /dev/null
+++ b/ports/opencv4/0019-fix-ogre-dependency.patch
@@ -0,0 +1,9 @@
+--- a/modules/ovis/CMakeLists.txt
++++ b/modules/ovis/CMakeLists.txt
+@@ -27,4 +27,6 @@ ocv_create_module()
+ ocv_add_samples(opencv_aruco)
+ 
+ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter)
++# The target always has the name OgreGLSupport
++string(REPLACE "OgreGLSupportStatic" "OgreGLSupport" OGRE_LIBRARIES "${OGRE_LIBRARIES}")
+ ocv_target_link_libraries(${the_module} ${OGRE_LIBRARIES})
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
index 923c368913..33c7966da9 100644
--- a/ports/opencv4/portfile.cmake
+++ b/ports/opencv4/portfile.cmake
@@ -71,6 +71,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "nonfree"   OPENCV_ENABLE_NONFREE
  "openexr"   WITH_OPENEXR
  "opengl"    WITH_OPENGL
+ "ovis"      CMAKE_REQUIRE_FIND_PACKAGE_OGRE
  "png"       WITH_PNG
  "quirc"     WITH_QUIRC
  "sfm"       BUILD_opencv_sfm
@@ -183,6 +184,7 @@ if("contrib" IN_LIST FEATURES)
       0007-fix-hdf5.patch
       0016-fix-freetype-contrib.patch
       0018-fix-depend-tesseract.patch
+      0019-fix-ogre-dependency.patch
   )
   set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
 
diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
index 5ac8351637..c9b4d3d28c 100644
--- a/ports/opencv4/vcpkg.json
+++ b/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.8.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index b4ca55078b..21573df606 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6018,7 +6018,7 @@
     },
     "opencv4": {
       "baseline": "4.8.0",
-      "port-version": 4
+      "port-version": 5
     },
     "opendnp3": {
       "baseline": "3.1.1",
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index b8907efc56..8d4043e6ff 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6deec5bdb97d4d3a667aa10e31698ce54abdc9a7",
+      "version": "4.8.0",
+      "port-version": 5
+    },
     {
       "git-tree": "0d0ef2f6aa4911ca1cf367093c0b6a89cea97fe3",
       "version": "4.8.0",