[darknet] update to latest release (#6787)

* [darknet] update to latest release

* [darknet] Reduce patch size

* update to latest release, does not require any patch :)

3 files changed, 8 insertions, 28 deletions

diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL
index 88b4cdb7b..393503485 100644
--- a/ports/darknet/CONTROL
+++ b/ports/darknet/CONTROL
@@ -1,5 +1,5 @@
 Source: darknet
-Version: 0.2.5-1
+Version: 0.2.5-3
 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: opencv[ffmpeg],opencv[cuda]
+Build-Depends: opencv[ffmpeg], 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
deleted file mode 100644
index 68451de45..000000000
--- a/ports/darknet/fix_cmakelists.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 585eb0e..7515d98 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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")
-+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")
-@@ -88,7 +87,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()
--set(Stb_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/stb CACHE PATH "Path where Stb image library can be located")
- 
- set(CMAKE_DEBUG_POSTFIX d)
- add_definitions(-DUSE_CMAKE_LIBS)
diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake
index 986bdb03d..3733420ad 100644
--- a/ports/darknet/portfile.cmake
+++ b/ports/darknet/portfile.cmake
@@ -11,11 +11,9 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO AlexeyAB/darknet
-  REF 8c970498a296ed129ffef7d872ccc25d42d1afda
-  SHA512 70dda24656469b8a61a645533ac227b644d365c7d5f4dbc93077a3f46563dd45ae88c563fb1c8f8d02a2021760aba24bea35d81f0f307975d051d0f9bfe92265
+  REF a1abd07e23fc5b143a6197de9908fe4f33791c6a
+  SHA512 df91bf595666a4db5beb5cc55f6c60be19667ab987a784faef04cf2215317c9a340cfc0a200640741fcc88c29cff077d5153b86ff497c31ad5ad132f05987516
   HEAD_REF master
-  PATCHES
-    fix_cmakelists.patch
 )
 
 set(ENABLE_CUDA OFF)
@@ -61,7 +59,11 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty)
 
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
+  DISABLE_PARALLEL_CONFIGURE  #since darknet configures a file inside source tree, it is better to disable parallel configure
+  #PREFER_NINJA               #it does not work with cuda on windows https://gitlab.kitware.com/cmake/cmake/issues/19173
   OPTIONS
+    -DINSTALL_BIN_DIR:STRING=bin
+    -DINSTALL_LIB_DIR:STRING=lib
     -DENABLE_CUDA=${ENABLE_CUDA}
     -DENABLE_OPENCV=${ENABLE_OPENCV}
 )