microsoft · BillyONeal · Jul 14, 2021 · Jul 9, 2021 · Jul 12, 2021 · Jul 12, 2021
diff --git a/ports/graphqlparser/CONTROL b/ports/graphqlparser/CONTROL
diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         win-cmake.patch
         static-compile-fix.patch
+        remove-invalid-bison-directive.patch
 )
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")

diff --git a/ports/graphqlparser/remove-invalid-bison-directive.patch b/ports/graphqlparser/remove-invalid-bison-directive.patch
@@ -0,0 +1,13 @@
+diff --git a/parser.ypp b/parser.ypp
+index 2afbcac..baa9cab 100644
+--- a/parser.ypp
++++ b/parser.ypp
+@@ -7,8 +7,6 @@
+  * of patent rights can be found in the PATENTS file in the same directory.
+  */
+
+-%require "3"
+-
+ %skeleton "lalr1.cc"
+
+ %defines
diff --git a/ports/graphqlparser/vcpkg.json b/ports/graphqlparser/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "name": "graphqlparser",
+  "version-string": "0.7.0",
+  "port-version": 2,
+  "description": "A GraphQL query parser in C++ with C and C++ APIs"
+}
diff --git a/ports/msgpack11/CONTROL b/ports/msgpack11/CONTROL
diff --git a/ports/msgpack11/disable-werror.patch b/ports/msgpack11/disable-werror.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 080cefa..b73072a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,9 +9,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ add_library(msgpack11 STATIC msgpack11.cpp)
+ target_include_directories(msgpack11 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+ target_compile_options(msgpack11 PRIVATE -fno-rtti)
+-if(NOT MSVC)
+-  target_compile_options(msgpack11 PRIVATE -Wall -Wextra -Werror)
+-endif()
+ configure_file("msgpack11.pc.in" "msgpack11.pc" @ONLY)
+
+ if (MSGPACK11_BUILD_TESTS)
diff --git a/ports/msgpack11/portfile.cmake b/ports/msgpack11/portfile.cmake
@@ -8,19 +8,20 @@ vcpkg_from_github(
     PATCHES
         msvc.patch
         fix-additerator.patch
+        disable-werror.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-    	-DMSGPACK11_BUILD_TESTS=OFF
-    	-DMSGPACK11_BUILD_EXAMPLES=OFF
+        -DMSGPACK11_BUILD_TESTS=OFF
+        -DMSGPACK11_BUILD_EXAMPLES=OFF
 )
 
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/msgpack11/vcpkg.json b/ports/msgpack11/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "msgpack11",
+  "version": "0.0.10",
+  "port-version": 2,
+  "description": "msgpack11 is a tiny MsgPack library for C++11, providing MsgPack parsing and serialization.This library is inspired by json11.The API of msgpack11 is designed to be similar with json11.",
+  "homepage": "https://msgpack.org",
+  "dependencies": [
+    "gtest"
+  ]
+}
diff --git a/ports/opensubdiv/fix-version-search.patch b/ports/opensubdiv/fix-version-search.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake
+index 485e55e..1c98b91 100644
+--- a/cmake/FindOpenCL.cmake
++++ b/cmake/FindOpenCL.cmake
+@@ -177,7 +177,7 @@ if(_OPENCL_CPP_INCLUDE_DIRS)
+
+     if(EXISTS "${OPENCL_INCLUDE_DIRS}/CL/cl.h")
+
+-        file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_.*$")
++        file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_[0-9]+_[0-9]+.*$")
+
+         foreach(LINE ${LINES})
+
diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake
@@ -8,14 +8,15 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix_compile-option.patch
+        fix-version-search.patch
 )
 
 if(VCPKG_TARGET_IS_LINUX)
     message(
 "OpenSubdiv currently requires the following libraries from the system package manager:
-    xinerama
+    xinerama xxf86vm
 
-These can be installed on Ubuntu systems via sudo apt install libxinerama-dev")
+These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxxf86vm-dev")
 endif()
 
 vcpkg_find_acquire_program(PYTHON2)

diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opensubdiv",
   "version-semver": "3.4.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "An Open-Source subdivision surface library.",
   "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv",
   "supports": "!arm & !uwp"

diff --git a/ports/qt5-wayland/CONTROL b/ports/qt5-wayland/CONTROL
diff --git a/ports/qt5-wayland/portfile.cmake b/ports/qt5-wayland/portfile.cmake
@@ -1,6 +1,8 @@
-#Will not build on Windows! 
+#Will not build on Windows!
 message(WARNING "This port is just a placeholder until the required wayland libraries have been added into VCPKG! \
             As such the build will most likely fail until your system has the required wayland libraries installed (untested)")
-
+message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with
+sudo apt install libwayland-dev
+on Ubuntu systems.")
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation()
+qt_submodule_installation()
diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "qt5-wayland",
+  "version-string": "5.15.2",
+  "port-version": 2,
+  "description": "Qt5 wayland Module;",
+  "supports": "linux",
+  "dependencies": [
+    {
+      "name": "qt5-base",
+      "default-features": false
+    }
+  ]
+}
diff --git a/ports/qtwayland/portfile.cmake b/ports/qtwayland/portfile.cmake
@@ -1,6 +1,10 @@
 set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
+message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with
+sudo apt install libwayland-dev
+on Ubuntu systems.")
+
 set(${PORT}_PATCHES)
 
 set(TOOL_NAMES qtwaylandscanner)

diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtwayland",
   "version-semver": "6.1.2",
+  "port-version": 2,
   "description": "A toolbox for making Qt based Wayland compositors",
   "homepage": "https://www.qt.io/",
   "supports": "!windows",

