Merge from microsoft/vcpkg

ports/ace/CONTROL

@@ -1,8 +1,8 @@
 Source: ace
-Version: 6.5.12
+Version: 7.0.0
 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
 Description: The ADAPTIVE Communication Environment
-Port-Version: 1
+Port-Version: 0
 
 Feature: wchar
 Description: Enable extra wide char functions in ACE

ports/ace/portfile.cmake

@@ -1,7 +1,7 @@
 # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter"
 # when invoking `prj_install.pl`.
 # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it.
-set(ACE_VERSION 6.5.12)
+set(ACE_VERSION 7.0.0)
 string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION})
 
 if("tao" IN_LIST FEATURES)
@@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES)
       vcpkg_download_distfile(ARCHIVE
           URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip"
           FILENAME ACE-TAO-${ACE_VERSION}.zip
-          SHA512 6b6ad7c98fed19b03449cc93148dc66abbaab5c6cdc893f9fdc9b74e899dba1e2e969e791326a7869ad06f8ffbf9cbbee66a75170bee6ac386e6795eb4f713e3
+          SHA512 9b99a07bfc80d616843b2a6f8f9a0fc0868fefcb98a1f57f04cc624f39ad9162043bb29d886eda2162143a321b434b8496717b005fa314acbc5403a37a965df6
       )
     else()
       # VCPKG_TARGET_IS_LINUX
       vcpkg_download_distfile(ARCHIVE
           URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz"
           FILENAME ACE-TAO-${ACE_VERSION}.tar.gz
-          SHA512 6cb3b87ee5e421b77dc8479c9572c8bd1d110bee504a346094d122f7acdfba29708b6fdb44e4d611620214ecb74d375444988f34a0e807c5853755d32b3c2e7d
+          SHA512 731896ae9939702b70d293ced64aae1030ddf7545fba926c99b495a43e37aaacc9c9d91f6aadef0153c128704ba7c8545d9b81f9fa0f58de4939e3be4eab1103
       )
     endif()
 else()
@@ -26,14 +26,14 @@ else()
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip"
         FILENAME ACE-src-${ACE_VERSION}.zip
-        SHA512 f2b8bc68531af673fb15f72d15fc9cdb1f9c44d21aa6aef473b06461b4a7d8c882368e8a93e5da6a8f7d856b88f3f1199a2bc4185ccb67b269e68f1346bc6b3a
+        SHA512 6b2ddaabaa737bd13d8541d1458ea2f73cbee558f7a294a16078d68e0f294dc09310661ec23ba3077528dfe7340f7040cccc4bd7082025d7b4f3be52d6718769
     )
   else(VCPKG_TARGET_IS_WINDOWS)
     # VCPKG_TARGET_IS_LINUX
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz"
         FILENAME ACE-src-${ACE_VERSION}.tar.gz
-        SHA512 8dcdf5ff69908840ab527533c500dde2902f59c62aaddcec21f8767afe59d0277e57f03ab359755977e99e9b1f2e158636024b806e25a6874be2ac31e31f72e8
+        SHA512 91541eac3c7246e5620ee805c297b80406f2e27e06338f142e40633ec74ef5e18e65164c66225bb8606314b63d6b197c6122927f4300bef4bb88010e8b5571b1
     )
   endif()
 endif()
@@ -104,7 +104,7 @@ elseif(VCPKG_TARGET_IS_LINUX)
 elseif(VCPKG_TARGET_IS_OSX)
   set(SOLUTION_TYPE gnuace)
   file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"")
-  file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU")
+  file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "c++11=1\ninclude $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU")
 endif()
 
 if(VCPKG_TARGET_IS_UWP)
@@ -147,7 +147,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
            DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH})
     endforeach()
   endfunction()
-  
+
   get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)
   set(SOURCE_COPY_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX})
 
@@ -272,7 +272,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
         ${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb)
     endif()
   endif()
-  
+
   vcpkg_clean_msbuild()
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   FIND_PROGRAM(MAKE make)

ports/cgal/CONTROL

@@ -1,6 +1,7 @@
 Source: cgal
 Version: 5.2
-Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval
+Port-Version: 1
+Build-Depends: mpfr, gmp, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval
 Homepage: https://github.com/CGAL/cgal
 Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.
 

ports/libgeotiff/CONTROL

@@ -1,5 +1,6 @@
 Source: libgeotiff
 Version: 1.6.0
+Port-Version: 1
 Homepage: https://github.com/OSGeo/libgeotiff
 Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags.
 Build-Depends: tiff, proj4, zlib, libjpeg-turbo

ports/libgeotiff/cmakelists.patch

@@ -75,7 +75,7 @@ index 47a2b00..3809ba3 100644
    set (PROJECT_ROOT_DIR "..")
  endif ()
 +else()
-+  set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}")
++  set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME_LOWER}")
 +  set (PROJECT_ROOT_DIR "../..")
 +endif()
 

ports/libgeotiff/fix-config-version.patch

@@ -0,0 +1,21 @@
+diff --git a/libgeotiff/cmake/project-config-version.cmake.in b/libgeotiff/cmake/project-config-version.cmake.in
+index d695aa2..efe32ba 100644
+--- a/libgeotiff/cmake/project-config-version.cmake.in
++++ b/libgeotiff/cmake/project-config-version.cmake.in
+@@ -5,14 +5,14 @@ set (PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
+ set (PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
+ set (PACKAGE_VERSION_PATCH "@PROJECT_VERSION_PATCH@")
+
+-if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_NAME@")
++if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_NAME_LOWER@")
+   # Check package name (in particular, because of the way cmake finds
+   # package config files, the capitalization could easily be "wrong").
+   # This is necessary to ensure that the automatically generated
+   # variables, e.g., <package>_FOUND, are consistently spelled.  Make
+   # this a WARNING, because this is a user error that needs to be fixed.
+   message (WARNING
+-    "Mismatched package names: use find_package(@PROJECT_NAME@ ...) instead"
++    "Mismatched package names: use find_package(@PROJECT_NAME_LOWER@ ...) instead"
+     " of find_package(${PACKAGE_FIND_NAME} ...)")
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+ elseif (NOT (APPLE OR CMAKE_SIZEOF_VOID_P EQUAL @CMAKE_SIZEOF_VOID_P@))

ports/libgeotiff/portfile.cmake

@@ -9,6 +9,7 @@ vcpkg_from_github(
         geotiff-config.patch
         fix-proj4.patch
         fix-staticbuild.patch
+        fix-config-version.patch
 )
 
 set(SOURCE_PATH ${SOURCE_PATH}/libgeotiff)
@@ -32,10 +33,10 @@ vcpkg_install_cmake()
 vcpkg_copy_tools(TOOL_NAMES applygeo geotifcp listgeo makegeo AUTO_CLEAN)
 
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/GeoTIFF TARGET_PATH share/GeoTIFF)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/geotiff TARGET_PATH share/geotiff)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/GeoTIFF/geotiff-config.cmake "if (GeoTIFF_USE_STATIC_LIBS)" "if (1)")
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/geotiff/geotiff-config.cmake "if (GeoTIFF_USE_STATIC_LIBS)" "if (1)")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
 endif()
 

ports/libkeyfinder/portfile.cmake

@@ -0,0 +1,24 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mixxxdj/libkeyfinder
+    REF v2.2.4
+    SHA512 6673b9a81dbfa3693fc4e7af4e5fc0f351f0c60b00fdafeb9e3437e2f77b5fec7d1e78e3989ff1daca72770a1d3cdbe3837508718b8e8aba3ac3f3d56af81a56
+    HEAD_REF main
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    test BUILD_TESTING
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS ${FEATURE_OPTIONS}
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KeyFinder TARGET_PATH share/KeyFinder)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/libkeyfinder/vcpkg.json

