[OpenCV] fix protobuf references (#19770)

* [OpenCV] fix protobuf targets

* [OpenCV] fix port versions

* [OpenCV] fix references

12 files changed, 28 insertions, 26 deletions

diff --git a/ports/opencv4/0001-disable-downloading.patch b/ports/opencv4/0001-disable-downloading.patch
index 41131c6a8..e2c886d45 100644
--- a/ports/opencv4/0001-disable-downloading.patch
+++ b/ports/opencv4/0001-disable-downloading.patch
@@ -1,5 +1,3 @@
-diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
-index 63cf6d3..01e84a5 100644
 --- a/cmake/OpenCVDownload.cmake
 +++ b/cmake/OpenCVDownload.cmake
 @@ -157,6 +157,9 @@ function(ocv_download)
diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch
index b681c066c..a551023c3 100644
--- a/ports/opencv4/0002-install-options.patch
+++ b/ports/opencv4/0002-install-options.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 49abe01..b51bcde 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -616,7 +616,7 @@ endif()
@@ -11,8 +9,6 @@ index 49abe01..b51bcde 100644
    include(cmake/OpenCVDetectPython.cmake)
  endif()
  
-diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
-index 6e56a2e..11034db 100644
 --- a/cmake/OpenCVCompilerOptions.cmake
 +++ b/cmake/OpenCVCompilerOptions.cmake
 @@ -286,7 +286,6 @@ if(MSVC)
@@ -23,8 +19,6 @@ index 6e56a2e..11034db 100644
      set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
      set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
      set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug")
-diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
-index 838852c..04906b3 100644
 --- a/cmake/OpenCVGenConfig.cmake
 +++ b/cmake/OpenCVGenConfig.cmake
 @@ -114,11 +114,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
@@ -50,8 +44,6 @@ index 838852c..04906b3 100644
    if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG)
      ocv_gen_config("${CMAKE_BINARY_DIR}/win-install"
                     "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}"
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 1f0d720..0bb1ff7 100644
 --- a/data/CMakeLists.txt
 +++ b/data/CMakeLists.txt
 @@ -1,8 +1,6 @@
diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch
index 80101a51d..15ce3756b 100644
--- a/ports/opencv4/0003-force-package-requirements.patch
+++ b/ports/opencv4/0003-force-package-requirements.patch
@@ -1,5 +1,3 @@
-diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
-index 23a6ca6..8ea5497 100644
 --- a/cmake/OpenCVFindLibsGrfmt.cmake
 +++ b/cmake/OpenCVFindLibsGrfmt.cmake
 @@ -11,7 +11,7 @@ else()
diff --git a/ports/opencv4/0004-fix-policy-CMP0057.patch b/ports/opencv4/0004-fix-policy-CMP0057.patch
index bc7b21de5..d126d9d96 100644
--- a/ports/opencv4/0004-fix-policy-CMP0057.patch
+++ b/ports/opencv4/0004-fix-policy-CMP0057.patch
@@ -1,5 +1,3 @@
-diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt
-index 534fcf0..a02460c 100644
 --- a/modules/videoio/CMakeLists.txt
 +++ b/modules/videoio/CMakeLists.txt
 @@ -1,3 +1,4 @@
diff --git a/ports/opencv4/0005-fix-eigen.patch b/ports/opencv4/0005-fix-eigen.patch
index ec8f6a489..196542dcd 100644
--- a/ports/opencv4/0005-fix-eigen.patch
+++ b/ports/opencv4/0005-fix-eigen.patch
@@ -1,5 +1,3 @@
-diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
-index 3753084..0aeb31a 100644
 --- a/cmake/OpenCVFindLibsPerf.cmake
 +++ b/cmake/OpenCVFindLibsPerf.cmake
 @@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
diff --git a/ports/opencv4/0006-fix-uwp.patch b/ports/opencv4/0006-fix-uwp.patch
index 025898583..ec315b498 100644
--- a/ports/opencv4/0006-fix-uwp.patch
+++ b/ports/opencv4/0006-fix-uwp.patch
@@ -1,5 +1,3 @@
-diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
-index 7c48aad..0d261b0 100644
 --- a/cmake/OpenCVModule.cmake
 +++ b/cmake/OpenCVModule.cmake
 @@ -1205,7 +1205,7 @@ function(ocv_add_perf_tests)
diff --git a/ports/opencv4/0007-fix-hdf5.patch b/ports/opencv4/0007-fix-hdf5.patch
index de81c79b2..8e7e154ad 100644
--- a/ports/opencv4/0007-fix-hdf5.patch
+++ b/ports/opencv4/0007-fix-hdf5.patch
@@ -1,5 +1,3 @@
-diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt
-index 2a1ae68..e40a192 100644
 --- a/modules/hdf/CMakeLists.txt
 +++ b/modules/hdf/CMakeLists.txt
 @@ -1,25 +1,8 @@
diff --git a/ports/opencv4/0008-devendor-quirc.patch b/ports/opencv4/0008-devendor-quirc.patch
index d5a3f624c..62b02ce0a 100644
--- a/ports/opencv4/0008-devendor-quirc.patch
+++ b/ports/opencv4/0008-devendor-quirc.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b51bcde..15edc92 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -803,7 +803,7 @@ if(WITH_OPENVX)
@@ -11,8 +9,6 @@ index b51bcde..15edc92 100644
    set(HAVE_QUIRC TRUE)
  endif()
  
-diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt
-index 3fa0c5d..f4c0ad6 100644
 --- a/modules/objdetect/CMakeLists.txt
 +++ b/modules/objdetect/CMakeLists.txt
 @@ -2,7 +2,5 @@ set(the_description "Object Detection")
diff --git a/ports/opencv4/0009-fix-protobuf.patch b/ports/opencv4/0009-fix-protobuf.patch
new file mode 100644
index 000000000..38572e309
--- /dev/null
+++ b/ports/opencv4/0009-fix-protobuf.patch
@@ -0,0 +1,26 @@
+--- a/cmake/OpenCVFindProtobuf.cmake
++++ b/cmake/OpenCVFindProtobuf.cmake
+@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF)
+   set(HAVE_PROTOBUF TRUE)
+ else()
+   unset(Protobuf_VERSION CACHE)
+-  find_package(Protobuf QUIET)
++  find_package(Protobuf CONFIG REQUIRED)
+
+   # Backwards compatibility
+   # Define camel case versions of input variables
+@@ -76,6 +76,7 @@ if(HAVE_PROTOBUF)
+   if(NOT BUILD_PROTOBUF)
+     if(TARGET "${Protobuf_LIBRARIES}")
+       get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE)
++      get_target_property(__location_debug "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_DEBUG)
+       if(NOT __location)
+         get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION)
+       endif()
+@@ -87,5 +88,5 @@ if(HAVE_PROTOBUF)
+   endif()
+   list(APPEND CUSTOM_STATUS_protobuf "    Protobuf:"
+     BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})"
+-    ELSE "${__location} (${Protobuf_VERSION})")
++    ELSE "optimized ${__location} debug ${__location_debug} ; version (${Protobuf_VERSION})")
+ endif()
diff --git a/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch b/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch
index 02fbaedd5..0bd3d701b 100644
--- a/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch
+++ b/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch
@@ -1,5 +1,3 @@
-diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt
-index 24f89e6..435deb6 100644
 --- a/modules/imgcodecs/CMakeLists.txt
 +++ b/modules/imgcodecs/CMakeLists.txt
 @@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python)
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
index 72d389d52..e965dd2a0 100644
--- a/ports/opencv4/portfile.cmake
+++ b/ports/opencv4/portfile.cmake
@@ -22,6 +22,7 @@ vcpkg_from_github(
       0005-fix-eigen.patch
       0006-fix-uwp.patch
       0008-devendor-quirc.patch
+      0009-fix-protobuf.patch
       0010-fix-uwp-tiff-imgcodecs.patch
 )
 
diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
index 7edc329f4..dce331bf1 100644
--- a/ports/opencv4/vcpkg.json
+++ b/ports/opencv4/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.5.3",
+  "port-version": 1,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [