Merge branch 'master' into master

microsoft · Dec 29, 2022 · 56f8a9c · 56f8a9c
2 parents 8bd6346 + ecce051
commit 56f8a9c
Show file tree

Hide file tree

Showing 153 changed files with 1,413 additions and 1,081 deletions.
diff --git a/ports/ableton/no-werror.patch b/ports/ableton/no-werror.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake_include/ConfigureCompileFlags.cmake b/cmake_include/ConfigureCompileFlags.cmake
+index 63bdfec..80879f9 100644
+--- a/cmake_include/ConfigureCompileFlags.cmake
++++ b/cmake_include/ConfigureCompileFlags.cmake
+@@ -25,7 +25,6 @@ if(UNIX)
+     set(build_flags_COMMON_LIST
+       ${build_flags_COMMON_LIST}
+       "-Weverything"
+-      "-Werror"
+       "-Wno-c++98-compat"
+       "-Wno-c++98-compat-pedantic"
+       "-Wno-deprecated"
+@@ -44,7 +43,6 @@ if(UNIX)
+   elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+     set(build_flags_COMMON_LIST
+       ${build_flags_COMMON_LIST}
+-      "-Werror"
+       "-Wno-multichar"
+     )
+   endif()
+@@ -87,7 +85,6 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
+     ${build_flags_COMMON_LIST}
+     "/MP"
+     "/Wall"
+-    "/WX"
+     "/EHsc"
+
+     #############################
diff --git a/ports/ableton/portfile.cmake b/ports/ableton/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
         replace_local_asiostandalone_by_vcpkg_asio.patch
         replace_asiosdk_download_by_vcpkg_asiosdk.patch
         replace_local_catch_by_vcpkg_catch2.patch
+        no-werror.patch
 )
 # Note that the dependencies ASIO and ASIOSDK are completely different things:
 # -ASIO (ASyncronous IO) is a cross-platform C++ library for network and low-level I/O programming

diff --git a/ports/ableton/vcpkg.json b/ports/ableton/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ableton",
   "version": "3.0.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.",
   "homepage": "https://www.ableton.com/en/link/",
   "documentation": "http://ableton.github.io/link/",

diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ace",
   "version": "7.0.11",
+  "port-version": 1,
   "maintainers": "Johnny Willemsen <[email protected]>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://github.com/DOCGroup/ACE_TAO",
@@ -16,7 +17,8 @@
       "description": "The ACE ORB"
     },
     "wchar": {
-      "description": "Enable extra wide char functions in ACE"
+      "description": "Enable extra wide char functions in ACE",
+      "supports": "!osx"
     },
     "xml": {
       "description": "Enable XML features in ACE"

diff --git a/ports/air-ctl/portfile.cmake b/ports/air-ctl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  inie0722/CTL
-    REF fc9129720646b7e4e2bda9565aff8b2f447fbc2c #v1.1.2
-    SHA512 23cd6d17997ab6bba8fba117fc0bd5a50fd4a37a2f2ce11164596b19fe3284536dbe19108ca27576842fdf808c40961c471c898844fe74580d3d6d1877833920
+    REF a19d7db16232b160901cc65b8398ece2526b5e41 #v1.1.2
+    SHA512 867f3c07073a9c9ce60d95d8c6eff37e49bd10d45fd93891cbdd7b6e77e5302048b7b054b597d382f1f581636a8b3042291d87a9eadd7f2b33c4c532dc23ae5d
     HEAD_REF master
 )
 

diff --git a/ports/air-ctl/vcpkg.json b/ports/air-ctl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "air-ctl",
   "version": "1.1.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "C template container library",
   "homepage": "https://github.com/inie0722/CTL",
   "license": "BSL-1.0",