@@ -0,0 +1,18 @@
+{
+  "name": "libkeyfinder",
+  "version-string": "2.2.4",
+  "description": "Musical key detection for digital audio",
+  "homepage": "https://github.com/mixxxdj/libkeyfinder",
+  "license": "GPL-3.0-or-later",
+  "dependencies": [
+    "fftw3"
+  ],
+  "features": {
+    "test": {
+      "description": "Build tests",
+      "dependencies": [
+        "catch2"
+      ]
+    }
+  }
+}

ports/liblas/CONTROL

@@ -1,6 +1,6 @@
 Source: liblas
 Version: 1.8.1
-Port-Version: 5
+Port-Version: 6
 Build-Depends: boost, boost-thread, boost-system, boost-iostreams, boost-filesystem, boost-detail, libgeotiff
 Description: A C/C++ library for reading and writing the very common LAS LiDAR format.
 

ports/liblas/fix-geotiff.patch

@@ -7,7 +7,7 @@ index d246a88..d0bba6f 100644
  set(WITH_GEOTIFF TRUE CACHE BOOL "Choose if GeoTIFF support should be built")
 
 -find_package (GeoTIFF 1.3.0 )
-+find_package (GeoTIFF CONFIG 1.3.0 )
++find_package (geotiff CONFIG REQUIRED)
  if(GEOTIFF_FOUND)
      set(WITH_GEOTIFF TRUE)
      # Confirm required API is available

ports/opencv/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "opencv",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "Computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [
@@ -13,6 +13,7 @@
     "dnn",
     "jpeg",
     "png",
+    "quirc",
     "tiff",
     "webp"
   ],

ports/opencv3/0002-install-options.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d143a7a..15eb053 100644
+index fcb4a1d..5810b0c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -602,7 +602,7 @@ endif()
+@@ -607,7 +607,7 @@ endif()
  ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS)
 
  # --- Python Support ---
@@ -12,10 +12,10 @@ index d143a7a..15eb053 100644
  endif()
 
 diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
-index 9ac671d..b14ce09 100644
+index 8a3dcdb..b8b3bae 100644
 --- a/cmake/OpenCVCompilerOptions.cmake
 +++ b/cmake/OpenCVCompilerOptions.cmake
-@@ -263,7 +263,6 @@ if(MSVC)
+@@ -262,7 +262,6 @@ if(MSVC)
    #endif()
 
    if(BUILD_WITH_DEBUG_INFO)

ports/opencv3/0003-force-package-requirements.patch

@@ -1,44 +1,44 @@
 diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
-index fcf716b..f3951e3 100644
+index f99bb33..5407f70 100644
 --- a/cmake/OpenCVFindLibsGrfmt.cmake
 +++ b/cmake/OpenCVFindLibsGrfmt.cmake
-@@ -6,7 +6,7 @@
- if(BUILD_ZLIB)
+@@ -7,7 +7,7 @@ if(BUILD_ZLIB)
    ocv_clear_vars(ZLIB_FOUND)
  else()
+   ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
 -  find_package(ZLIB "${MIN_VER_ZLIB}")
 +  find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
    if(ZLIB_FOUND AND ANDROID)
      if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$")
        set(ZLIB_LIBRARIES z)
-@@ -30,7 +30,7 @@ if(WITH_JPEG)
-   if(BUILD_JPEG)
+@@ -33,7 +33,7 @@ if(WITH_JPEG)
      ocv_clear_vars(JPEG_FOUND)
    else()
+     ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR)
 -    include(FindJPEG)
 +    find_package(JPEG REQUIRED)
    endif()
 
    if(NOT JPEG_FOUND)
-@@ -74,7 +74,7 @@ if(WITH_TIFF)
-   if(BUILD_TIFF)
+@@ -79,7 +79,7 @@ if(WITH_TIFF)
      ocv_clear_vars(TIFF_FOUND)
    else()
