[opencv] Update to 4.12.0

ports/opencv/vcpkg.json

@@ -1,10 +1,10 @@
 {
   "name": "opencv",
-  "version": "4.11.0",
-  "port-version": 1,
-  "description": "computer vision library",
-  "homepage": "https://github.com/opencv/opencv",
-  "license": "Apache-2.0",
+  "version": "4.12.0",
+  "description": "Open Source Computer Vision Library",
+  "homepage": "https://opencv.org/",
+  "documentation": "https://docs.opencv.org/4.12.0/",
+  "license": null,
   "dependencies": [
     {
       "name": "opencv4",

ports/opencv4/0004-opencl.diff

@@ -0,0 +1,32 @@
+diff --git a/cmake/OpenCVDetectOpenCL.cmake b/cmake/OpenCVDetectOpenCL.cmake
+index 6ab2cae..8429551 100644
+--- a/cmake/OpenCVDetectOpenCL.cmake
++++ b/cmake/OpenCVDetectOpenCL.cmake
+@@ -1,13 +1,5 @@
+-set(OPENCL_FOUND ON CACHE BOOL "OpenCL library is found")
+-if(APPLE)
+-  set(OPENCL_LIBRARY "-framework OpenCL" CACHE STRING "OpenCL library")
+-  set(OPENCL_INCLUDE_DIR "" CACHE PATH "OpenCL include directory")
+-else()
+-  set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library")
+-  set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" CACHE PATH "OpenCL include directory")
+-  ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt")
+-endif()
+-mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
++find_package(OPENCL NAMES OpenCL)
++set(OPENCL_LIBRARY OpenCL::OpenCL)
+
+ if(OPENCL_FOUND)
+
+diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
+index 5742177..5e9633b 100644
+--- a/cmake/OpenCVModule.cmake
++++ b/cmake/OpenCVModule.cmake
+@@ -869,6 +869,7 @@ macro(ocv_glob_module_sources)
+     set(OCL_NAME opencl_kernels_${name})
+     add_custom_command(
+       OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OCL_NAME}.cpp"  # don't add .hpp file here to optimize build process
++             "${CMAKE_CURRENT_BINARY_DIR}/${OCL_NAME}.hpp"  # in reality vcpkg needs them
+       COMMAND ${CMAKE_COMMAND} "-DMODULE_NAME=${name}" "-DCL_DIR=${CMAKE_CURRENT_LIST_DIR}/src/opencl" "-DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/${OCL_NAME}.cpp" -P "${OpenCV_SOURCE_DIR}/cmake/cl2cpp.cmake"
+       DEPENDS ${cl_kernels} "${OpenCV_SOURCE_DIR}/cmake/cl2cpp.cmake"
+       COMMENT "Processing OpenCL kernels (${name})"

ports/opencv4/0005-vulkan.diff

@@ -0,0 +1,32 @@
+diff --git a/cmake/OpenCVDetectVulkan.cmake b/cmake/OpenCVDetectVulkan.cmake
+index b6ef0f2..2350dad 100644
+--- a/cmake/OpenCVDetectVulkan.cmake
++++ b/cmake/OpenCVDetectVulkan.cmake
+@@ -1,9 +1,11 @@
+-set(VULKAN_INCLUDE_DIRS "${OpenCV_SOURCE_DIR}/3rdparty/include" CACHE PATH "Vulkan include directory")
++find_package(VulkanHeaders CONFIG)
++set(VULKAN_INCLUDE_DIRS "")
+ set(VULKAN_LIBRARIES "" CACHE PATH "Path to Vulkan Libraries.")
+
+ try_compile(VALID_VULKAN
+       "${OpenCV_BINARY_DIR}"
+       "${OpenCV_SOURCE_DIR}/cmake/checks/vulkan.cpp"
++      LINK_LIBRARIES Vulkan::Headers
+       CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${VULKAN_INCLUDE_DIRS}"
+       OUTPUT_VARIABLE TRY_OUT
+       )
+diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
+index 382379c..6341731 100644
+--- a/modules/dnn/CMakeLists.txt
++++ b/modules/dnn/CMakeLists.txt
+@@ -110,6 +110,10 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
+ set(include_dirs "")
+ set(libs "")
+
++if(HAVE_VULKAN)
++  list(APPEND libs "$<COMPILE_ONLY:Vulkan::Headers>")
++endif()
++
+ if(HAVE_PROTOBUF)
+   ocv_target_compile_definitions(${the_module} PRIVATE "HAVE_PROTOBUF=1")
+

ports/opencv4/0017-fix-flatbuffers.patch

@@ -1,16 +1,11 @@
 --- a/cmake/OpenCVDetectFlatbuffers.cmake
 +++ b/cmake/OpenCVDetectFlatbuffers.cmake
-@@ -1,9 +1,9 @@
+@@ -1,5 +1,8 @@
  if(WITH_FLATBUFFERS)
    set(HAVE_FLATBUFFERS 1)
--  set(flatbuffers_VERSION "23.5.9")
--  ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt")
--  ocv_add_external_target(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1")
--  set(CUSTOM_STATUS_flatbuffers "    Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})")
-+  set(flatbuffers_VERSION "23.5.26")
-+  find_path(FLATBUFFERS_INCLUDE_DIR flatbuffers.h PATH_SUFFIXES flatbuffers)
-+  get_filename_component(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_INCLUDE_DIR}" PATH)
-+  ocv_add_external_target(flatbuffers "${FLATBUFFERS_INCLUDE_DIR}" "" "HAVE_FLATBUFFERS=1")
- endif()
-
- if(WITH_FLATBUFFERS OR HAVE_FLATBUFFERS)
++  find_package(flatbuffers CONFIG REQUIRED)
++  ocv_add_external_target(flatbuffers "" "flatbuffers::flatbuffers" "HAVE_FLATBUFFERS=1")
++elseif(0)
+   set(flatbuffers_VERSION "23.5.9")
+   ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt")
+   ocv_add_external_target(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1")