[vcpkg baseline][many ports] Fix build error (#17983)

* [vcpkg baseline][wxwidgets] Fix build error

* [mlpack] Fix configure error (upstream bug)

* [vcpkg baseline] [embree2/embree3] Set cmake policy

* Remove control file

* Update baseline version

* [mlpack] Re-write the dependency

* [mlpack] Remove dependency boost-test since only feature test need it, add more boost dependencies.

* [mlpack] Add dependency boost-heap

* [mlpack] Fix uwp build

* update version record

* [mlpack] Revert uwp fix

* update version record

* [mlpack] Remove dependency boost-test

* update version record

* update baseline

* [clamav] Update hash

* update version record

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>

24 files changed, 160 insertions, 22 deletions

diff --git a/ports/clamav/portfile.cmake b/ports/clamav/portfile.cmake
index 2276adafd..ceb1ce7f5 100644
--- a/ports/clamav/portfile.cmake
+++ b/ports/clamav/portfile.cmake
@@ -5,7 +5,8 @@ vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO Cisco-Talos/clamav-devel
   REF clamav-0.103.0 
-  SHA512 488381202bdcea812c39d611e0a31eaf8f55c9c5d0a6400fd53dfa0da674a95672fdc9b290dc6157cb8f628d9f81846b5cc108eb1e44f6207d3c6f2659ba63c6
+  SHA512 e7ff4d98e0615a9fec0752bbfa2b882ae95034a8e01d0f7cc635ee520ff917c3be2a2d3273caa2fc1598e7d5ec4fd60d59b517cb439c5454d32447f8c8d7ba5a
+  FILE_DISAMBIGUATOR 1
   HEAD_REF master
   PATCHES
       "build.patch"
diff --git a/ports/clamav/vcpkg.json b/ports/clamav/vcpkg.json
index 12f2b6bc7..dd6cbc928 100644
--- a/ports/clamav/vcpkg.json
+++ b/ports/clamav/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clamav",
   "version-semver": "0.103.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "ClamAV is an open-source anti-virus toolkit.",
   "homepage": "https://www.clamav.net",
   "supports": "!uwp & !static",
diff --git a/ports/embree2/CONTROL b/ports/embree2/CONTROL
deleted file mode 100644
index 0fe3df484..000000000
--- a/ports/embree2/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: embree2
-Version: 2.17.7
-Homepage: https://github.com/embree/embree
-Description: High Performance Ray Tracing Kernels.
-Build-Depends: tbb
diff --git a/ports/embree2/cmake_policy.patch b/ports/embree2/cmake_policy.patch
new file mode 100644
index 000000000..ed4d339e3
--- /dev/null
+++ b/ports/embree2/cmake_policy.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index afa704d..96dc4f8 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -57,6 +57,9 @@ IF(COMMAND cmake_policy)

+   if (POLICY CMP0042)

+     cmake_policy(SET CMP0042 OLD)

+   endif()

++  if (POLICY CMP0001)

++    cmake_policy(SET CMP0001 OLD)

++  endif()

+ ENDIF(COMMAND cmake_policy)

+ 

+ MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)

diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake
index 728d73b86..1cb9b6bab 100644
--- a/ports/embree2/portfile.cmake
+++ b/ports/embree2/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF v2.17.7
     SHA512 3ea548e5ed85f68dc1f9dfe864711f9b731e0df8a2258257f77db08bbdbe3a9014a626313e3ff41174f3b26f09dc8ff523900119ff4c8465bfff53f621052873
     HEAD_REF devel2
+    PATCHES
+        cmake_policy.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake)
diff --git a/ports/embree2/vcpkg.json b/ports/embree2/vcpkg.json
new file mode 100644
index 000000000..683e2eabb
--- /dev/null
+++ b/ports/embree2/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "embree2",
+  "version-semver": "2.17.7",
+  "port-version": 1,
+  "description": "High Performance Ray Tracing Kernels.",
+  "homepage": "https://github.com/embree/embree",
+  "dependencies": [
+    "tbb"
+  ]
+}
diff --git a/ports/embree3/cmake_policy.patch b/ports/embree3/cmake_policy.patch
new file mode 100644
index 000000000..0ae3a074d
--- /dev/null
+++ b/ports/embree3/cmake_policy.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 06f49a8..fdaaee7 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -69,6 +69,9 @@ IF(COMMAND cmake_policy)

+   if(POLICY CMP0074)

+     cmake_policy(SET CMP0074 NEW)

+   endif()

++  if (POLICY CMP0001)

++    cmake_policy(SET CMP0001 OLD)

++  endif()

+ ENDIF(COMMAND cmake_policy)

+ 

+ MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)

diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake
index 522caaa0f..b5d08c792 100755
--- a/ports/embree3/portfile.cmake
+++ b/ports/embree3/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
     PATCHES
         fix-path.patch
         fix-static-usage.patch