+     ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR)
 -    include(FindTIFF)
 +    find_package(TIFF REQUIRED)
      if(TIFF_FOUND)
        ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION)
      endif()
-@@ -117,7 +117,7 @@ if(WITH_WEBP)
-   if(BUILD_WEBP)
+@@ -123,7 +123,7 @@ if(WITH_WEBP)
      ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR)
    else()
+     ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR)
 -    include(cmake/OpenCVFindWebP.cmake)
 +    find_package(WebP REQUIRED)
      if(WEBP_FOUND)
        set(HAVE_WEBP 1)
      endif()
-@@ -158,7 +158,7 @@ if(WITH_JASPER)
+@@ -164,7 +164,7 @@ if(WITH_JASPER)
    if(BUILD_JASPER)
      ocv_clear_vars(JASPER_FOUND)
    else()
@@ -47,75 +47,39 @@ index fcf716b..f3951e3 100644
    endif()
 
    if(NOT JASPER_FOUND)
-@@ -182,7 +182,7 @@ if(WITH_PNG)
-   if(BUILD_PNG)
+@@ -189,7 +189,7 @@ if(WITH_PNG)
      ocv_clear_vars(PNG_FOUND)
    else()
+     ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR)
 -    include(FindPNG)
 +    find_package(PNG REQUIRED)
      if(PNG_FOUND)
        include(CheckIncludeFile)
        check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
-@@ -213,7 +213,7 @@ endif()
- if(WITH_OPENEXR)
+@@ -221,7 +221,7 @@ if(WITH_OPENEXR)
    ocv_clear_vars(HAVE_OPENEXR)
    if(NOT BUILD_OPENEXR)
+     ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
 -    include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
 +    find_package(OpenEXR REQUIRED)
    endif()
 
    if(OPENEXR_FOUND)
-@@ -231,7 +231,7 @@ endif()
+@@ -239,7 +239,7 @@ endif()
 
  # --- GDAL (optional) ---
  if(WITH_GDAL)
 -    find_package(GDAL QUIET)
-+  find_package(GDAL REQUIRED)
++    find_package(GDAL REQUIRED)
 
      if(NOT GDAL_FOUND)
          set(HAVE_GDAL NO)
-@@ -243,7 +243,7 @@ if(WITH_GDAL)
+@@ -251,7 +251,7 @@ if(WITH_GDAL)
  endif()
 
- if (WITH_GDCM)
+ if(WITH_GDCM)
 -  find_package(GDCM QUIET)
 +  find_package(GDCM REQUIRED)
    if(NOT GDCM_FOUND)
      set(HAVE_GDCM NO)
      ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
-diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
-index b9b1a95..596c152 100644
---- a/cmake/OpenCVFindLibsPerf.cmake
-+++ b/cmake/OpenCVFindLibsPerf.cmake
-@@ -51,14 +51,9 @@ endif(WITH_CUDA)
-
- # --- Eigen ---
- if(WITH_EIGEN AND NOT HAVE_EIGEN)
--  find_package(Eigen3 QUIET)
-+  find_package(Eigen3 REQUIRED)
-
-   if(Eigen3_FOUND)
--    if(TARGET Eigen3::Eigen)
--      # Use Eigen3 imported target if possible
--      list(APPEND OPENCV_LINKER_LIBS Eigen3::Eigen)
--      set(HAVE_EIGEN 1)
--    else()
-       if(DEFINED EIGEN3_INCLUDE_DIRS)
-         set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIRS})
-         set(HAVE_EIGEN 1)
-@@ -66,7 +61,6 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
-         set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIR})
-         set(HAVE_EIGEN 1)
-       endif()
--    endif()
-     if(HAVE_EIGEN)
-       if(DEFINED EIGEN3_WORLD_VERSION)  # CMake module
-         set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION})
-@@ -77,6 +71,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
-         set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR})
-         set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH})
-       endif()
-+      ocv_include_directories(${EIGEN_INCLUDE_PATH})
-     endif()
-   endif()
-