diff --git a/ports/argtable2/0003-add-dependence-getopt.patch b/ports/argtable2/0003-add-dependence-getopt.patch
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a4bd5b..7dc50f1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ endif(COMMAND cmake_policy)
+
+ OPTION( HAVE_GETOPT_H "Have the getopt library" 0 )
+ IF( HAVE_GETOPT_H )
++	find_package(unofficial-getopt-win32 REQUIRED)
+ 	ADD_DEFINITIONS( -DHAVE_GETOPT_H )
+ ENDIF( HAVE_GETOPT_H )
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 03e112c..8c58082 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,7 +1,12 @@
+ include(GNUInstallDirs)
+
+ IF( WIN32 )
++	if(HAVE_GETOPT_H)
++	ADD_LIBRARY( argtable2 arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_str.c argtable2.c argtable2.h)
++	target_link_libraries(argtable2 PRIVATE unofficial::getopt-win32::getopt)
++	else()
+ 	ADD_LIBRARY( argtable2 arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
++	endif()
+ ELSE( WIN32 )
+ 	ADD_LIBRARY( argtable2 arg_date.c arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_rex.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
+ ENDIF( WIN32 )
+diff --git a/src/argtable2.c b/src/argtable2.c
+index c4d210c..1bc0a3e 100644
+--- a/src/argtable2.c
++++ b/src/argtable2.c
+@@ -46,7 +46,7 @@ USA.
+ #endif
+
+ #include "argtable2.h"
+-#include "./getopt.h"
++//#include "./getopt.h"
+
+ static
+ void arg_register_error(struct arg_end *end, void *parent, int error, const char *argval)
diff --git a/ports/argtable2/portfile.cmake b/ports/argtable2/portfile.cmake
@@ -9,18 +9,23 @@ vcpkg_from_sourceforge(
     PATCHES
         0001-fix-install-dirs.patch
         0002-include-correct-headers.patch
+        0003-add-dependence-getopt.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+set(HAVE_GETOPT_H "")
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+   set(HAVE_GETOPT_H 1)
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCMAKE_DEBUG_POSTFIX=d
+        -DHAVE_GETOPT_H=${HAVE_GETOPT_H}
 )
 
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/argtable2/vcpkg.json b/ports/argtable2/vcpkg.json
@@ -1,8 +1,19 @@
 {
   "name": "argtable2",
-  "version-string": "2.13",
-  "port-version": 9,
+  "version": "2.13",
+  "port-version": 10,
   "description": "Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.",
   "homepage": "http://argtable.sourceforge.net",
-  "supports": "!uwp"
+  "license": "LGPL-2.0-only",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "getopt",
+      "platform": "windows & !mingw"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/argtable3/Fix-dependence-getopt.patch b/ports/argtable3/Fix-dependence-getopt.patch
@@ -0,0 +1,16 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2e0b519..6b455dd 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -79,6 +79,11 @@ endif()
+ add_library(${ARGTABLE3_PROJECT_NAME}::argtable3 ALIAS argtable3)
+ target_include_directories(argtable3 PRIVATE ${PROJECT_SOURCE_DIR}/src)
+
++if(NOT ARGTABLE3_REPLACE_GETOPT)
++  find_package(unofficial-getopt-win32 REQUIRED)
++  target_link_libraries(argtable3 PRIVATE unofficial::getopt-win32::getopt)
++endif()
++
+ set_target_properties(argtable3 PROPERTIES
+   VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
+   SOVERSION ${PROJECT_VERSION_MAJOR}
diff --git a/ports/argtable3/portfile.cmake b/ports/argtable3/portfile.cmake
@@ -4,14 +4,21 @@ vcpkg_from_github(
     REF 7704006f3cbb556e11da80a5b97469075a32892e # 3.2.1 + minor patches including ARGTABLE3_ENABLE_EXAMPLES support
     SHA512 c51aa0a33a247c3801e36ca5d9523acefa31f21a34c1e86965a39290c1b437785e4d7e0ae80a65d811803b8fcbbc3a96ba3d6aefaea9bda15abc0f38bd1f45cc
     HEAD_REF master
+    PATCHES Fix-dependence-getopt.patch
 )
 
+set(ARGTABLE3_REPLACE_GETOPT ON)
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+   set(ARGTABLE3_REPLACE_GETOPT OFF)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DARGTABLE3_ENABLE_CONAN=OFF
         -DARGTABLE3_ENABLE_TESTS=OFF
         -DARGTABLE3_ENABLE_EXAMPLES=OFF
+        -DARGTABLE3_REPLACE_GETOPT=${ARGTABLE3_REPLACE_GETOPT}
 )
 
 vcpkg_cmake_install()

diff --git a/ports/argtable3/vcpkg.json b/ports/argtable3/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "argtable3",
   "version": "3.2.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options",
   "homepage": "https://www.argtable.org/",
-  "license": "BSD-2-Clause-FreeBSD",
+  "license": "BSD-2-Clause-NetBSD AND TCL",
   "dependencies": [
+    {
+      "name": "getopt",
+      "platform": "windows & !mingw"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true

diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake
@@ -1,10 +1,12 @@
 # avcpp doesn't export any symbols
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO h4tr3d/avcpp
-    REF v2.1.0
+    REF "v${VERSION}"
     SHA512 1e66afcf9a1f1085001aab9eb270cbbc6930cc42e60567300676d220120c421c44d24c7aeccb0b5c3ebd9de574ca1efbc67a29c681e3e11a796c32cc370069e4
     HEAD_REF master
     PATCHES

diff --git a/ports/aws-crt-cpp/no-werror.patch b/ports/aws-crt-cpp/no-werror.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a1a7964..7a5b1a5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -293,9 +293,9 @@ if (CMAKE_BUILD_TYPE STREQUAL "" OR CMAKE_BUILD_TYPE MATCHES Debug)
+     target_compile_definitions(${PROJECT_NAME} PRIVATE "-DDEBUG_BUILD")
+     #set extra warning flags for debug build
+     if (MSVC)
+-        target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /wd4068)
++        target_compile_options(${PROJECT_NAME} PRIVATE /W4 /wd4068)
+     else ()
+-        target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)
++        target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic)
+     endif ()
+ endif ()
+
diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     PATCHES
         fix-cmake-target-path.patch
         fix-ios-build.patch
+        no-werror.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)

diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "aws-crt-cpp",
   "version": "0.15.1",
-  "port-version": 3,
-  "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
+  "port-version": 4,
+  "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.",
   "homepage": "https://github.com/awslabs/aws-crt-cpp",
+  "license": "Apache-2.0",
   "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-auth",

diff --git a/ports/c9y/portfile.cmake b/ports/c9y/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rioki/c9y
-    REF v0.5.1
-    SHA512 d8ccd9a61521e3cbe1881129bcdb4817cad6b80c8bebb67024c799be790bd4abecf9427f0ba62f991c156a979742aa7a8fdfb477a7619524615e2a2aed6e774f
+    REF v0.6.0
+    SHA512 20203771ca88c69a8f77010ad79ac5fe90b9e60457cb3a037106241622fd7b6c1ef409055c969dddbe7575816947d95cbe5e7c291bad557c358cc43d0db17c2d
     )
 
 vcpkg_cmake_configure(

diff --git a/ports/c9y/vcpkg.json b/ports/c9y/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "c9y",
-  "version-semver": "0.5.1",
+  "version-semver": "0.6.0",
   "description": "Concurency",
   "homepage": "https://github.com/rioki/c9y",
   "license": "MIT",

diff --git a/ports/chakracore/fix-debug-linux-build.patch b/ports/chakracore/fix-debug-linux-build.patch