[opencv] update to 4.9

ports/darknet/vcpkg.json

@@ -1,7 +1,7 @@
 {
  "name": "darknet",
  "version-date": "2022-03-06",
- "port-version": 4,
+ "port-version": 5,
  "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.",
  "homepage": "https://github.com/alexeyab/darknet",
  "license": null,
@@ -81,58 +81,20 @@
  }
  ]
  },
- "opencv2-base": {
+ "opencv2": {
  "description": "Build darknet with support for OpenCV2",
  "dependencies": [
- {
- "name": "opencv2",
- "features": [
- "ffmpeg"
- ]
- }
+ "opencv2"
  ]
  },
- "opencv2-cuda": {
- "description": "Build darknet with support for CUDA-enabled OpenCV2",
- "dependencies": [
- {
- "name": "opencv2",
- "features": [
- "cuda",
- "ffmpeg"
- ]
- }
- ]
- },
- "opencv3-base": {
+ "opencv3": {
  "description": "Build darknet with support for OpenCV3",
  "dependencies": [
  {
  "name": "opencv3",
  "features": [
  "contrib",
- "dnn",
- "ffmpeg"
- ]
- }
- ]
- },
- "opencv3-cuda": {
- "description": "Build darknet with support for CUDA-enabled OpenCV3",
- "dependencies": [
- {
- "name": "darknet",
- "features": [
- "cuda"
- ]
- },
- {
- "name": "opencv3",
- "features": [
- "contrib",
- "cuda",
- "dnn",
- "ffmpeg"
+ "dnn"
  ]
  }
  ]

ports/opencv/portfile.cmake

@@ -1,9 +1,8 @@
 SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
-file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVConfig-version.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVModules.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVModules-release.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-if (NOT VCPKG_BUILD_TYPE)
- file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVModules-debug.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-endif()
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/vcpkg-cmake-wrapper.cmake"
+[[
+set(OpenCV_DIR "${CMAKE_CURRENT_LIST_DIR}/../opencv4/" CACHE PATH "Path to OpenCVConfig.cmake" FORCE)
+set(OpenCV_ROOT "${CMAKE_CURRENT_LIST_DIR}/../opencv4/") #to force find_package(OpenCV) to look for specific version and not randomly pick one in between opencv* installed
+_find_package(${ARGS})
+]])

ports/opencv/vcpkg.json

@@ -1,8 +1,7 @@
 {
  "name": "opencv",
- "version": "4.8.0",
- "port-version": 1,
- "description": "Computer vision library",
+ "version": "4.9.0",
+ "description": "computer vision library",
  "homepage": "https://github.com/opencv/opencv",
  "license": "Apache-2.0",
  "dependencies": [
@@ -27,6 +26,18 @@
  }
  ]
  },
+ "calib3d": {
+ "description": "calib3d module",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "calib3d"
+ ]
+ }
+ ]
+ },
  "contrib": {
  "description": "opencv_contrib module",
  "dependencies": [
@@ -82,21 +93,8 @@
  "name": "opencv4",
  "default-features": false,
  "features": [
- "dnn",
- "jpeg",
- "png",
- "quirc",
- "tiff",
- "webp"
+ "default-features"
  ]
- },
- {
- "name": "opencv4",
- "default-features": false,
- "features": [
- "gtk"
- ],
- "platform": "linux"
  }
  ]
  },
@@ -124,6 +122,18 @@
  }
  ]
  },
+ "dshow": {
+ "description": "enable DirectShow",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "dshow"
+ ]
+ }
+ ]
+ },
  "eigen": {
  "description": "Eigen support for opencv",
  "dependencies": [
@@ -149,7 +159,7 @@
  ]
  },
  "freetype": {
- "description": "freetype support for opencv",
+ "description": "Freetype support for opencv",
  "dependencies": [
  {
  "name": "opencv4",
@@ -160,6 +170,30 @@
  }
  ]
  },
+ "fs": {
+ "description": "Enable filesystem support",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "fs"
+ ]
+ }
+ ]
+ },
+ "gapi": {
+ "description": "Enable gapi module",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "gapi"
+ ]
+ }
+ ]
+ },
  "gdcm": {
  "description": "GDCM support for opencv",
  "dependencies": [
@@ -208,6 +242,30 @@
  }
  ]
  },
+ "highgui": {
+ "description": "highgui module",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "highgui"
+ ]
+ }
+ ]
+ },
+ "intrinsics": {
+ "description": "enable intrinsics",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "intrinsics"
+ ]
+ }
+ ]
+ },
  "ipp": {
  "description": "Enable Intel Integrated Performance Primitives",
  "dependencies": [
@@ -221,7 +279,7 @@
  ]
  },
  "jasper": {
- "description": "JPEG 2000 support for opencv",
+ "description": "JPEG 2000 support for opencv (deprecated)",
  "dependencies": [
  {
  "name": "opencv4",
@@ -256,8 +314,20 @@
  }
  ]
  },
+ "msmf": {
+ "description": "Microsoft Media Foundation support for opencv",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "msmf"
+ ]
+ }
+ ]
+ },
  "nonfree": {
- "description": "opencv nonfree module",
+ "description": "allow nonfree and unredistributable libraries",
  "dependencies": [
  {
  "name": "opencv4",
@@ -268,6 +338,18 @@
  }
  ]
  },
+ "opencl": {
+ "description": "enable opencl support",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "opencl"
+ ]
+ }
+ ]
+ },
  "openexr": {
  "description": "OpenEXR support for opencv",
  "dependencies": [
@@ -292,6 +374,18 @@
  }
  ]
  },
+ "openjpeg": {
+ "description": "JPEG 2000 support for opencv",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "openjpeg"
+ ]
+ }
+ ]
+ },
  "openmp": {
  "description": "Enable openmp support for opencv",
  "dependencies": [
@@ -304,6 +398,18 @@
  }
  ]
  },
+ "openvino": {
+ "description": "OpenVINO support for OpenCV DNN",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "openvino"
+ ]
+ }
+ ]
+ },
  "ovis": {
  "description": "opencv_ovis module",
  "dependencies": [
@@ -352,6 +458,18 @@
  }
  ]
  },
+ "quality": {
+ "description": "Build opencv_quality module",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "quality"
+ ]
+ }
+ ]
+ },
  "quirc": {
  "description": "Enable QR code module",
  "dependencies": [
@@ -364,6 +482,18 @@
  }
  ]
  },
+ "rgbd": {
+ "description": "Build opencv_rgbd module",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "rgbd"
+ ]
+ }
+ ]
+ },
  "sfm": {
  "description": "opencv_sfm module",
  "dependencies": [
@@ -388,6 +518,18 @@
  }
  ]
  },
+ "thread": {
+ "description": "Enable thread support",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "thread"
+ ]
+ }
+ ]
+ },
  "tiff": {
  "description": "TIFF support for opencv",
  "dependencies": [
@@ -436,6 +578,18 @@
  }
  ]
  },
+ "win32ui": {
+ "description": "enable win32ui",
+ "dependencies": [
+ {
+ "name": "opencv4",
+ "default-features": false,
+ "features": [
+ "win32ui"
+ ]
+ }
+ ]
+ },
  "world": {
  "description": "Compile to a single package support for opencv",
  "dependencies": [