[macos ci] update 2021-07-27 (#19207)

* update 2021-07-27

macOS -> 11.5.1, XCode -> 12.5.1

* update azure-pipelines

* update sha of macfuse

* change how macos-ci-base works

* fix build errors

* fix itpp:linux

* more fixes

* remove tab

* allow version changes in all the remove/rename-version patches

* fix libunistring for real

* robert CR

ports/azure-iot-sdk-c/portfile.cmake

@@ -10,6 +10,7 @@ if("public-preview" IN_LIST FEATURES)
         PATCHES
             improve-external-deps.patch
             fix-cmake.patch
+            remove-werror.patch
     )
 else()
     vcpkg_from_github(
@@ -21,6 +22,7 @@ else()
         PATCHES
             improve-external-deps.patch
             fix-cmake.patch
+            remove-werror.patch
     )
 endif()
 

ports/azure-iot-sdk-c/remove-werror.patch

@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,14 +34,11 @@
+ if (MSVC)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232")
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232")
+     # Make warning as error
+-    add_definitions(/WX)
+ else()
+     # Make warning as error
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ endif()
+
+ IF(WIN32)
+     # windows needs this define
+     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+

ports/azure-iot-sdk-c/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "azure-iot-sdk-c",
   "version-date": "2020-12-09",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
   "homepage": "https://github.com/Azure/azure-iot-sdk-c",
   "dependencies": [

ports/coroutine/add-noexcept-to-frame.patch

@@ -0,0 +1,13 @@
+--- a/interface/coroutine/frame.h
++++ a/interface/coroutine/frame.h
+@@ -119,8 +119,8 @@
+         return *this;
+     }
+     // 17.12.3.2, export/import
+-    static /*constexpr*/ coroutine_handle from_address(void* _Addr) {
++    static /*constexpr*/ coroutine_handle from_address(void* _Addr) noexcept {
+         coroutine_handle _Result{};
+         _Result._Ptr = reinterpret_cast<portable_coro_prefix*>(_Addr);
+         return _Result;
+     }
+

ports/coroutine/portfile.cmake

@@ -10,7 +10,9 @@ vcpkg_from_github(
     REF             1.5.0
     SHA512          61b91fdc641b6905b884e99c5bf193ec2cf6962144ab3baafdb9432115757d96f3797f116b30356f0d21417b23082bc908f75042721caeab3329c4910b654594
     HEAD_REF        master
-    PATCHES fix-errorC7651.patch
+    PATCHES
+        fix-errorC7651.patch
+        add-noexcept-to-frame.patch
 )
 
 vcpkg_configure_cmake(

ports/coroutine/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "coroutine",
   "version-string": "1.5.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "C++ 20 Coroutines helper/example library",
   "homepage": "https://github.com/luncliff/coroutine",
   "supports": "!uwp",

ports/itpp/portfile.cmake

@@ -7,10 +7,12 @@ vcpkg_from_sourceforge(
     FILENAME "itpp-${ITPP_VERSION}.tar.bz2"
     SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd
     PATCHES 
-       msvc2013.patch
-       fix-uwp.patch
-       fix-linux.patch
+        msvc2013.patch
+        fix-uwp.patch
+        fix-linux.patch
+        rename-version.patch
 )
+file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}

ports/itpp/rename-version.patch

@@ -0,0 +1,12 @@
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -25,6 +25,6 @@
+
+-PV=$(cat VERSION | cut -d' ' -f1)
+-LV=$(cat VERSION | cut -d' ' -f2)
+-if test "x$(cat VERSION | cut -d' ' -f3)" = "xsvn"; then
++PV=$(cat VERSION.txt | cut -d' ' -f1)
++LV=$(cat VERSION.txt | cut -d' ' -f2)
++if test "x$(cat VERSION.txt | cut -d' ' -f3)" = "xsvn"; then
+     if test -d ".git/svn"; then
+         REV=$(LC_ALL=C git svn find-rev HEAD)

ports/itpp/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "itpp",
   "version-semver": "4.3.1",
-  "port-version": 6,
+  "port-version": 7,
   "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.",
   "homepage": "http://itpp.sourceforge.net"
 }

ports/libodb-boost/CONTROL

@@ -1,4 +1,5 @@
 Source: libodb-boost
-Version: 2.4.0-3
+Version: 2.4.0
+Port-Version: 4
 Description: Description: Boost support for the ODB ORM library
 Build-Depends: libodb

ports/libodb-boost/portfile.cmake