diff --git a/ports/soem/CONTROL b/ports/soem/CONTROL
diff --git a/ports/soem/disable-werror.patch b/ports/soem/disable-werror.patch
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1778965..4c481b7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,21 +13,18 @@ set(BUILD_TESTS TRUE)
+
+ if(WIN32)
+   set(OS "win32")
+-  find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
+-  find_library(winpcap_LIBRARY NAMES wpcap)
+-  find_library(packet_LIBRARY NAMES packet)
+-  include_directories(${winpcap_INCLUDE_DIRS})
++  find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
++  find_library(winpcap_LIBRARY NAMES wpcap)
++  find_library(packet_LIBRARY NAMES packet)
++  include_directories(${winpcap_INCLUDE_DIRS})
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  /WX")
+-  set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
++  set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
+ elseif(UNIX AND NOT APPLE)
+   set(OS "linux")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
+   set(OS_LIBS pthread rt)
+ elseif(APPLE)
+   # This must come *before* linux or MacOSX will identify as Unix.
+   set(OS "macosx")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
+   set(OS_LIBS pthread pcap)
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
+   set(OS "rtk")
+@@ -36,10 +33,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
+   include_directories(oshw/${OS}/${ARCH})
+   file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c)
+   set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format")
+   set(OS_LIBS "-Wl,--start-group -l${BSP} -l${ARCH} -lkern -ldev -lsio -lblock -lfs -lusb -llwip -leth -li2c -lrtc -lcan -lnand -lspi -lnor -lpwm -ladc -ltrace -lc -lm -Wl,--end-group")
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rtems")
+   message("Building for RTEMS")
diff --git a/ports/soem/portfile.cmake b/ports/soem/portfile.cmake
@@ -8,8 +8,9 @@ vcpkg_from_github(
     REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0
     SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817
     HEAD_REF master
-    PATCHES 
+    PATCHES
         winpcap.patch
+        disable-werror.patch
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/soem/vcpkg.json b/ports/soem/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "soem",
+  "version-string": "1.4.0",
+  "port-version": 2,
+  "description": "Simple Open Source EtherCAT Master",
+  "homepage": "https://github.com/OpenEtherCATsociety/SOEM",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "winpcap",
+      "platform": "windows"
+    }
+  ]
+}
diff --git a/ports/sophus/CONTROL b/ports/sophus/CONTROL
diff --git a/ports/sophus/disable-werror.patch b/ports/sophus/disable-werror.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 844f304..952915b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,11 +16,11 @@ set(CMAKE_CXX_STANDARD 14)
+ IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    SET(CMAKE_CXX_FLAGS_DEBUG  "-O0 -g")
+    SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
+-   SET(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra -Wno-deprecated-register -std=c++14 -stdlib=libc++ -Wno-deprecated-register")
++   SET(CMAKE_CXX_FLAGS "-std=c++14 -stdlib=libc++")
+ ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    SET(CMAKE_CXX_FLAGS_DEBUG  "-O0 -g")
+    SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
+-   SET(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra -std=c++14 -Wno-deprecated-declarations -ftemplate-backtrace-limit=0")
++   SET(CMAKE_CXX_FLAGS "-std=c++14 -ftemplate-backtrace-limit=0")
+    SET(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_DEBUG} --coverage -fno-inline -fno-inline-small-functions -fno-default-inline")
+    SET(CMAKE_EXE_LINKER_FLAGS_COVERAGE "${CMAKE_EXE_LINKER_FLAGS_DEBUG} --coverage")
+    SET(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} --coverage")
diff --git a/ports/sophus/portfile.cmake b/ports/sophus/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix_cmakelists.patch
+        disable-werror.patch
 )
 
 vcpkg_configure_cmake(
@@ -20,4 +21,4 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/ RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/sophus/vcpkg.json b/ports/sophus/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "sophus",
+  "version": "1.0.0",
+  "port-version": 7,
+  "description": "Lie group library for C++",
+  "homepage": "https://github.com/strasdat/Sophus",
+  "dependencies": [
+    "ceres",
+    "eigen3",
+    "suitesparse"
+  ]
+}
diff --git a/ports/tfhe/CONTROL b/ports/tfhe/CONTROL
diff --git a/ports/tfhe/portfile.cmake b/ports/tfhe/portfile.cmake
@@ -10,6 +10,9 @@ vcpkg_from_github(
         mac-fix.patch
 )
 
+# Workaround for https://github.com/tfhe/tfhe/issues/246
+vcpkg_replace_string("${SOURCE_PATH}/src/CMakeLists.txt" "-Wall -Werror" "")
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/src
     PREFER_NINJA
@@ -20,4 +23,4 @@ vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/tfhe/vcpkg.json b/ports/tfhe/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "tfhe",
+  "version-semver": "1.0.1",
+  "port-version": 2,
+  "description": "TFHE is open-source software distributed under the terms of the Apache 2.0 license.",
+  "homepage": "https://github.com/tfhe/tfhe",
+  "supports": "!windows"
+}
diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
@@ -3,7 +3,7 @@
 #
 variables:
   windows-pool: 'PrWin-2021-07-09'
-  linux-pool: 'PrLin-2021-06-11'
+  linux-pool: 'PrLin-2021-07-13'
   osx-pool: 'PrOsx-2021-04-16'
 
 stages:

diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1
@@ -225,8 +225,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id
 $VM = Set-AzVMSourceImage `
   -VM $VM `
   -PublisherName 'Canonical' `
-  -Offer 'UbuntuServer' `
-  -Skus '18.04-LTS' `
+  -Offer '0001-com-ubuntu-server-focal' `
+  -Skus '20_04-lts' `
   -Version latest
 
 $VM = Set-AzVMBootDiagnostic -VM $VM -Disable