Merge branch 'master' into update-geos-381

1 files changed, 9 insertions, 17 deletions

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 3abe12625..e5292ed5c 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -291,7 +291,6 @@ dbghelp:x64-uwp=skip
 dbghelp:x64-windows-static=skip
 dbghelp:x64-windows=skip
 dbghelp:x86-windows=skip
-dbow2:x64-osx=fail
 dcmtk:arm-uwp=fail
 dcmtk:arm64-windows=fail
 dcmtk:x64-uwp=fail
@@ -325,7 +324,6 @@ dlfcn-win32:x64-linux=fail
 dlfcn-win32:x64-osx=fail
 dlfcn-win32:x64-uwp=fail
 dmlc:arm-uwp=fail
-dmlc:arm64-windows=fail
 dmlc:x64-uwp=fail
 dpdk:arm-uwp=fail
 dpdk:arm64-windows=fail
@@ -425,7 +423,6 @@ flint:x64-linux=fail
 flint:x64-osx=fail
 fltk:arm-uwp=fail
 fltk:x64-uwp=fail
-fluidsynth:x64-linux=fail
 fluidsynth:x64-osx=fail
 fmem:arm-uwp=fail
 fmem:x64-uwp=fail
@@ -452,11 +449,8 @@ freetds:x64-uwp=fail
 freetype-gl:x64-uwp=fail
 freexl:arm-uwp=fail
 freexl:x64-uwp=fail
-freexl:x64-windows=fail
 fribidi:arm64-windows=fail
 fribidi:arm-uwp=fail
-fribidi:x64-linux=fail
-fribidi:x64-osx=fail
 fribidi:x64-uwp=fail
 ftgl:x64-uwp=fail
 fuzzylite:arm-uwp=fail
@@ -658,7 +652,6 @@ libcds:x64-uwp=fail
 libconfig:x64-osx=fail
 libcopp:arm64-windows=fail
 libcopp:arm-uwp=fail
-libcopp:x64-windows-static=fail
 libcrafter:x86-windows=fail
 libcrafter:x64-windows=fail
 cpuid:arm-uwp=fail
@@ -674,7 +667,6 @@ libdshowcapture:x64-osx=fail
 libdshowcapture:x64-uwp=fail
 libepoxy:arm64-windows=fail
 libepoxy:arm-uwp=fail
-libepoxy:x64-osx=fail
 libepoxy:x64-uwp=fail
 libepoxy:x64-windows-static=fail
 libevent:arm-uwp=fail
@@ -691,7 +683,6 @@ libfabric:arm-uwp=fail
 libfabric:x64-linux=fail
 libfabric:x64-osx=fail
 libfabric:x64-uwp=fail
-libfabric:x64-windows=fail
 libfabric:x64-windows-static=fail
 libfreenect2:arm64-windows=fail
 libfreenect2:x64-linux=fail
@@ -1094,11 +1085,6 @@ msmpi:x64-uwp=fail
 munit:arm-uwp=fail
 munit:arm64-windows=fail
 munit:x64-uwp=fail
-# Though `vcpkg_configure_meson` and `vcpkg_install_meson` support
-# `x64-linux` and `x64-osx` now, it still failed on these targets.
-# See: https://github.com/microsoft/vcpkg/pull/6780
-munit:x64-linux=fail
-munit:x64-osx=fail
 muparser:arm-uwp=fail
 muparser:x64-uwp=fail
 murmurhash:arm-uwp=fail
@@ -1483,7 +1469,6 @@ readline-win32:x64-osx=fail
 readline-win32:x64-uwp=fail
 realsense2:arm64-windows=fail
 realsense2:arm-uwp=fail
-realsense2:x64-linux=fail
 realsense2:x64-uwp=fail
 redis-plus-plus:x86-windows=fail
 redis-plus-plus:x64-windows=fail
@@ -1597,8 +1582,15 @@ sockpp:arm-uwp=fail
 sockpp:x64-uwp=fail
 soem:x64-uwp=fail
 soem:arm-uwp=fail
-soil:arm-uwp=fail
-soil:x64-uwp=fail
+# soil upstream is gone; if we do not have another source before 2021-03-01 we will remove the port
+soil:arm-uwp=skip
+soil:x64-uwp=skip
+soil:arm64-windows=skip
+soil:x64-windows=skip
+soil:x86-windows=skip
+soil:x64-windows-static=skip
+soil:x64-linux=skip
+soil:x64-osx=skip
 soil2:arm-uwp=fail
 soil2:x64-uwp=fail
 sophus:x64-linux=fail