@@ -8,6 +8,7 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
+file(REMOVE "${SOURCE_PATH}/version")
 
 file(COPY
   ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt

ports/libodb-mysql/portfile.cmake

@@ -11,6 +11,7 @@ vcpkg_extract_source_archive_ex(
         adapter_mysql_8.0.patch
         fix-redefinttion.patch
 )
+file(REMOVE "${SOURCE_PATH}/version")
 
 file(COPY
   ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt

ports/libodb-mysql/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "libodb-mysql",
   "version": "2.4.0",
-  "port-version": 8,
+  "port-version": 9,
   "description": "MySQL support for the ODB ORM library",
   "homepage": "https://www.codesynthesis.com/products/odb/",
   "dependencies": [

ports/libodb-pgsql/CONTROL

@@ -1,5 +1,6 @@
 Source: libodb-pgsql
-Version: 2.4.0-3
+Version: 2.4.0
+Port-Version: 4
 Homepage: https://www.codesynthesis.com/products/odb/
 Description: Description: PostgreSQL support for the ODB ORM library
 Build-Depends: libodb, libpq

ports/libodb-pgsql/portfile.cmake

@@ -8,6 +8,7 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
+file(REMOVE "${SOURCE_PATH}/version")
 
 file(COPY
   ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt

ports/libodb-sqlite/CONTROL

@@ -1,6 +1,6 @@
 Source: libodb-sqlite
 Version: 2.4.0
-Port-Version: 7
+Port-Version: 8
 Homepage: https://www.codesynthesis.com/products/odb/
 Description: Sqlite support for the ODB ORM library
 Build-Depends: libodb, sqlite3

ports/libodb-sqlite/portfile.cmake

@@ -8,6 +8,7 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
+file(REMOVE "${SOURCE_PATH}/version")
 
 file(COPY
   ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
@@ -30,4 +31,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 vcpkg_copy_pdbs()
 
-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)

ports/libodb/portfile.cmake

@@ -10,6 +10,7 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
+file(REMOVE "${SOURCE_PATH}/version")
 
 file(COPY
   ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt

ports/libodb/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "libodb",
   "version": "2.4.0",
-  "port-version": 7,
+  "port-version": 8,
   "description": "ODB library, base runtime for the ODB ORM solution",
   "homepage": "https://www.codesynthesis.com/products/odb/"
 }

ports/libunistring/fix-for-automake-1.16.4.patch

@@ -0,0 +1,13 @@
+--- a/m4/init-package-version.m4
++++ b/m4/init-package-version.m4
+@@ -82,9 +82,9 @@
+     [AC_SUBST([PACKAGE], [$1])
+      AC_SUBST([VERSION], [$2])
+     ])
+   m4_define([AM_INIT_AUTOMAKE],
+     m4_defn([gl_RPL_INIT_AUTOMAKE]))
+ ])
+-m4_define([gl_INIT_DUMMY], [])
++m4_define([gl_INIT_DUMMY], [dummy])
+ AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
+   m4_ifval([$2],

ports/libunistring/portfile.cmake

@@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     REF ${LIBUNISTRING_VERSION}
+    PATCHES fix-for-automake-1.16.4.patch # automake 1.16.4 uses m4_ifset instead of m4_ifdef
 )
 
 vcpkg_configure_make(

ports/libunistring/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "libunistring",
   "version": "0.9.10",
+  "port-version": 1,
   "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.",
   "homepage": "https://www.gnu.org/software/libunistring/",
   "supports": "!windows",

ports/nanodbc/portfile.cmake

@@ -8,7 +8,9 @@ vcpkg_from_github(
     REF 7404a4dd7697e188df5724ab95a7553d2fc404eb # v2.13.0
     SHA512 35ca098e783d771f3df611bce84e9b8207a6a5b72c492d2f3909977bc91a7c22bb262c34768b0d97ebfbdf12eeda0214064a8ea171e7bdda7b759f93ff346f45
     HEAD_REF master
+    PATCHES rename-version.patch
 )
+file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
 
 if(DEFINED NANODBC_ODBC_VERSION)
     set(NANODBC_ODBC_VERSION -DNANODBC_ODBC_VERSION=${NANODBC_ODBC_VERSION})

ports/nanodbc/rename-version.patch

@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,8 +20,8 @@
+ ########################################
+ ## nanodbc version
+ ########################################
+-file(STRINGS VERSION NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+")
++file(STRINGS "VERSION.txt" NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+")
+ string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" NANODBC_VERSION_MAJOR "${NANODBC_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" NANODBC_VERSION_MINOR "${NANODBC_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" NANODBC_VERSION_PATCH "${NANODBC_VERSION}")
+ message(STATUS "nanodbc version: ${NANODBC_VERSION}")
+

ports/nanodbc/vcpkg.json

@@ -0,0 +1,13 @@
+{
+  "name": "nanodbc",
+  "version": "2.13.0",
+  "port-version": 4,
+  "description": "A small C++ wrapper for the native C ODBC API.",
+  "homepage": "https://github.com/nanodbc/nanodbc",
+  "dependencies": [
+    {
+      "name": "unixodbc",
+      "platform": "!windows"
+    }
+  ]
+}

ports/plplot/portfile.cmake

@@ -25,10 +25,11 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DENABLE_tcl=OFF
-        -DPL_HAVE_QHULL=OFF
+        -DENABLE_d=OFF
         -DENABLE_qt=OFF
-        -DPLPLOT_USE_QT5=OFF
         -DENABLE_ocaml=OFF
+        -DPL_HAVE_QHULL=OFF
+        -DPLPLOT_USE_QT5=OFF
         -DPL_DOUBLE=ON
         -DPLD_wxwidgets=${BUILD_with_wxwidgets}
         -DENABLE_DYNDRIVERS=OFF

ports/plplot/vcpkg.json

@@ -0,0 +1,20 @@
+{
+  "name": "plplot",
+  "version-string": "5.13.0",
+  "port-version": 10,
+  "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.",
+  "dependencies": [
+    "bzip2",
+    "freetype",
+    "libpng",
+    "zlib"
+  ],
+  "features": {
+    "wxwidgets": {
+      "description": "plplot wxwidgets module",
+      "dependencies": [
+        "wxwidgets"
+      ]
+    }
+  }
+}

ports/selene/portfile.cmake

@@ -9,6 +9,7 @@ vcpkg_from_github(
     PATCHES
         disable_x86_intrinsics_on_arm.patch
         tiff-deprecated-typedefs.patch
+        trivial-pixel.patch
 )
 
 vcpkg_check_features(

ports/selene/trivial-pixel.patch

@@ -0,0 +1,23 @@
+--- a/selene/img/pixel/Pixel.hpp
++++ b/selene/img/pixel/Pixel.hpp
+@@ -45,6 +45,6 @@
+   constexpr Pixel() noexcept = default;  ///< Default constructor. Pixel values are uninitialized.
+
+-  template <typename... Args, typename = std::enable_if_t<sizeof...(Args) == nr_channels_>>
+-  constexpr Pixel(Args... args) noexcept;
++  template <typename Arg1, typename... Args, typename = std::enable_if_t<sizeof...(Args) + 1 == nr_channels_>>
++  constexpr Pixel(Arg1 arg1, Args... args) noexcept;
+
+   constexpr explicit Pixel(const std::array<T, nr_channels>& arr) noexcept;
+@@ -216,8 +216,8 @@
+ template <typename T, std::size_t nr_channels_, PixelFormat pixel_format_>
+-template <typename... Args, typename>
+-constexpr Pixel<T, nr_channels_, pixel_format_>::Pixel(Args... args) noexcept
+-    : data_{{static_cast<T>(args)...}}
++template <typename Arg1, typename... Args, typename>
++constexpr Pixel<T, nr_channels_, pixel_format_>::Pixel(Arg1 arg1, Args... args) noexcept
++    : data_{{static_cast<T>(arg1), static_cast<T>(args)...}}
+ {
+   static_assert(std::is_trivial<Pixel<T, nr_channels_, pixel_format_>>::value, "Pixel type is not trivial");
+   static_assert(std::is_standard_layout<Pixel<T, nr_channels_, pixel_format_>>::value,
+                 "Pixel type is not standard layout");

ports/selene/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "selene",
   "version": "0.3.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "A C++17 image representation, processing and I/O library.",
   "homepage": "https://github.com/kmhofmann/selene",
   "dependencies": [

ports/sentencepiece/portfile.cmake

@@ -8,7 +8,9 @@ vcpkg_from_github(
     REF v0.1.82
     SHA512   669d6a1e86c44587d725b1e93f11b707e510a180dec08afb79268158f5de009cb20ffccc72c501c84f032360e52e53ae227504f3538f59978629433e0d6fcf65
     HEAD_REF master
+    PATCHES rename-version.patch
 )
+file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -29,4 +31,4 @@ endif()
 
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
 
-vcpkg_copy_pdbs()
+vcpkg_copy_pdbs()

ports/sentencepiece/rename-version.patch

@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,4 +15,4 @@
+ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+-file(STRINGS "VERSION" SPM_VERSION)
++file(STRINGS "VERSION.txt" SPM_VERSION)
+ message(STATUS "VERSION: ${SPM_VERSION}")
+ project(sentencepiece VERSION ${SPM_VERSION} LANGUAGES CXX)