+        cmake_policy.patch
 )
 
 string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static EMBREE_STATIC_LIB)
diff --git a/ports/embree3/vcpkg.json b/ports/embree3/vcpkg.json
index cec4212db..8730d6a0e 100644
--- a/ports/embree3/vcpkg.json
+++ b/ports/embree3/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "embree3",
-  "version": "3.12.2",
+  "version-semver": "3.12.2",
+  "port-version": 1,
   "description": "High Performance Ray Tracing Kernels.",
   "homepage": "https://github.com/embree/embree",
   "dependencies": [
diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL
deleted file mode 100644
index e424e6cad..000000000
--- a/ports/mlpack/CONTROL
+++ /dev/null
@@ -1,9 +0,0 @@
-Source: mlpack
-Version: 3.4.1
-Homepage: https://github.com/mlpack/mlpack
-Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.
-Build-Depends: boost, armadillo, ensmallen, stb
-Supports: !uwp
-
-Feature: tools
-Description: Build command-line executables.
diff --git a/ports/mlpack/fix-configure-error.patch b/ports/mlpack/fix-configure-error.patch
new file mode 100644
index 000000000..03a27077a
--- /dev/null
+++ b/ports/mlpack/fix-configure-error.patch
@@ -0,0 +1,15 @@
+diff --git a/CMake/go/AppendModel.cmake b/CMake/go/AppendModel.cmake
+index eeb28f7..ec50f15 100644
+--- a/CMake/go/AppendModel.cmake
++++ b/CMake/go/AppendModel.cmake
+@@ -44,8 +44,8 @@ function(append_model SERIALIZATION_FILE PROGRAM_MAIN_FILE)
+           else ()
+             string(APPEND GOMODEL_SAFE_TYPE ${MODEL_CHAR})
+           endif()
+-        endif()
+-     endforeach()
++        endforeach()
++     endif()
+ 
+       # See if the model type already exists.
+       file(READ "${SERIALIZATION_FILE}" SERIALIZATION_FILE_CONTENTS)
diff --git a/ports/mlpack/fix-test-dependency.patch b/ports/mlpack/fix-test-dependency.patch
new file mode 100644
index 000000000..1dbb5088d
--- /dev/null
+++ b/ports/mlpack/fix-test-dependency.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b59555c..4dd92f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -441,11 +441,18 @@ set(Boost_ADDITIONAL_VERSIONS
+ set(Boost_NO_BOOST_CMAKE 1)
+ find_package(Boost "${BOOST_VERSION}"
+     COMPONENTS
+-      unit_test_framework
+       serialization
+     REQUIRED
+ )
+ 
++if (BUILD_TESTS)
++    find_package(Boost "${BOOST_VERSION}"
++        COMPONENTS
++        unit_test_framework
++        REQUIRED
++    )
++endif()
++
+ if(0)
+ link_directories(${Boost_LIBRARY_DIRS})
+ 
diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake
index bfc30ace7..51e2ac6f0 100644
--- a/ports/mlpack/portfile.cmake
+++ b/ports/mlpack/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         cmakelists.patch
+        fix-configure-error.patch
+        fix-test-dependency.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACML.cmake)
diff --git a/ports/mlpack/vcpkg.json b/ports/mlpack/vcpkg.json
new file mode 100644
index 000000000..62317fa71
--- /dev/null
+++ b/ports/mlpack/vcpkg.json
@@ -0,0 +1,24 @@
+{
+  "name": "mlpack",
+  "version": "3.4.1",
+  "port-version": 1,
+  "description": "mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.",
+  "homepage": "https://github.com/mlpack/mlpack",
+  "supports": "uwp",
+  "dependencies": [
+    "armadillo",
+    "boost-heap",
+    "boost-math",
+    "boost-program-options",
+    "boost-random",
+    "boost-serialization",
+    "boost-serialization",
+    "ensmallen",
+    "stb"
+  ],
+  "features": {
+    "tools": {
+      "description": "Build command-line executables."
+    }
+  }
+}
diff --git a/ports/wxwidgets/fix-build.patch b/ports/wxwidgets/fix-build.patch
new file mode 100644
index 000000000..06e693c3c
--- /dev/null
+++ b/ports/wxwidgets/fix-build.patch
@@ -0,0 +1,15 @@
+diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt
+index bd6acd8..b5b5780 100644
+--- a/build/cmake/lib/stc/CMakeLists.txt
++++ b/build/cmake/lib/stc/CMakeLists.txt
+@@ -179,7 +179,9 @@ if(wxBUILD_PRECOMP)
+     if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+         set(wxSCINTILLA_PREC_HEADER "${wxSOURCE_DIR}/src/stc/scintilla/include/Scintilla.h")
+     endif()
+-    wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER})
++    if (wxSCINTILLA_PREC_HEADER)
++        wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER})
++    endif()
+ endif()
+ 
+ wx_add_library(wxstc ${STC_FILES})
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake
index 331747bc0..8b2050e2d 100644
--- a/ports/wxwidgets/portfile.cmake
+++ b/ports/wxwidgets/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         disable-platform-lib-dir.patch
+        fix-build.patch
 )
 
 set(OPTIONS)
diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json
index 994b49e92..0b08098df 100644
--- a/ports/wxwidgets/vcpkg.json
+++ b/ports/wxwidgets/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "wxwidgets",
   "version-semver": "3.1.5",
+  "port-version": 1,
   "description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.",
   "homepage": "https://github.com/wxWidgets/wxWidgets",
   "supports": "!uwp",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 7ee266418..330aa3835 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -946,6 +946,8 @@ microsoft-signalr:x64-windows=skip
 microsoft-signalr:x64-windows-static=skip
 microsoft-signalr:x64-windows-static-md=skip
 microsoft-signalr:x86-windows=skip
+# https://github.com/mlpack/mlpack/pull/2945
+mlpack:x64-uwp=fail
 mman:x64-linux=fail
 mman:x64-osx=fail
 mmloader:arm64-windows=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 83da3e997..d10aba760 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1242,7 +1242,7 @@
     },
     "clamav": {
       "baseline": "0.103.0",
-      "port-version": 1
+      "port-version": 2
     },
     "clapack": {
       "baseline": "3.2.1",
@@ -1838,11 +1838,11 @@
     },
     "embree2": {
       "baseline": "2.17.7",
-      "port-version": 0
+      "port-version": 1
     },
     "embree3": {
       "baseline": "3.12.2",
-      "port-version": 0
+      "port-version": 1
     },
     "enet": {
       "baseline": "1.3.16",
@@ -4006,7 +4006,7 @@
     },
     "mlpack": {
       "baseline": "3.4.1",
-      "port-version": 0
+      "port-version": 1
     },
     "mman": {
       "baseline": "git-f5ff813-3",
@@ -6514,7 +6514,7 @@
     },
     "wxwidgets": {
       "baseline": "3.1.5",
-      "port-version": 0
+      "port-version": 1
     },
     "x-plane": {
       "baseline": "3.0.3",
diff --git a/versions/c-/clamav.json b/versions/c-/clamav.json
index ea2cee24d..6038414f1 100644
--- a/versions/c-/clamav.json
+++ b/versions/c-/clamav.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5580f5bf0e6812edc0e114f55b3377117b5aa6ff",
+      "version-semver": "0.103.0",
+      "port-version": 2
+    },
+    {
       "git-tree": "b6b4287e62ba66791d4f3b1af99f795f7cd8df15",
       "version-semver": "0.103.0",
       "port-version": 1
diff --git a/versions/e-/embree2.json b/versions/e-/embree2.json
index 6992e1434..c586f06ec 100644
--- a/versions/e-/embree2.json
+++ b/versions/e-/embree2.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "234d3da49438399d5df9e1a105401bc930ae22fe",
+      "version-semver": "2.17.7",
+      "port-version": 1
+    },
+    {
       "git-tree": "3a87d7af065343c7a78620fa2f432272cb56c117",
       "version-string": "2.17.7",
       "port-version": 0
diff --git a/versions/e-/embree3.json b/versions/e-/embree3.json
index 61663c90f..6398dcdf8 100644
--- a/versions/e-/embree3.json
+++ b/versions/e-/embree3.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "d0b90c66c1c8be2574ff610fe1fda718e8b87b78",
+      "version-semver": "3.12.2",
+      "port-version": 1
+    },
+    {
       "git-tree": "8684283b1251cae5f299462307ff5cac0cf1f4fd",
       "version": "3.12.2",
       "port-version": 0
diff --git a/versions/m-/mlpack.json b/versions/m-/mlpack.json
index 57645a964..585e56e27 100644
--- a/versions/m-/mlpack.json
+++ b/versions/m-/mlpack.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "4793fb5802e10e645d5d33e0ec2baf6f1a0a337b",
+      "version": "3.4.1",
+      "port-version": 1
+    },
+    {
       "git-tree": "ca98fd8ae45d5ef5e77e4f2942b2dbe60a4356d4",
       "version-string": "3.4.1",
       "port-version": 0
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index 78a9dd378..0e85fc33b 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "9140ae8c095ca8906ebf8150016f520fbdcb27d7",
+      "version-semver": "3.1.5",
+      "port-version": 1
+    },
+    {
       "git-tree": "09e00eb06f1870d88caadf9e5e23719b197deda4",
       "version-semver": "3.1.5",
       "port-version": 0