From 4f86bed885f6db7e96fc21bada1ab32432c96667 Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Wed, 9 Dec 2020 12:32:07 -0800
Subject: [PATCH 1/2] Build Fixes 2020-12-09

These results are from the build https://dev.azure.com/vcpkg/public/_build/results?buildId=46238

PASSING, REMOVE FROM FAIL LIST: tcl:x64-osx (.\scripts\ci.baseline.txt)

Unknown, maybe the vcpkg_fixup_cmake_targets change?

REGRESSION: anyrpc:x64-windows

CMake Error at CMakeLists.txt:90 (CONFIGURE_FILE):
  CONFIGURE_FILE Problem configuring file

Added DISABLE_PARALLEL_CONFIGURE.

REGRESSION: geotrans:x64-uwp

Will be fixed by https://github.com/microsoft/vcpkg/pull/14412

-- Downloading http://earth-info.nga.mil/GandG/geotrans/geotrans3.7/linux_dev.tgz...
-- Downloading http://earth-info.nga.mil/GandG/geotrans/geotrans3.7/linux_dev.tgz... Failed. Status: 28;"Timeout was reached"
CMake Error at scripts/cmake/vcpkg_download_distfile.cmake:184 (message):

REGRESSION: ois:x64-windows-static

CMake Error at CMakeLists.txt:22 (configure_file):
  configure_file Problem configuring file

Added DISABLE_PARALLEL_CONFIGURE.

REGRESSION: osgearth:x64-windows
REGRESSION: osgearth:x86-windows

Unknown and this port has never passed in CI. After discussion with the team we are skipping this one.

REGRESSION: qt5-tools:x64-windows-static

Remains unknown.
---
 ports/anyrpc/CONTROL        | 4 ----
 ports/anyrpc/portfile.cmake | 1 +
 ports/anyrpc/vcpkg.json     | 7 +++++++
 ports/ois/CONTROL           | 4 ----
 ports/ois/portfile.cmake    | 1 +
 ports/ois/vcpkg.json        | 7 +++++++
 scripts/ci.baseline.txt     | 4 +++-
 7 files changed, 19 insertions(+), 9 deletions(-)
 delete mode 100644 ports/anyrpc/CONTROL
 create mode 100644 ports/anyrpc/vcpkg.json
 delete mode 100644 ports/ois/CONTROL
 create mode 100644 ports/ois/vcpkg.json

diff --git a/ports/anyrpc/CONTROL b/ports/anyrpc/CONTROL
deleted file mode 100644
index a76346057cb20d..00000000000000
--- a/ports/anyrpc/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: anyrpc
-Version: 2020-01-13-1
-Homepage: https://github.com/sgieseking/anyrpc
-Description: A multiprotocol remote procedure call system for C++.
diff --git a/ports/anyrpc/portfile.cmake b/ports/anyrpc/portfile.cmake
index 843e83609f1442..513c37cd91cb72 100644
--- a/ports/anyrpc/portfile.cmake
+++ b/ports/anyrpc/portfile.cmake
@@ -11,6 +11,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARE
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
     -DBUILD_EXAMPLES=OFF
     -DBUILD_TESTS=OFF
diff --git a/ports/anyrpc/vcpkg.json b/ports/anyrpc/vcpkg.json
new file mode 100644
index 00000000000000..f71f684cc7fbcb
--- /dev/null
+++ b/ports/anyrpc/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "anyrpc",
+  "version-string": "2020-01-13",
+  "port-version": 2,
+  "description": "A multiprotocol remote procedure call system for C++.",
+  "homepage": "https://github.com/sgieseking/anyrpc"
+}
diff --git a/ports/ois/CONTROL b/ports/ois/CONTROL
deleted file mode 100644
index b43ed59dd9ecaf..00000000000000
--- a/ports/ois/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: ois
-Version: 1.5-1
-Description: Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatiable with many systems and operating systems.
-Homepage: https://wgois.github.io/OIS/
\ No newline at end of file
diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake
index f35d3d5378139d..84859bb096aed5 100644
--- a/ports/ois/portfile.cmake
+++ b/ports/ois/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
 )
 
 vcpkg_install_cmake()
diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json
new file mode 100644
index 00000000000000..2b6b7140f896fc
--- /dev/null
+++ b/ports/ois/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "ois",
+  "version-string": "1.5",
+  "port-version": 2,
+  "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatiable with many systems and operating systems.",
+  "homepage": "https://wgois.github.io/OIS/"
+}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 79728d8629b3b9..6cd49d0c02ae9f 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1122,9 +1122,11 @@ opusfile:arm-uwp=fail
 opusfile:x64-uwp=fail
 orocos-kdl:arm-uwp=fail
 orocos-kdl:x64-uwp=fail
-osgearth:x64-osx=fail
 osgearth:x64-linux=fail
+osgearth:x64-osx=fail
 osgearth:x64-windows-static=fail
+osgearth:x64-windows=fail
+osgearth:x86-windows=fail
 paho-mqtt:arm-uwp=fail
 paho-mqtt:x64-uwp=fail
 pangomm:x64-osx=fail

From f432144a582d81a3be9cee9151500a2adda70801 Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Wed, 9 Dec 2020 12:35:02 -0800
Subject: [PATCH 2/2] Actually remove tcl:x64-osx

---
 scripts/ci.baseline.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 6cd49d0c02ae9f..b928fd8adfb40d 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1464,7 +1464,6 @@ tbb:x64-uwp=fail
 tcl:arm-uwp=fail
 tcl:arm64-windows=fail
 tcl:x64-uwp=fail
-tcl:x64-osx=fail
 teemo:x64-uwp=fail
 teemo:arm-uwp=fail
 teemo:arm64-windows=fail