[darknet] add compatibility with OpenCV 4 (#6018)

3 files changed, 14 insertions, 36 deletions

diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL
index bc6526318..f291bdd3d 100644
--- a/ports/darknet/CONTROL
+++ b/ports/darknet/CONTROL
@@ -1,5 +1,5 @@
 Source: darknet
-Version: 1.0.0-1
+Version: 1.0.0-2
 Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.
 Build-Depends: pthreads (windows), stb
 Default-Features: weights
@@ -16,5 +16,5 @@ Feature: weights
 Description: Download common weights from official websites, using vcpkg proxy-enabled functions
 
 Feature: opencv-cuda
-Build-Depends: darknet[cuda], opencv[cuda]
+Build-Depends: opencv[cuda]
 Description: Build darknet with support for a CUDA-enabled OpenCV
diff --git a/ports/darknet/fix_cmakelists.patch b/ports/darknet/fix_cmakelists.patch
index 62aa61fa6..b9593d85f 100644
--- a/ports/darknet/fix_cmakelists.patch
+++ b/ports/darknet/fix_cmakelists.patch
@@ -1,18 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6a5076a..52d19a3 100644
+index acd6ca0..0e7de91 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -25,8 +25,7 @@ enable_language(CXX)
+@@ -28,8 +28,7 @@ enable_language(CXX)
  set(CMAKE_CXX_STANDARD 11)
  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH})
  
 -set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Install prefix" FORCE)
 -set(INSTALL_BIN_DIR      "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Path where exe and dll will be installed" FORCE)
-+set(INSTALL_BIN_DIR      "bin"                       CACHE PATH "Path where exe and dll will be installed" FORCE)
++set(INSTALL_BIN_DIR      "bin"                       CACHE PATH "Path where exe and dll will be installed")
  set(INSTALL_LIB_DIR      "lib"                       CACHE PATH "Path where lib will be installed")
  set(INSTALL_INCLUDE_DIR  "include"                   CACHE PATH "Path where headers will be installed")
  set(INSTALL_CMAKE_DIR    "share/darknet"             CACHE PATH "Path where cmake configs will be installed")
-@@ -76,7 +75,6 @@ if(USE_INTEGRATED_LIBS)
+@@ -79,7 +78,6 @@ if(USE_INTEGRATED_LIBS)
    set(PThreads_windows_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/pthreads CACHE PATH "Path where pthreads for windows can be located")
    add_definitions(-D_TIMESPEC_DEFINED)
  endif()
@@ -20,30 +20,3 @@ index 6a5076a..52d19a3 100644
  
  set(CMAKE_DEBUG_POSTFIX d)
  add_definitions(-DUSE_CMAKE_LIBS)
-@@ -323,21 +321,19 @@ endif()
- 
- set_target_properties(darklib PROPERTIES PUBLIC_HEADER "${exported_headers};${CMAKE_CURRENT_LIST_DIR}/include/yolo_v2_class.hpp")
- 
--install(TARGETS darklib uselib darknet EXPORT DarknetTargets
-+install(TARGETS darklib EXPORT DarknetTargets
-   RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-   LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
-   ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-   PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
-   COMPONENT dev
- )
-+install(TARGETS uselib darknet
-+  DESTINATION "${INSTALL_BIN_DIR}"
-+)
- if(OpenCV_VERSION VERSION_GREATER "3.0" AND NOT SKIP_USELIB_TRACK)
-   install(TARGETS uselib_track
--    EXPORT DarknetTargets
--    RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
--    LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
--    ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
--    PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
--    COMPONENT dev
-+    DESTINATION "${INSTALL_BIN_DIR}"
-   )
- endif()
- 
diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake
index 0695a740f..a494d49bf 100644
--- a/ports/darknet/portfile.cmake
+++ b/ports/darknet/portfile.cmake
@@ -11,10 +11,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO AlexeyAB/darknet
-  REF 1cd332e4cac001ffcc12a24c72640fe02b69a8a0
-  SHA512 313018d51747b40244d3a828dce8deb35f900a6be1198f0f1af5647f3889ead7f1ac78cdc4223cfe85d279ca21000df1c8feac02e703e5b91af939e26e4d5571
+  REF 1cad888641804b1ddddf03ad316aa3a6e9e679ad
+  SHA512 8d7fc673bc318fd606f7c9de04291cd0fe5c3b8f8d2076e719a6c35fe226a45c10a3f65c38be5476a72b34ac7a31c8f9e1b5ea15d061eddcdda38357bc2a8bca
   HEAD_REF master
-  PATCHES 
+  PATCHES
     fix_cmakelists.patch
 )
 
@@ -28,6 +28,11 @@ if("opencv" IN_LIST FEATURES)
   set(ENABLE_OPENCV ON)
 endif()
 
+if("opencv-cuda" IN_LIST FEATURES)
+  set(ENABLE_OPENCV ON)
+  set(ENABLE_CUDA ON)
+endif()
+
 if("weights" IN_LIST FEATURES)
   vcpkg_download_distfile(YOLOV3_WEIGHTS
     URLS "https://pjreddie.com/media/files/yolov3.weights"