[vcpkg macos ci] Switch to using our own base boxes, to fix bringing up mac machines (#13619)

* [vcpkg ci:osx] Remove brew install

* add instructions for creating a new vagrant box

* fix the vagrant scripts for the new box

* finish fixing the setup

* [mecab jxrlib] fix ports for CI

mecab needed to use an actual ref that wasn't master,
and jxrlib needed a patch for xcode 12 CLTs.

Additionally, this fixes the mecab version to be a date, the date of the last commit,
since `1.0` is not the correct version (mecab doesn't have released versions)

* [many ports] fix compile with Xcode 12 CLTs

This mostly means fixing errors on implicit-function-declaration,
and removing some Werrors
* alac-decoder
* apr
* argtable2
* arrow
* hyperscan
* mcpp
* minizip
* mosquitto
* stormlib

* [many ports] even more Xcode 12 CLT fixes

* [jxrlib darknet] fix the last ports! (hopefully)

* CRs, plus minor wip changes to osx scripts

5 files changed, 57 insertions, 34 deletions

diff --git a/ports/licensepp/use-old-pem-pack.patch b/ports/licensepp/0001-use-old-pem-pack.patch
index d7c05edae..37656f613 100644
--- a/ports/licensepp/use-old-pem-pack.patch
+++ b/ports/licensepp/0001-use-old-pem-pack.patch
@@ -1,3 +1,16 @@
+From d1b446c7a69344cb53be6692cd76186960a1428d Mon Sep 17 00:00:00 2001
+From: Nicole Mazzuca <mazzucan@outlook.com>
+Date: Wed, 23 Sep 2020 09:40:32 -0700
+Subject: [PATCH 1/2] use old pem pack
+
+In this commit: https://github.com/noloader/cryptopp-pem/commit/0cfa60820ec1d5e8ac4d77a0a8786ee43e9a2400
+the parameter orders have been changed.
+But we cannot update pem-pack to this version or newer because it
+wont compile with the current version of cryptopp in vcpkg.
+---
+ src/external/Ripe.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/src/external/Ripe.cc b/src/external/Ripe.cc
 index 6ff9561..a1d1eec 100644
 --- a/src/external/Ripe.cc
@@ -11,3 +24,6 @@ index 6ff9561..a1d1eec 100644
          }
          snk.MessageEnd();
      }
+-- 
+2.24.3 (Apple Git-128)
+
diff --git a/ports/licensepp/0002-fix-cmake.patch b/ports/licensepp/0002-fix-cmake.patch
new file mode 100644
index 000000000..5f13d03e1
--- /dev/null
+++ b/ports/licensepp/0002-fix-cmake.patch
@@ -0,0 +1,38 @@
+From 5a7cbbe8423ee3daf533bcc1fefa7d1f1315634c Mon Sep 17 00:00:00 2001
+From: Nicole Mazzuca <mazzucan@outlook.com>
+Date: Wed, 23 Sep 2020 09:43:37 -0700
+Subject: [PATCH 2/2] fix cmake
+
+Remove this patch if https://github.com/amrayn/licensepp/pull/33 is merged
+---
+ CMakeLists.txt | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2c39d1..0d49632 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,10 +35,8 @@ if (APPLE)
+     endif()
+ endif()
+ 
+-if(MSVC)
+-    list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 ")
+-else()
+-    list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 -Wall -Werror ")
++if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall")
+ endif()
+ 
+ # Check for cryptopp (static)
+@@ -73,6 +71,7 @@ endif()
+ set_target_properties (licensepp-lib PROPERTIES
+     VERSION ${LICENSEPP_SOVERSION}
+ )
++target_include_directories(licensepp-lib PUBLIC $<INSTALL_INTERFACE:include>)
+ target_link_libraries (licensepp-lib
+     ${CRYPTOPP_LIBRARIES}
+ )
+-- 
+2.24.3 (Apple Git-128)
+
diff --git a/ports/licensepp/CONTROL b/ports/licensepp/CONTROL
index c21d13b4a..b9bf20b7b 100644
--- a/ports/licensepp/CONTROL
+++ b/ports/licensepp/CONTROL
@@ -1,5 +1,6 @@
 Source: licensepp

 Version: 2020-05-19

+Port-Version: 1

 Description: Cross platform software licensing library

 Build-Depends: cryptopp[pem-pack]

 Supports: !uwp

diff --git a/ports/licensepp/fix-cmake.patch b/ports/licensepp/fix-cmake.patch
deleted file mode 100644
index f421b6d92..000000000
--- a/ports/licensepp/fix-cmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git "a/CMakeLists.txt" "b/CMakeLists.txt"
-index b2c39d1..24a6866 100644
---- "a/CMakeLists.txt"
-+++ "b/CMakeLists.txt"
-@@ -35,10 +35,8 @@ if (APPLE)
-     endif()
- endif()
- 
--if(MSVC)
--    list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 ")
--else()
--    list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 -Wall -Werror ")
-+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall -Werror")
- endif()
- 
- # Check for cryptopp (static)
-@@ -73,6 +71,7 @@ endif()
- set_target_properties (licensepp-lib PROPERTIES
-     VERSION ${LICENSEPP_SOVERSION}
- )
-+target_include_directories (licensepp-lib PUBLIC $<INSTALL_INTERFACE:include>)
- target_link_libraries (licensepp-lib
-     ${CRYPTOPP_LIBRARIES}
- )
diff --git a/ports/licensepp/portfile.cmake b/ports/licensepp/portfile.cmake
index 171b26fcc..aa4d00969 100644
--- a/ports/licensepp/portfile.cmake
+++ b/ports/licensepp/portfile.cmake
@@ -9,15 +9,8 @@ vcpkg_from_github(
     SHA512 2161575815d8ff49110d7c2823662ba30d9f1ca2eb6be6dad1ee0807fb3fa9f28483839a133c9d380035254df7c452f8d6fa7f17fd4f29acd8b9bfbbda059291

     HEAD_REF master

     PATCHES

-        # TODO:

-        # In this commit, https://github.com/noloader/cryptopp-pem/commit/0cfa60820ec1d5e8ac4d77a0a8786ee43e9a2400

-        # the parameter orders have been changed.

-        # But we can not update pem-pack to this version or newer because it

-        # won't compile with the current version of cryptopp in `vcpkg`.

-        # Remove this patch in the future.

-        use-old-pem-pack.patch

-        # TODO: Remove this patch if https://github.com/amrayn/licensepp/pull/33 was merged.

-        fix-cmake.patch

+        0001-use-old-pem-pack.patch

+        0002-fix-cmake.patch

 )

 

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake DESTINATION ${SOURCE_PATH}/cmake)