From 2455140d99b4f215f24b7b600417f8c5834ded07 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 11 Dec 2018 22:34:47 -0500 Subject: [PATCH 01/63] Upgrade gRPC to 1.16.1. --- ports/grpc/CONTROL | 2 +- ports/grpc/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 7045bd44460411..d2b0f44e8a9be6 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.14.1 +Version: 1.16.1 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp) Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 537fa32ae0a031..b0dca5a9357f1f 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.14.1 - SHA512 f0e4fe9777ebc3316a85cb581edad19fef785cdcd2859b1dc54bf7407aa2ba804718973661595e318ea62463620f30ca828e5d7638798cca154af5e1d456ed1e + REF v1.16.1 + SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d HEAD_REF master PATCHES fix-uwp.patch ) From 666cc9cee23c11ade0471a59a52afc3f7f8754c0 Mon Sep 17 00:00:00 2001 From: Albert Fong Date: Wed, 12 Dec 2018 02:59:01 -0800 Subject: [PATCH 02/63] [antlr4] Upgrade to antlr 4.7.1 --- ports/antlr4/CONTROL | 2 +- .../Fix-building-in-Visual-Studio-2017.patch | 52 ------------------- ports/antlr4/portfile.cmake | 9 ++-- 3 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 ports/antlr4/Fix-building-in-Visual-Studio-2017.patch diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index bf4df8d1cdc018..af881f1c3aee27 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,3 +1,3 @@ Source: antlr4 -Version: 4.7 +Version: 4.7.1 Description: ANother Tool for Language Recognition \ No newline at end of file diff --git a/ports/antlr4/Fix-building-in-Visual-Studio-2017.patch b/ports/antlr4/Fix-building-in-Visual-Studio-2017.patch deleted file mode 100644 index 64e48359985fe8..00000000000000 --- a/ports/antlr4/Fix-building-in-Visual-Studio-2017.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/runtime/src/ANTLRInputStream.h b/runtime/src/ANTLRInputStream.h -index 3d85bed..813451c 100644 ---- a/runtime/src/ANTLRInputStream.h -+++ b/runtime/src/ANTLRInputStream.h -@@ -16,7 +16,7 @@ namespace antlr4 { - protected: - /// The data being scanned. - // UTF-32 --#if defined(_MSC_VER) && _MSC_VER == 1900 -+#if defined(_MSC_VER) && _MSC_VER >= 1900 - i32string _data; // Custom type for VS 2015. - #else - std::u32string _data; -diff --git a/runtime/src/UnbufferedCharStream.h b/runtime/src/UnbufferedCharStream.h -index b489f18..295804c 100644 ---- a/runtime/src/UnbufferedCharStream.h -+++ b/runtime/src/UnbufferedCharStream.h -@@ -52,7 +52,7 @@ namespace antlr4 { - /// we keep adding to buffer. Otherwise, resets so - /// we start filling at index 0 again. - // UTF-32 encoded. --#if defined(_MSC_VER) && _MSC_VER == 1900 -+#if defined(_MSC_VER) && _MSC_VER >= 1900 - i32string _data; // Custom type for VS 2015. - #else - std::u32string _data; -diff --git a/runtime/src/antlr4-common.h b/runtime/src/antlr4-common.h -index 197fd6d..8357b3e 100644 ---- a/runtime/src/antlr4-common.h -+++ b/runtime/src/antlr4-common.h -@@ -52,7 +52,7 @@ - typedef __int32 ssize_t; - #endif - -- #if _MSC_VER == 1900 -+ #if _MSC_VER >= 1900 - // VS 2015 has a known bug when using std::codecvt_utf8 - // so we have to temporarily use __int32 instead. - // https://connect.microsoft.com/VisualStudio/feedback/details/1403302/unresolved-external-when-using-codecvt-utf8 -diff --git a/runtime/src/support/StringUtils.h b/runtime/src/support/StringUtils.h -index cb751a7..be14bbb 100644 ---- a/runtime/src/support/StringUtils.h -+++ b/runtime/src/support/StringUtils.h -@@ -10,7 +10,7 @@ - namespace antlrcpp { - // For all conversions utf8 <-> utf32. - // VS 2015 has a bug in std::codecvt_utf8 (VS 2013 works fine). --#if defined(_MSC_VER) && _MSC_VER == 1900 -+#if defined(_MSC_VER) && _MSC_VER >= 1900 - static std::wstring_convert, __int32> utfConverter; - #else - static std::wstring_convert, char32_t> utfConverter; diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 0d77208e003976..886a1ab64280f9 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -4,20 +4,20 @@ endif() include(vcpkg_common_functions) -set(VERSION 4.7) +set(VERSION 4.7.1) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/runtime) vcpkg_download_distfile(ARCHIVE - URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7-source.zip" + URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7.1-source.zip" FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip" - SHA512 a14fd3320537075a8d4c1cfa81d416bad6257d238608e2428f4930495072cce984c707126e3777ffd3849dd6b6cdf1bf43624bd6d318b1fa5dd6749a7304f808 + SHA512 24d53278db56b199e6787242f22339f74e07d2cd3ed56f851ad905b110c2ba3cb001e1e2fcbc8624f0e93e00ba1fe1b23630dd1a736558c694655aeb1c3129da ) # license not exist in antlr folder. vcpkg_download_distfile(LICENSE URLS https://raw.githubusercontent.com/antlr/antlr4/${VERSION}/LICENSE.txt FILENAME "antlr4-copyright" - SHA512 c72ae3d5c9f3f07160405b5ca44f01116a9602d82291d6cd218fcc5ec6e8baf985e4baa2acf3d621079585385708bd171c96ef44dd808e60c40a48bc1f56c9ae + SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -25,7 +25,6 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src PATCHES ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch - ${CMAKE_CURRENT_LIST_DIR}/Fix-building-in-Visual-Studio-2017.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") From 9b850a81497be8981a32e2c8f31c68a8dc94a696 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 13 Dec 2018 11:44:01 +0100 Subject: [PATCH 03/63] [OpenCV3] fix protobuf patch --- .../opencv/0005-remove-custom-protobuf-find-package.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/opencv/0005-remove-custom-protobuf-find-package.patch b/ports/opencv/0005-remove-custom-protobuf-find-package.patch index 2944810e56fb26..91ac137f9f7494 100644 --- a/ports/opencv/0005-remove-custom-protobuf-find-package.patch +++ b/ports/opencv/0005-remove-custom-protobuf-find-package.patch @@ -1,11 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -633,7 +633,7 @@ include(cmake/OpenCVFindLibsGUI.cmake) +@@ -633,7 +633,10 @@ include(cmake/OpenCVFindLibsGUI.cmake) include(cmake/OpenCVFindLibsVideo.cmake) include(cmake/OpenCVFindLibsPerf.cmake) include(cmake/OpenCVFindLAPACK.cmake) -include(cmake/OpenCVFindProtobuf.cmake) +find_package(protobuf) ++if(Protobuf_LIBRARIES) ++ set(HAVE_PROTOBUF TRUE) ++endif() # ---------------------------------------------------------------------------- # Detect other 3rd-party libraries/tools @@ -16,7 +19,7 @@ set(include_dirs ${fw_inc}) set(sources_options "") -set(libs libprotobuf ${LAPACK_LIBRARIES}) -+set(libs protobuf ${LAPACK_LIBRARIES}) ++set(libs protobuf::libprotobuf ${LAPACK_LIBRARIES}) if(OPENCV_DNN_OPENCL AND HAVE_OPENCL) list(APPEND include_dirs ${OPENCL_INCLUDE_DIRS}) else() From a2c846338ced13df79089419c3161c3d2fefb68c Mon Sep 17 00:00:00 2001 From: "ing. Federico Fuga" Date: Thu, 13 Dec 2018 11:59:19 +0100 Subject: [PATCH 04/63] Update mpfr to 4.0.1 and fix compilation under gcc 7 gcc 7 deprecates the use of varargs.h in favour of stdarg.h. mpfr already fixes it, but the fix is enabled if stdarg is available. This patch adds the test on CMakeLists.txt and enables the fix if needed. --- ports/mpfr/CMakeLists.txt | 5 +++++ ports/mpfr/portfile.cmake | 9 +++++---- ports/mpfr/test_stdarg.c | 6 ++++++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 ports/mpfr/test_stdarg.c diff --git a/ports/mpfr/CMakeLists.txt b/ports/mpfr/CMakeLists.txt index ed48eaf595d312..7770b18fda40e9 100644 --- a/ports/mpfr/CMakeLists.txt +++ b/ports/mpfr/CMakeLists.txt @@ -255,6 +255,11 @@ if(BUILD_SHARED_LIBS) target_compile_definitions(mpfr PRIVATE __GMP_LIBGMP_DLL) endif() +try_compile(I_HAVE_STDARG ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/test_stdarg.c) +if (I_HAVE_STDARG) + target_compile_definitions(mpfr PRIVATE HAVE_STDARG) +endif (I_HAVE_STDARG) + target_link_libraries(mpfr ${GMP_LIBRARIES}) target_include_directories(mpfr PUBLIC ${GMP_INCLUDE_DIRS}) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 689b075fc61593..4b534ff0c9e101 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -1,13 +1,14 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpfr-3.1.6) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpfr-4.0.1) vcpkg_download_distfile(ARCHIVE - URLS "http://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.xz" - FILENAME "mpfr-3.1.6.tar.xz" - SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054 + URLS "http://www.mpfr.org/mpfr-4.0.1/mpfr-4.0.1.tar.xz" + FILENAME "mpfr-4.0.1.tar.xz" + SHA512 137ad68bc1e33a155edc1247fcdba27f999cf48ed526773136584090ddf2cfdfc9ea79fbf74ea1943b835b4b1ff29b05087114738c6ad3b485848540f30cac4f ) vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/test_stdarg.c DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/gmp_printf.c DESTINATION ${SOURCE_PATH}/src) vcpkg_configure_cmake( diff --git a/ports/mpfr/test_stdarg.c b/ports/mpfr/test_stdarg.c new file mode 100644 index 00000000000000..dc1e2d7b403cd0 --- /dev/null +++ b/ports/mpfr/test_stdarg.c @@ -0,0 +1,6 @@ +# include + +int main(int argc, char *argv) { + return 0; +} + From dba828e5904dcf6bec908571ece9ab3ab2c51232 Mon Sep 17 00:00:00 2001 From: "ing. Federico Fuga" Date: Thu, 13 Dec 2018 13:06:27 +0100 Subject: [PATCH 05/63] Geos: Removed empty directory after install (when only static lib are built) --- ports/geos/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 2f374e79d3eb37..673b159f85572c 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -26,6 +26,10 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/geos-config) From 13710d5854d5fdda7ae181707bb3b529c440e2f1 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 13 Dec 2018 21:05:21 +0800 Subject: [PATCH 06/63] [ponder] Add new port --- ports/ponder/CONTROL | 3 +++ ports/ponder/no-install-unused.patch | 27 +++++++++++++++++++++++ ports/ponder/portfile.cmake | 32 ++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 ports/ponder/CONTROL create mode 100644 ports/ponder/no-install-unused.patch create mode 100644 ports/ponder/portfile.cmake diff --git a/ports/ponder/CONTROL b/ports/ponder/CONTROL new file mode 100644 index 00000000000000..7f935d30489158 --- /dev/null +++ b/ports/ponder/CONTROL @@ -0,0 +1,3 @@ +Source: ponder +Version: 3.0.0 +Description: A C++ multi-purpose reflection library. diff --git a/ports/ponder/no-install-unused.patch b/ports/ponder/no-install-unused.patch new file mode 100644 index 00000000000000..e540dd909edd83 --- /dev/null +++ b/ports/ponder/no-install-unused.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 091f56d..715f86e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -325,14 +325,14 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PonderConfig.cmake ${CMAKE_CURRENT_BIN + COMPONENT devel + ) + +-install(FILES README.md COPYING.txt +- DESTINATION ${INSTALL_MISC_DIR} +-) +- +-install(DIRECTORY cmake +- DESTINATION ${INSTALL_MISC_DIR} +- COMPONENT utils +-) ++#install(FILES README.md COPYING.txt ++# DESTINATION ${INSTALL_MISC_DIR} ++#) ++ ++#install(DIRECTORY cmake ++# DESTINATION ${INSTALL_MISC_DIR} ++# COMPONENT utils ++#) + + ############################### + # packaging diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake new file mode 100644 index 00000000000000..ee0267b00757b5 --- /dev/null +++ b/ports/ponder/portfile.cmake @@ -0,0 +1,32 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO billyquith/ponder + REF 3.0.0 + SHA512 b6ba1ce9fa0584b16085c56afb70e31f204a66b57193c1a4225bfe18abbda561bb71b3279dd0a4f1b21867b985ef5ce78c8e360f3fc654c61ce61c44d35c5f38 + HEAD_REF master + PATCHES + no-install-unused.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DUSES_RAPIDJSON=OFF + -DUSES_RAPIDXML=OFF + -DBUILD_TEST=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ponder/cmake) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/ponder + ${CURRENT_PACKAGES_DIR}/lib/ponder) + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/ponder/copyright COPYONLY) From 6d15819fdde0d52ce29c6922d3615ab22a9fbf33 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 13 Dec 2018 14:13:05 +0100 Subject: [PATCH 07/63] [opencv] bump version --- ports/opencv/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 5f012d80eededb..41e73b1954b35e 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-4 +Version: 3.4.3-5 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann From 751aa7809d7f8e3286d00ffd8ab90d95ceebe8b2 Mon Sep 17 00:00:00 2001 From: Juha Sointusalo Date: Thu, 13 Dec 2018 23:09:57 +0200 Subject: [PATCH 08/63] [ftgl] add new port --- .../0001-fix-building-DLL-on-Windows.patch | 26 +++++++++++++++++++ ports/ftgl/CONTROL | 6 +++++ ports/ftgl/portfile.cmake | 24 +++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 ports/ftgl/0001-fix-building-DLL-on-Windows.patch create mode 100644 ports/ftgl/CONTROL create mode 100644 ports/ftgl/portfile.cmake diff --git a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch b/ports/ftgl/0001-fix-building-DLL-on-Windows.patch new file mode 100644 index 00000000000000..e9b8c52a577c74 --- /dev/null +++ b/ports/ftgl/0001-fix-building-DLL-on-Windows.patch @@ -0,0 +1,26 @@ +From b56270d28a59297518e91f85333a2e1a7fecdc9e Mon Sep 17 00:00:00 2001 +From: Juha Sointusalo +Date: Thu, 13 Dec 2018 21:38:23 +0200 +Subject: [PATCH] fix building DLL on Windows + +Without FTGL_LIBRARY all symbols are declared to be imported instead of +exported and linking the library fails. +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6c5a57..6b230ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,6 +27,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE) + OPTION(BUILD_SHARED_LIBS "Build Shared Libraries" ON) + IF(BUILD_SHARED_LIBS) + SET(LIB_TYPE SHARED) ++ ADD_DEFINITIONS(-DFTGL_LIBRARY) + ELSE(BUILD_SHARED_LIBS) + SET(LIB_TYPE STATIC) + ADD_DEFINITIONS(-D FTGL_LIBRARY_STATIC) +-- +2.18.0.windows.1 + diff --git a/ports/ftgl/CONTROL b/ports/ftgl/CONTROL new file mode 100644 index 00000000000000..2abfa87781c729 --- /dev/null +++ b/ports/ftgl/CONTROL @@ -0,0 +1,6 @@ +Source: ftgl +Version: 2.3.1 +Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications. + Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format. + FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering. +Build-Depends: freetype, opengl diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake new file mode 100644 index 00000000000000..a8878af0f197cb --- /dev/null +++ b/ports/ftgl/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO frankheckenbach/ftgl + REF 2.3.1 + SHA512 4c3c92e79371aa9048a0de6c27bd008036be19fe6179bce472f36ced359026aaeaa5b63c83f90ffc1d425dd2e587479efc700dc1082c2ed0189d16ea87838c9a + HEAD_REF master + PATCHES "0001-fix-building-DLL-on-Windows.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_test_cmake(PACKAGE_NAME FTGL) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ftgl) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/ftgl/COPYING ${CURRENT_PACKAGES_DIR}/share/ftgl/copyright) From fed9a245268df9591a4150fb1f916df0894ca9d3 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 13 Dec 2018 13:49:24 -0800 Subject: [PATCH 09/63] [autocomplete] Add tab-completion support for bash --- README.md | 7 ++-- scripts/vcpkg_completion.bash | 17 ++++++++ toolsrc/src/vcpkg/commands.integrate.cpp | 52 +++++++++++++++++++++++- 3 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 scripts/vcpkg_completion.bash diff --git a/README.md b/README.md index 93262a1cab594c..e32ef702518cc1 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,12 @@ For more information, see our [using a package](docs/examples/installing-and-usi Additional notes on macOS and Linux support can be found in the [official announcement](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/). ## Tab-Completion / Auto-Completion -`vcpkg` supports auto-completion of commands, package names, options etc. To enable tab-completion in Powershell, use +`vcpkg` supports auto-completion of commands, package names, options etc in Powershell and bash. To enable tab-completion, use one of the following: ``` -.\vcpkg integrate powershell +PS> .\vcpkg integrate powershell +Linux:~/$ ./vcpkg integrate bash ``` -and restart Powershell. +and restart your console. ## Examples diff --git a/scripts/vcpkg_completion.bash b/scripts/vcpkg_completion.bash new file mode 100644 index 00000000000000..804507d5857b7d --- /dev/null +++ b/scripts/vcpkg_completion.bash @@ -0,0 +1,17 @@ +#/usr/bin/env bash + +_vcpkg_completions() +{ + local vcpkg_executable=${COMP_WORDS[0]} + local remaining_command_line=${COMP_LINE:(${#vcpkg_executable}+1)} + COMPREPLY=($(${vcpkg_executable} autocomplete "${remaining_command_line}" -- 2>/dev/null)) + + # Colon is treated as a delimiter in bash. The following workaround + # allows triplet completion to work correctly in the syntax: + # zlib:x64-windows + local cur + _get_comp_words_by_ref -n : cur + __ltrim_colon_completions "$cur" +} + +complete -F _vcpkg_completions vcpkg diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index 82172e36364336..c1d3a8c8d67146 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -1,6 +1,7 @@ #include "pch.h" #include +#include #include #include #include @@ -122,7 +123,7 @@ namespace vcpkg::Commands::Integrate static ElevationPromptChoice elevated_cmd_execute(const std::string& param) { - SHELLEXECUTEINFOW sh_ex_info{}; + SHELLEXECUTEINFOW sh_ex_info {}; sh_ex_info.cbSize = sizeof(sh_ex_info); sh_ex_info.fMask = SEE_MASK_NOCLOSEPROCESS; sh_ex_info.hwnd = nullptr; @@ -404,6 +405,47 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console Checks::exit_with_code(VCPKG_LINE_INFO, rc); } +#elif defined(__unix__) + static void integrate_bash(const VcpkgPaths& paths) + { + const auto home_path = System::get_environment_variable("HOME").value_or_exit(VCPKG_LINE_INFO); + const fs::path bashrc_path = fs::path {home_path} / ".bashrc"; + + auto& fs = paths.get_filesystem(); + const fs::path completion_script_path = paths.scripts / "vcpkg_completion.bash"; + + Expected> maybe_bashrc_content = fs.read_lines(bashrc_path); + Checks::check_exit( + VCPKG_LINE_INFO, maybe_bashrc_content.has_value(), "Unable to read %s", bashrc_path.u8string()); + + std::vector bashrc_content = maybe_bashrc_content.value_or_exit(VCPKG_LINE_INFO); + + std::vector matches; + for (auto&& line : bashrc_content) + { + std::smatch match; + if (std::regex_match(line, match, std::regex {R"###(^source.*scripts/vcpkg_completion.bash$)###"})) + { + matches.push_back(line); + } + } + + if (!matches.empty()) + { + System::print("vcpkg bash completion is already imported to your %s file.\n" + "The following entries were found:\n" + " %s\n" + "Please make sure you have started a new bash shell for the changes to take effect.\n", + bashrc_path.u8string(), + Strings::join("\n ", matches)); + Checks::exit_success(VCPKG_LINE_INFO); + } + + System::print("Adding vcpkg completion entry to %s\n", bashrc_path.u8string()); + bashrc_content.push_back(Strings::format("source %s", completion_script_path.u8string())); + fs.write_contents(bashrc_path, Strings::join("\n", bashrc_content)); + Checks::exit_success(VCPKG_LINE_INFO); + } #endif #if defined(_WIN32) @@ -425,11 +467,12 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console static const std::string REMOVE = "remove"; static const std::string PROJECT = "project"; static const std::string POWERSHELL = "powershell"; + static const std::string BASH = "bash"; } static std::vector valid_arguments(const VcpkgPaths&) { - return {Subcommand::INSTALL, Subcommand::REMOVE, Subcommand::PROJECT, Subcommand::POWERSHELL}; + return {Subcommand::INSTALL, Subcommand::REMOVE, Subcommand::PROJECT, Subcommand::POWERSHELL, Subcommand::BASH}; } const CommandStructure COMMAND_STRUCTURE = { @@ -463,6 +506,11 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console { return integrate_powershell(paths); } +#elif defined(__unix__) + if (args.command_arguments[0] == Subcommand::BASH) + { + return integrate_bash(paths); + } #endif Checks::exit_with_message(VCPKG_LINE_INFO, "Unknown parameter %s for integrate", args.command_arguments[0]); From 02c27dd55ec6401dd9c0b3af99e96b4d7cfd82a8 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 13 Dec 2018 15:53:32 -0800 Subject: [PATCH 10/63] [antlr4] bump dash version in control file Done to force test to run --- ports/antlr4/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index af881f1c3aee27..2254d4d8015167 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,3 +1,3 @@ Source: antlr4 -Version: 4.7.1 +Version: 4.7.1-1 Description: ANother Tool for Language Recognition \ No newline at end of file From 83b8a6e0366b63283f285240cebde2b7312de761 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 13 Dec 2018 16:11:58 -0800 Subject: [PATCH 11/63] [mpfr] bump control version number --- ports/mpfr/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL index fdfe6deb00fdbc..a7fcfdeaf1e8dd 100644 --- a/ports/mpfr/CONTROL +++ b/ports/mpfr/CONTROL @@ -1,4 +1,4 @@ Source: mpfr -Version: 3.1.6-2 +Version: 3.1.6-3 Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding Build-Depends: mpir From 96b282341fd80763ef8533ba6619064ad3e8a60f Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 13 Dec 2018 16:19:44 -0800 Subject: [PATCH 12/63] [geos] bump control version number --- ports/geos/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/geos/CONTROL b/ports/geos/CONTROL index 0a4421eea77d65..cb19bebd9ae409 100644 --- a/ports/geos/CONTROL +++ b/ports/geos/CONTROL @@ -1,3 +1,3 @@ Source: geos -Version: 3.6.3-2 +Version: 3.6.3-3 Description: Geometry Engine Open Source From 165f96bb51a33239f81cd084378fde0479283508 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 13 Dec 2018 19:20:26 -0500 Subject: [PATCH 13/63] Update to v1.17.1 --- ports/grpc/CONTROL | 2 +- ports/grpc/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index d2b0f44e8a9be6..f7a46c9f68bded 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.16.1 +Version: 1.17.1 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp) Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index b0dca5a9357f1f..4b307a87ab5633 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.16.1 - SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d + REF v1.17.1 + SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e HEAD_REF master PATCHES fix-uwp.patch ) From 0d1229d34babdc9c8fbfe2e1b43b38e657519093 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 17 Dec 2018 09:34:45 +0100 Subject: [PATCH 14/63] update msys2 to latest release --- scripts/cmake/vcpkg_acquire_msys.cmake | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index ed4f7ac294ecc8..adbd58ca5bea7c 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -53,20 +53,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) if(_vam_HOST_ARCHITECTURE STREQUAL "AMD64") set(TOOLSUBPATH msys64) set(URLS - "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-x86_64-20161025.tar.xz") - set(HASH 6c4c18ec59db80b8269698d074866438a624f1ce735ee5005a01b148b02e8f2e966ae381aa1cb4c50f6226c3b7feb271e36907cf26580df084d695b3c9f5c0eb) + set(ARCHIVE "msys2-base-x86_64-20181211.tar.xz") + set(HASH 1efb9a7ff1daa2d3147ac0fda8e9a645696dbd19a33c986b844bc037d946dddb3353db5a52794ac668718812854400d918e4db13b4a2d0e6f5a9dfe716b48056) set(STAMP "initialized-msys2_64.stamp") else() set(TOOLSUBPATH msys32) set(URLS - "http://repo.msys2.org/distrib/i686/msys2-base-i686-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/i686/msys2-base-i686-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/i686/msys2-base-i686-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-i686-20161025.tar.xz") - set(HASH c9260a38e0c6bf963adeaea098c4e376449c1dd0afe07480741d6583a1ac4c138951ccb0c5388bd148e04255a5c1a23bf5ee2d58dcd6607c14f1eaa5639a7c85) + set(ARCHIVE "msys2-base-i686-20181211.tar.xz") + set(HASH a9b9680a511bb205b87811b303eb29d62e2fd851000304f8b087c5893a3891c2aa2d46217ae989e31b5d52a6ba34ac5e6a5e624d9c917df00a752ade4debc20f) set(STAMP "initialized-msys2_32.stamp") endif() From 524a1414fc395fdc60951d63f4a66683309fd630 Mon Sep 17 00:00:00 2001 From: Francisco Dias Date: Mon, 17 Dec 2018 11:13:02 -0200 Subject: [PATCH 15/63] TinyXml Linkage error fixed --- ports/tinyxml/0002_export_tinyxml.patch | 26 +++++++++++++++++++++++++ ports/tinyxml/CMakeLists.txt | 8 +++++++- ports/tinyxml/portfile.cmake | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 ports/tinyxml/0002_export_tinyxml.patch diff --git a/ports/tinyxml/0002_export_tinyxml.patch b/ports/tinyxml/0002_export_tinyxml.patch new file mode 100644 index 00000000000000..7f09a6ec94fa28 --- /dev/null +++ b/ports/tinyxml/0002_export_tinyxml.patch @@ -0,0 +1,26 @@ +# User Francisco Dias +# Date 1545049386 7200 +# Mon Dec 17 10:23:06 2018 -0200 +Export tinyXML. + +diff --git a/tinyxml.h b/tinyxml.h +--- a/tinyxml.h ++++ b/tinyxml.h +@@ -38,6 +38,8 @@ + #include + #include + ++#include "tinyxml_export.h" ++ + // Help out windows: + #if defined( _DEBUG ) && !defined( DEBUG ) + #define DEBUG +@@ -414,7 +416,7 @@ + + }; + static Entity entity[ NUM_ENTITY ]; +- static bool condenseWhiteSpace; ++ static TINYXML_EXPORT bool condenseWhiteSpace; + }; + + diff --git a/ports/tinyxml/CMakeLists.txt b/ports/tinyxml/CMakeLists.txt index 9b55aa717093f0..21776c156b38fa 100644 --- a/ports/tinyxml/CMakeLists.txt +++ b/ports/tinyxml/CMakeLists.txt @@ -15,6 +15,11 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) add_library(tinyxml ${SOURCES}) target_compile_definitions(tinyxml PRIVATE "-DTIXML_USE_STL") +include(GenerateExportHeader) +generate_export_header(tinyxml) + +target_include_directories(tinyxml PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + install( TARGETS tinyxml ARCHIVE DESTINATION lib @@ -22,4 +27,5 @@ install( RUNTIME DESTINATION bin ) -install(FILES ${HEADERS} DESTINATION include) +install(FILES ${HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/tinyxml_export.h DESTINATION include) diff --git a/ports/tinyxml/portfile.cmake b/ports/tinyxml/portfile.cmake index 54d462bb4adf06..dcd1fcc08c9097 100644 --- a/ports/tinyxml/portfile.cmake +++ b/ports/tinyxml/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_use_stl.patch + ${CMAKE_CURRENT_LIST_DIR}/0002_export_tinyxml.patch ) vcpkg_configure_cmake( From c3c6c0d0de43fa46deeceea1cd409b1e533cbcdc Mon Sep 17 00:00:00 2001 From: Lennart Trunk Date: Mon, 17 Dec 2018 16:37:46 +0100 Subject: [PATCH 16/63] Update eigen3 to 3.3.7 --- ports/eigen3/CONTROL | 2 +- ports/eigen3/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL index 0b048eaa19cb06..2586620a037e1a 100644 --- a/ports/eigen3/CONTROL +++ b/ports/eigen3/CONTROL @@ -1,3 +1,3 @@ Source: eigen3 -Version: 3.3.5 +Version: 3.3.7 Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 4e32d4e10906a0..f3efca4b845463 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eigenteam/eigen-git-mirror - REF 3.3.5 - SHA512 398d864bb3c12be9b1d7081bac1343d54b1edf65f165be54814794cd8d36c35035340384a97ad203e5295d466445dfbad4225d86748c8d31c322948de9a33a3f + REF 3.3.7 + SHA512 270ab9b5c22e09aa0e70d1a26995523c5c21fb0f09da45c137c11ab4c7700fe2bdb2b343c1e063bea4be5ae61d2313ff29ebbcad519dc355a568792b4a6e9e48 HEAD_REF master ) From f64362201923a20111ced9b789286437a8acac13 Mon Sep 17 00:00:00 2001 From: Carsten Neumann Date: Mon, 17 Dec 2018 09:52:25 -0600 Subject: [PATCH 17/63] Fix spdlog handling of external fmt lib Using an external fmt lib should cause the spdlog::spdlog target to have a dependency on fmt lib - so that a consuming project does not need to call find_package(fmt) and target_link_libraries(... fmt::fmt). To this end a new cmake option SPDLOG_FMT_EXTERNAL is introduced which makes spdlog depend on fmt lib and defines the SPDLOG_FMT_EXTERNAL macro to avoid using the bundled fmt lib. The value of SPDLOG_FMT_EXTERNAL is also stored in the installed spdlogConfig.cmake and if it is ON find_dependency() is used to ensure the fmt::fmt target is imported. --- ports/spdlog/fmt-external-cmake-option.patch | 100 +++++++++++++++++++ ports/spdlog/portfile.cmake | 8 +- 2 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 ports/spdlog/fmt-external-cmake-option.patch diff --git a/ports/spdlog/fmt-external-cmake-option.patch b/ports/spdlog/fmt-external-cmake-option.patch new file mode 100644 index 00000000000000..635eb3b23fec54 --- /dev/null +++ b/ports/spdlog/fmt-external-cmake-option.patch @@ -0,0 +1,100 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc75346..5b3a5c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,12 @@ cmake_dependent_option(SPDLOG_BUILD_TESTING + "BUILD_TESTING" OFF + ) + ++option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF) ++ ++if(SPDLOG_FMT_EXTERNAL) ++ find_package(fmt REQUIRED CONFIG) ++endif() ++ + target_include_directories( + spdlog + INTERFACE +@@ -66,6 +72,11 @@ target_include_directories( + "$" + ) + ++if(SPDLOG_FMT_EXTERNAL) ++ target_compile_definitions(spdlog INTERFACE SPDLOG_FMT_EXTERNAL) ++ target_link_libraries(spdlog INTERFACE fmt::fmt) ++endif() ++ + set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include") + + if(SPDLOG_BUILD_EXAMPLES) +@@ -88,7 +99,8 @@ set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + set(include_install_dir "${CMAKE_INSTALL_INCLUDEDIR}") + set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + set(version_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake") +-set(project_config "${PROJECT_NAME}Config.cmake") ++set(project_config "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake") ++set(targets_config "${PROJECT_NAME}Targets.cmake") + set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc") + set(targets_export_name "${PROJECT_NAME}Targets") + set(namespace "${PROJECT_NAME}::") +@@ -101,6 +113,8 @@ write_basic_package_version_file( + + # configure pkg config file + configure_file("cmake/spdlog.pc.in" "${pkg_config}" @ONLY) ++# configure spdlogConfig.cmake file ++configure_file("cmake/Config.cmake.in" "${project_config}" @ONLY) + + # install targets + install( +@@ -114,9 +128,9 @@ install( + DESTINATION "${include_install_dir}" + ) + +-# install project version file ++# install project config and version file + install( +- FILES "${version_config}" ++ FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}" + ) + +@@ -126,19 +140,19 @@ install( + DESTINATION "${pkgconfig_install_dir}" + ) + +-# install project config file ++# install targets config file + install( + EXPORT "${targets_export_name}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}" +- FILE ${project_config} ++ FILE ${targets_config} + ) + +-# export build directory config file ++# export build directory targets file + export( + EXPORT ${targets_export_name} + NAMESPACE "${namespace}" +- FILE ${project_config} ++ FILE ${targets_config} + ) + + # register project in CMake user registry +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index ba0b36f..0b0fd11 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -21,4 +21,11 @@ + # * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + # *************************************************************************/ + ++set(SPDLOG_FMT_EXTERNAL @SPDLOG_FMT_EXTERNAL@) ++ + include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") ++ ++if(SPDLOG_FMT_EXTERNAL) ++ include(CMakeFindDependencyMacro) ++ find_dependency(fmt CONFIG) ++endif() diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 21f3121e9eaf64..f953af33dfadbe 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF v1.2.1 SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1 HEAD_REF v1.x + PATCHES + fmt-external-cmake-option.patch ) vcpkg_configure_cmake( @@ -13,6 +15,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DSPDLOG_BUILD_TESTING=OFF + -DSPDLOG_FMT_EXTERNAL=ON ) vcpkg_install_cmake() @@ -22,11 +25,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/spdlog) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -# use vcpkg-provided fmt library +# use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled) -file(READ ${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h SPDLOG_TWEAKME_CONTENTS) -string(REPLACE "// #define SPDLOG_FMT_EXTERNAL" "#define SPDLOG_FMT_EXTERNAL" SPDLOG_TWEAKME_CONTENTS "${SPDLOG_TWEAKME_CONTENTS}") -file(WRITE ${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h "${SPDLOG_TWEAKME_CONTENTS}") # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/spdlog) From 00777f41f7cf4deec10ad7302e25263c2ea826a2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 18 Dec 2018 14:54:59 +0100 Subject: [PATCH 18/63] Fix for #4902 having testing enabled seems to mess up builds if other dependencies are available --- ports/eigen3/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 4e32d4e10906a0..b8c5a2b5d706c1 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -11,6 +11,8 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF OPTIONS_RELEASE -DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3 OPTIONS_DEBUG From ccff8ab94ed1294d306d977b0bf25e8e9140a0d8 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 18 Dec 2018 12:46:19 -0800 Subject: [PATCH 19/63] [tinyxml] Modernize and bump control version --- ports/tinyxml/CONTROL | 2 +- ports/tinyxml/portfile.cmake | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ports/tinyxml/CONTROL b/ports/tinyxml/CONTROL index 3d97a331200695..f1075e38ed86d4 100644 --- a/ports/tinyxml/CONTROL +++ b/ports/tinyxml/CONTROL @@ -1,3 +1,3 @@ Source: tinyxml -Version: 2.6.2-2 +Version: 2.6.2-3 Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs. diff --git a/ports/tinyxml/portfile.cmake b/ports/tinyxml/portfile.cmake index dcd1fcc08c9097..1d4e6131b64229 100644 --- a/ports/tinyxml/portfile.cmake +++ b/ports/tinyxml/portfile.cmake @@ -1,23 +1,22 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyxml) - vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz" FILENAME "tinyxml_2_6_2.tar.gz" SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56 ) -vcpkg_extract_source_archive(${ARCHIVE}) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF 2.6.2 PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_use_stl.patch - ${CMAKE_CURRENT_LIST_DIR}/0002_export_tinyxml.patch + 0001_use_stl.patch + 0002_export_tinyxml.patch ) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA From 9a72b227cd11404f1bc09eb093028b795cbef1bd Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 18 Dec 2018 16:12:19 -0800 Subject: [PATCH 20/63] [antlr4] move to vcpkg_extract_source_archive_ex --- ports/antlr4/CONTROL | 2 +- ports/antlr4/portfile.cmake | 27 +++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index 2254d4d8015167..900f2622e230e6 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,3 +1,3 @@ Source: antlr4 -Version: 4.7.1-1 +Version: 4.7.1-2 Description: ANother Tool for Language Recognition \ No newline at end of file diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 886a1ab64280f9..de3e2f6342ea9e 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -5,7 +5,6 @@ endif() include(vcpkg_common_functions) set(VERSION 4.7.1) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/runtime) vcpkg_download_distfile(ARCHIVE URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7.1-source.zip" @@ -20,11 +19,11 @@ vcpkg_download_distfile(LICENSE SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b ) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src - PATCHES ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + PATCHES ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -36,14 +35,14 @@ else() endif() vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/antlr4cpp-vs2015.vcxproj + PROJECT_PATH ${SOURCE_PATH}/runtime/antlr4cpp-vs2015.vcxproj DEBUG_CONFIGURATION ${DEBUG_CONFIG} RELEASE_CONFIGURATION ${RELEASE_CONFIG} ) file (MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -FILE(COPY ${SOURCE_PATH}/src/ +FILE(COPY ${SOURCE_PATH}/runtime/src/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") @@ -51,9 +50,9 @@ file (MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug/lib) -file(COPY ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.lib +file(COPY ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(COPY ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib +file(COPY ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -67,12 +66,12 @@ else() ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY - ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.dll - ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.pdb + ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.dll + ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY - ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.dll - ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.pdb + ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.dll + ${SOURCE_PATH}/runtime/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin) endif() From 224300c2387cb959bbbec5623f5fa017142d3733 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 18 Dec 2018 22:30:26 -0800 Subject: [PATCH 21/63] [grpc] Change portfile to trigger build --- ports/grpc/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 4b307a87ab5633..c73a7492d8df88 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -81,3 +81,4 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() +# \ No newline at end of file From d02acf43936912ad2e33053d8d217ade08a64476 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 19 Dec 2018 17:50:38 +0800 Subject: [PATCH 22/63] [libsodium] Fix #3374, #3385 --- ports/libsodium/portfile.cmake | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index ff473b5258f636..d4bad9e7c0eefd 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -22,18 +22,20 @@ else() set(LIBSODIUM_DEBUG_CONFIGURATION Debug) endif() -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj - RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} - DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} -) - IF(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") SET(BUILD_ARCH "Win32") ELSE() SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE}) ENDIF() +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj + RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} + DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} + OPTIONS + /p:ForceImportBeforeCppTargets=${SOURCE_PATH}/builds/msvc/properties/${BUILD_ARCH}.props +) + file(INSTALL ${SOURCE_PATH}/src/libsodium/include/sodium.h DESTINATION ${CURRENT_PACKAGES_DIR}/include From cb1b311535bd9c68cc458f328fd7116d720c0dd2 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 19 Dec 2018 20:01:14 +0800 Subject: [PATCH 23/63] [libsodium] Fix static build --- ports/libsodium/portfile.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index d4bad9e7c0eefd..29e6d1f9d7e3dd 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -47,6 +47,12 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/include/sodium ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ ${CURRENT_PACKAGES_DIR}/include/sodium/export.h _contents) + string(REPLACE "#ifdef SODIUM_STATIC" "#if 1 //#ifdef SODIUM_STATIC" _contents "${_contents}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/sodium/export.h "${_contents}") +endif () + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(INSTALL ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll From 2cad8b53dd8bc6968de516aea97882219092e52f Mon Sep 17 00:00:00 2001 From: krismattheus Date: Wed, 19 Dec 2018 15:32:03 +0100 Subject: [PATCH 24/63] [pthreads] add version resource and fix problem with PTW32_ARCH when compiling resource. Signed-off-by: krismattheus --- ports/pthreads/CMakeLists.txt | 4 ++-- ports/pthreads/CONTROL | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/pthreads/CMakeLists.txt b/ports/pthreads/CMakeLists.txt index 7ae6bcc342ca2e..70317b460ed58a 100644 --- a/ports/pthreads/CMakeLists.txt +++ b/ports/pthreads/CMakeLists.txt @@ -28,6 +28,7 @@ set(PTHREAD_SHARED_SOURCES sync.c tsd.c attr.C + version.rc ) set(PTHREAD_STATIC_SOURCES autostatic.c @@ -169,8 +170,7 @@ set(PTHREAD_STATIC_SOURCES -option(PTW32_ARCH "x32") -add_definitions(-DPTW32_ARCH=${PTW32_ARCH} -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED) +add_definitions(-DPTW32_ARCH="${PTW32_ARCH}" -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED) if(BUILD_SHARED_LIBS) set(PTHREAD_SOURCES ${PTHREAD_SHARED_SOURCES}) diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL index ab02fb4151b6dc..53b710f2acebab 100644 --- a/ports/pthreads/CONTROL +++ b/ports/pthreads/CONTROL @@ -1,3 +1,3 @@ Source: pthreads -Version: 2.9.1-2 +Version: 2.9.1-3 Description: pthreads for windows From 222c629af4bdf4739ab0a50c375aa2875b83641f Mon Sep 17 00:00:00 2001 From: Peter Goodman Date: Wed, 19 Dec 2018 14:53:21 -0500 Subject: [PATCH 25/63] Change to 0/1 instead of OFF/ON On newer CMake's, the following errors are reported: ``` CMake Warning (dev) at .... /vcpkg/installed/x64-osx/share/c-ares/c-ares-config.cmake:32 (if): if given arguments: "ON" An argument named "ON" appears in a conditional statement. Policy CMP0012 is not set: if() recognizes numbers and boolean constants. Run "cmake --help-policy CMP0012" for policy details. Use the cmake_policy command to set the policy and suppress this warning. ``` Which corresponds to the following configured code: ``` if(ON) set(c-ares_STATIC_LIBRARY c-ares::cares_static) endif() ``` --- ports/c-ares/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index bf704304e189a1..999c3553ec4940 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -13,11 +13,11 @@ vcpkg_from_github( ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(CARES_STATIC ON) - set(CARES_SHARED OFF) + set(CARES_STATIC 1) + set(CARES_SHARED 0) else() - set(CARES_STATIC OFF) - set(CARES_SHARED ON) + set(CARES_STATIC 0) + set(CARES_SHARED 1) endif() vcpkg_configure_cmake( From d5656ef104ce531a1c75d286147ba323b76aa427 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 14:57:09 -0800 Subject: [PATCH 26/63] [grpc] update patch for uwp --- ports/grpc/fix-uwp.patch | 257 ++++++++++++++++++++++---------------- ports/grpc/portfile.cmake | 2 +- 2 files changed, 149 insertions(+), 110 deletions(-) diff --git a/ports/grpc/fix-uwp.patch b/ports/grpc/fix-uwp.patch index f479e4c5903d34..81b79d1e001d18 100644 --- a/ports/grpc/fix-uwp.patch +++ b/ports/grpc/fix-uwp.patch @@ -1,109 +1,148 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a59fd818e3..774ee2f725 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -89,6 +89,9 @@ if(UNIX) - endif() - if(WIN32) - set(_gRPC_PLATFORM_WINDOWS ON) -+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ set(_gRPC_PLATFORM_UWP ON) -+ endif() - endif() - - set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) -@@ -155,6 +158,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) - # ``.proto`` files - # - function(protobuf_generate_grpc_cpp) -+ if(_gRPC_PLATFORM_UWP) -+ return() -+ endif() -+ - if(NOT ARGN) - message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") - return() -@@ -189,6 +196,7 @@ function(protobuf_generate_grpc_cpp) - endforeach() - endfunction() - -+if(NOT _gRPC_PLATFORM_UWP) - add_custom_target(plugins - DEPENDS - grpc_cpp_plugin -@@ -218,6 +226,8 @@ add_custom_target(tools_cxx - add_custom_target(tools - DEPENDS tools_c tools_cxx) - -+endif() -+ - if (gRPC_BUILD_TESTS) - add_custom_target(buildtests_c) - add_dependencies(buildtests_c algorithm_test) -@@ -3661,7 +3671,6 @@ foreach(_hdr - DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" - ) - endforeach() --endif (gRPC_BUILD_CODEGEN) - - - if (gRPC_INSTALL) -@@ -3671,6 +3680,7 @@ if (gRPC_INSTALL) - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) - endif() -+endif (gRPC_BUILD_CODEGEN) - - if (gRPC_BUILD_TESTS) - -@@ -3793,7 +3803,7 @@ foreach(_hdr - DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" - ) - endforeach() --endif (gRPC_BUILD_CODEGEN) -+ - - - if (gRPC_INSTALL) -@@ -3803,6 +3813,7 @@ if (gRPC_INSTALL) - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) - endif() -+endif (gRPC_BUILD_CODEGEN) - - if (gRPC_BUILD_TESTS) - -diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -index 55efe0e9dd..f538f26edf 100644 ---- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -@@ -60,6 +60,8 @@ bool check_bios_data(const char* bios_data_file) { - - static void init_mu(void) { gpr_mu_init(&g_mu); } - -+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP -+ - static bool run_powershell() { - SECURITY_ATTRIBUTES sa; - sa.nLength = sizeof(sa); -@@ -97,8 +99,12 @@ static bool run_powershell() { - CloseHandle(h); - return true; - } -+#endif - - bool grpc_alts_is_running_on_gcp() { -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) -+ g_is_on_compute_engine = false; -+#else - gpr_once_init(&g_once, init_mu); - gpr_mu_lock(&g_mu); - if (!g_compute_engine_detection_done) { -@@ -108,6 +114,7 @@ bool grpc_alts_is_running_on_gcp() { - g_compute_engine_detection_done = true; - } - gpr_mu_unlock(&g_mu); -+#endif - return g_is_on_compute_engine; - } - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b39e6f8..5d35293 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,6 +90,9 @@ if(UNIX) + endif() + if(WIN32) + set(_gRPC_PLATFORM_WINDOWS ON) ++ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set(_gRPC_PLATFORM_UWP ON) ++ endif() + endif() + + set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) +@@ -107,6 +110,9 @@ if (MSVC) + add_definitions(/wd4267) + # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later + add_definitions(/wd4987 /wd4774 /wd4819 /wd4996 /wd4619) ++ if(_gRPC_PLATFORM_UWP) ++ add_definitions(-DGRPC_ARES=0) ++ endif() + endif() + + if (gRPC_USE_PROTO_LITE) +@@ -177,6 +183,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) + # ``.proto`` files + # + function(protobuf_generate_grpc_cpp) ++ if(_gRPC_PLATFORM_UWP) ++ return() ++ endif() ++ + if(NOT ARGN) + message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") + return() +@@ -211,6 +221,7 @@ function(protobuf_generate_grpc_cpp) + endforeach() + endfunction() + ++if(NOT _gRPC_PLATFORM_UWP) + add_custom_target(plugins + DEPENDS + grpc_cpp_plugin +@@ -240,6 +251,8 @@ add_custom_target(tools_cxx + add_custom_target(tools + DEPENDS tools_c tools_cxx) + ++endif() ++ + if (gRPC_BUILD_TESTS) + add_custom_target(buildtests_c) + add_dependencies(buildtests_c algorithm_test) +@@ -3805,7 +3818,6 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) + + + if (gRPC_INSTALL) +@@ -3815,6 +3827,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + if (gRPC_BUILD_TESTS) + +@@ -3935,7 +3948,7 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) ++ + + + if (gRPC_INSTALL) +@@ -3945,6 +3958,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + if (gRPC_BUILD_TESTS) + +@@ -4916,7 +4930,6 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) + + + if (gRPC_INSTALL) +@@ -4926,6 +4939,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + if (gRPC_BUILD_TESTS) + +diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc +index 7e4b3c9..da67bde 100644 +--- a/src/core/lib/iomgr/resource_quota.cc ++++ b/src/core/lib/iomgr/resource_quota.cc +@@ -936,7 +936,7 @@ void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, + void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) { + gpr_mu_lock(&resource_user->mu); + grpc_resource_quota* resource_quota = resource_user->resource_quota; +- gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size); ++ gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast(size)); + GPR_ASSERT(prior >= static_cast(size)); + bool was_zero_or_negative = resource_user->free_pool <= 0; + resource_user->free_pool += static_cast(size); +diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +index 55efe0e..f538f26 100644 +--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc ++++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +@@ -60,6 +60,8 @@ bool check_bios_data(const char* bios_data_file) { + + static void init_mu(void) { gpr_mu_init(&g_mu); } + ++#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP ++ + static bool run_powershell() { + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); +@@ -97,8 +99,12 @@ static bool run_powershell() { + CloseHandle(h); + return true; + } ++#endif + + bool grpc_alts_is_running_on_gcp() { ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++ g_is_on_compute_engine = false; ++#else + gpr_once_init(&g_once, init_mu); + gpr_mu_lock(&g_mu); + if (!g_compute_engine_detection_done) { +@@ -108,6 +114,7 @@ bool grpc_alts_is_running_on_gcp() { + g_compute_engine_detection_done = true; + } + gpr_mu_unlock(&g_mu); ++#endif + return g_is_on_compute_engine; + } + diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index c73a7492d8df88..77db3422653edd 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -81,4 +81,4 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() -# \ No newline at end of file +## \ No newline at end of file From 8b79329303a1b16ed10e52922cde7976f6abf1c3 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 15:52:22 -0800 Subject: [PATCH 27/63] [antlr4] change portfile to trigger testing --- ports/antlr4/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index de3e2f6342ea9e..cda011c60a3050 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -77,4 +77,5 @@ endif() file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/antlr4 RENAME copyright) -message(STATUS "Installing done") \ No newline at end of file +message(STATUS "Installing done") +# \ No newline at end of file From f6db046bed66288d5143247244ad1a59fcf1a495 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 16:09:39 -0800 Subject: [PATCH 28/63] [mpfr] fix version in CONTROL file --- ports/mpfr/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL index a7fcfdeaf1e8dd..e9f4451bead12f 100644 --- a/ports/mpfr/CONTROL +++ b/ports/mpfr/CONTROL @@ -1,4 +1,4 @@ Source: mpfr -Version: 3.1.6-3 +Version: 4.0.1 Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding Build-Depends: mpir From dd005656273d5d004ea7a74256a2cb9ca9f89dc7 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 16:38:14 -0800 Subject: [PATCH 29/63] [mpfr] update CMakeLists for new version --- ports/mpfr/CMakeLists.txt | 327 +++++++++++++++++++------------------- ports/mpfr/gmp_printf.c | 6 - ports/mpfr/portfile.cmake | 1 - 3 files changed, 165 insertions(+), 169 deletions(-) delete mode 100644 ports/mpfr/gmp_printf.c diff --git a/ports/mpfr/CMakeLists.txt b/ports/mpfr/CMakeLists.txt index 7770b18fda40e9..f0064666cab5bd 100644 --- a/ports/mpfr/CMakeLists.txt +++ b/ports/mpfr/CMakeLists.txt @@ -11,237 +11,240 @@ set(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR}) # Sources set(SRCS - src/gmp_printf.c - src/mpfr.h - src/mpf2mpfr.h - src/mpfr-gmp.h - src/mpfr-impl.h - src/mpfr-intmax.h - src/mpfr-longlong.h - src/mpfr-thread.h - src/exceptions.c - src/extract.c - src/uceil_exp2.c - src/uceil_log2.c - src/ufloor_log2.c + src/abort_prec_max.c + src/acos.c + src/acosh.c src/add.c src/add1.c + src/add1sp.c + src/add_d.c src/add_ui.c src/agm.c + src/ai.c + src/asin.c + src/asinh.c + src/atan.c + src/atan2.c + src/atanh.c + src/bernoulli.c + src/beta.c + src/buildopt.c + src/cache.c + src/cbrt.c + src/check.c src/clear.c + src/clears.c src/cmp.c + src/cmp2.c src/cmp_abs.c + src/cmp_d.c + src/cmp_ld.c src/cmp_si.c src/cmp_ui.c src/comparisons.c + src/constant.c + src/const_catalan.c + src/const_euler.c + src/const_log2.c + src/const_pi.c + src/copysign.c + src/cos.c + src/cosh.c + src/cot.c + src/coth.c + src/csc.c + src/csch.c + src/digamma.c + src/dim.c + src/div.c src/div_2exp.c - src/div_2si.c + src/div_2si.c src/div_2ui.c - src/div.c + src/div_d.c src/div_ui.c src/dump.c + src/d_div.c + src/d_sub.c + src/eint.c src/eq.c + src/erandom.c + src/erf.c + src/erfc.c + src/exceptions.c + src/exp.c src/exp10.c src/exp2.c src/exp3.c - src/exp.c + src/expm1.c + src/exp_2.c + src/extract.c + src/factorial.c + src/fits_intmax.c + src/fits_sint.c + src/fits_slong.c + src/fits_sshort.c + src/fits_uint.c + src/fits_uintmax.c + src/fits_ulong.c + src/fits_ushort.c + src/fma.c + src/fmma.c + src/fms.c src/frac.c + src/free_cache.c src/frexp.c + src/gamma.c + src/gammaonethird.c + src/gamma_inc.c src/get_d.c + src/get_d64.c src/get_exp.c + src/get_f.c + src/get_float128.c + src/get_flt.c + src/get_ld.c + src/get_patches.c + src/get_q.c + src/get_si.c + src/get_sj.c src/get_str.c + src/get_ui.c + src/get_uj.c + src/get_z.c + src/get_z_exp.c + src/gmp_op.c + src/grandom.c + src/hypot.c src/init.c + src/init2.c + src/inits.c + src/inits2.c src/inp_str.c - src/isinteger.c + src/int_ceil_log2.c src/isinf.c + src/isinteger.c src/isnan.c src/isnum.c - src/const_log2.c + src/isqrt.c + src/isregular.c + src/iszero.c + src/jn.c + src/li2.c + src/lngamma.c src/log.c + src/log10.c + src/log1p.c + src/log2.c + src/logging.c + src/log_ui.c + src/minmax.c + src/min_prec.c src/modf.c + src/mpfr-gmp.c + src/mpfr-mini-gmp.c + src/mpn_exp.c + src/mp_clz_tab.c + src/mul.c + src/mulders.c src/mul_2exp.c src/mul_2si.c src/mul_2ui.c - src/mul.c + src/mul_d.c src/mul_ui.c src/neg.c src/next.c + src/nrandom.c + src/odd_p.c src/out_str.c - src/printf.c - src/vasprintf.c - src/const_pi.c + src/pool.c src/pow.c + src/powerof2.c src/pow_si.c src/pow_ui.c + src/pow_z.c + src/printf.c src/print_raw.c - src/print_rnd_mode.c + src/print_rnd_mode.c + src/random_deviate.c + src/rec_sqrt.c src/reldiff.c + src/rem1.c + src/rint.c + src/rndna.c + src/root.c + src/round_near_x.c + src/round_p.c src/round_prec.c + src/scale2.c + src/sec.c + src/sech.c src/set.c src/setmax.c src/setmin.c + src/setsign.c src/set_d.c + src/set_d64.c src/set_dfl_prec.c src/set_exp.c - src/set_rnd.c src/set_f.c + src/set_float128.c + src/set_flt.c + src/set_inf.c + src/set_ld.c + src/set_nan.c src/set_prc_raw.c src/set_prec.c src/set_q.c + src/set_rnd.c src/set_si.c + src/set_si_2exp.c + src/set_sj.c src/set_str.c src/set_str_raw.c src/set_ui.c + src/set_ui_2exp.c + src/set_uj.c src/set_z.c + src/set_zero.c + src/set_z_exp.c + src/sgn.c + src/signbit.c + src/sin.c + src/sinh.c + src/sinh_cosh.c + src/sin_cos.c + src/si_op.c + src/sqr.c src/sqrt.c src/sqrt_ui.c + src/stack_interface.c + src/strtofr.c src/sub.c src/sub1.c + src/sub1sp.c + src/subnormal.c + src/sub_d.c src/sub_ui.c - src/rint.c + src/sum.c + src/swap.c + src/tan.c + src/tanh.c + src/ubf.c + src/uceil_exp2.c + src/uceil_log2.c + src/ufloor_log2.c src/ui_div.c + src/ui_pow.c + src/ui_pow_ui.c src/ui_sub.c src/urandom.c src/urandomb.c - src/get_z_exp.c - src/swap.c - src/factorial.c - src/cosh.c - src/sinh.c - src/tanh.c - src/sinh_cosh.c - src/acosh.c - src/asinh.c - src/atanh.c - src/atan.c - src/cmp2.c - src/exp_2.c - src/asin.c - src/const_euler.c - src/cos.c - src/sin.c - src/tan.c - src/fma.c - src/fms.c - src/hypot.c - src/log1p.c - src/expm1.c - src/log2.c - src/log10.c - src/ui_pow.c - src/ui_pow_ui.c - src/minmax.c - src/dim.c - src/signbit.c - src/copysign.c - src/setsign.c - src/gmp_op.c - src/init2.c - src/acos.c - src/sin_cos.c - src/set_nan.c - src/set_inf.c - src/set_zero.c - src/powerof2.c - src/gamma.c - src/set_ld.c - src/get_ld.c - src/cbrt.c - src/volatile.c - src/fits_s.h - src/fits_sshort.c - src/fits_sint.c - src/fits_slong.c - src/fits_u.h - src/fits_ushort.c - src/fits_uint.c - src/fits_ulong.c - src/fits_uintmax.c - src/fits_intmax.c - src/get_si.c - src/get_ui.c - src/zeta.c - src/cmp_d.c - src/erf.c - src/inits.c - src/inits2.c - src/clears.c - src/sgn.c - src/check.c - src/sub1sp.c + src/vasprintf.c src/version.c - src/mpn_exp.c - src/mpfr-gmp.c - src/mp_clz_tab.c - src/sum.c - src/add1sp.c - src/free_cache.c - src/si_op.c - src/cmp_ld.c - src/set_ui_2exp.c - src/set_si_2exp.c - src/set_uj.c - src/set_sj.c - src/get_sj.c - src/get_uj.c - src/get_z.c - src/iszero.c - src/cache.c - src/sqr.c - src/int_ceil_log2.c - src/isqrt.c - src/strtofr.c - src/pow_z.c - src/logging.c - src/mulders.c - src/get_f.c - src/round_p.c - src/erfc.c - src/atan2.c - src/subnormal.c - src/const_catalan.c - src/root.c - src/gen_inverse.h - src/sec.c - src/csc.c - src/cot.c - src/eint.c - src/sech.c - src/csch.c - src/coth.c - src/round_near_x.c - src/constant.c - src/abort_prec_max.c - src/stack_interface.c - src/lngamma.c - src/zeta_ui.c - src/set_d64.c - src/get_d64.c - src/jn.c + src/volatile.c src/yn.c - src/rem1.c - src/get_patches.c - src/add_d.c - src/sub_d.c - src/d_sub.c - src/mul_d.c - src/div_d.c - src/d_div.c - src/li2.c - src/rec_sqrt.c - src/min_prec.c - src/buildopt.c - src/digamma.c - src/bernoulli.c - src/isregular.c - src/set_flt.c - src/get_flt.c - src/scale2.c - src/set_z_exp.c - src/ai.c - src/gammaonethird.c - src/ieee_floats.h - src/grandom.c) + src/zeta.c + src/zeta_ui.c) configure_file("src/mparam_h.in" "mparam.h") diff --git a/ports/mpfr/gmp_printf.c b/ports/mpfr/gmp_printf.c deleted file mode 100644 index 1ccb94c0c6bb29..00000000000000 --- a/ports/mpfr/gmp_printf.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include - -extern int __gmpfr_fprintf(const char *fmt, va_list argp) { - return fprintf(stderr, fmt, argp); -} diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 4b534ff0c9e101..7e455041b6f5dd 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -9,7 +9,6 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/test_stdarg.c DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/gmp_printf.c DESTINATION ${SOURCE_PATH}/src) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From ded0d0141a13be84bec1f04ac34d5b72e7547164 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 20 Dec 2018 12:44:22 +0800 Subject: [PATCH 30/63] Fix static build --- ports/ponder/portfile.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake index ee0267b00757b5..b85378ce354ecf 100644 --- a/ports/ponder/portfile.cmake +++ b/ports/ponder/portfile.cmake @@ -21,12 +21,18 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ponder/cmake) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/${PORT}/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/ponder - ${CURRENT_PACKAGES_DIR}/lib/ponder) + ${CURRENT_PACKAGES_DIR}/debug/lib/${PORT} + ${CURRENT_PACKAGES_DIR}/lib/${PORT}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ ${CURRENT_PACKAGES_DIR}/include/${PORT}/config.hpp _contents) + string(REPLACE "ifndef PONDER_STATIC" "if 0 //ifndef PONDER_STATIC" _contents "${_contents}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/${PORT}/config.hpp "${_contents}") +endif() # Handle copyright -configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/ponder/copyright COPYONLY) +configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) From 6e3bd45c671e16e9b5534114204cbc66bc4b74eb Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 19 Dec 2018 23:45:38 -0800 Subject: [PATCH 31/63] [antlr4] fix copyright download name --- ports/antlr4/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index cda011c60a3050..3663a93476154e 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_download_distfile(ARCHIVE # license not exist in antlr folder. vcpkg_download_distfile(LICENSE URLS https://raw.githubusercontent.com/antlr/antlr4/${VERSION}/LICENSE.txt - FILENAME "antlr4-copyright" + FILENAME "antlr4-copyright_${VERSION}" SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b ) From 3d164e3e4c19e54763fe34bcb9fe2e5bdcafc1d0 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 20 Dec 2018 15:00:34 -0800 Subject: [PATCH 32/63] [spdlog] add comment about patch --- ports/spdlog/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index f953af33dfadbe..c676c6467d5395 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1 HEAD_REF v1.x PATCHES - fmt-external-cmake-option.patch + fmt-external-cmake-option.patch # This patch is in the upstream project and can be removed next version update. ) vcpkg_configure_cmake( From bf4a864a73dfe0f68a70598c9f5087beca57f2c7 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Fri, 21 Dec 2018 00:42:50 -0800 Subject: [PATCH 33/63] [msys2] bump control version in msys dependant ports --- ports/ffmpeg/CONTROL | 2 +- ports/icu/CONTROL | 2 +- ports/libgd/CONTROL | 2 +- ports/libvpx/CONTROL | 2 +- ports/openal-soft/CONTROL | 2 +- ports/openssl-unix/CONTROL | 2 +- ports/x264/CONTROL | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 35b3e257e8d1a6..ce69402dc91942 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.1 +Version: 4.1-1 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations. diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL index 0cb924a2a7d8ef..171eb1129b1440 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,3 +1,3 @@ Source: icu -Version: 61.1-4 +Version: 61.1-5 Description: Mature and widely used Unicode and localization library. diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL index a8373f51575702..d9eb37c754ea04 100644 --- a/ports/libgd/CONTROL +++ b/ports/libgd/CONTROL @@ -1,4 +1,4 @@ Source: libgd -Version: 2.2.4-4 +Version: 2.2.4-5 Description: Open source code library for the dynamic creation of images by programmers. Build-Depends: freetype, libjpeg-turbo, libpng, libwebp, tiff, fontconfig diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index fa15226290b1eb..77a44f1959cffb 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,3 +1,3 @@ Source: libvpx -Version: 1.7.0 +Version: 1.7.0-1 Description: The reference software implementation for the video coding formats VP8 and VP9. diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL index 6f16b26bda2722..cc30df1def1818 100644 --- a/ports/openal-soft/CONTROL +++ b/ports/openal-soft/CONTROL @@ -1,3 +1,3 @@ Source: openal-soft -Version: 1.19.1 +Version: 1.19.1-1 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API. diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 28dc5da98e80ec..a7e532afe92346 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,3 +1,3 @@ Source: openssl-unix -Version: 1.0.2p-1 +Version: 1.0.2p-2 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 44b664142e5a63..66fda9beefb49b 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,3 +1,3 @@ Source: x264 -Version: 157-303c484ec828ed0 +Version: 157-303c484ec828ed0-1 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format From 67ca08e9d3d0fb8097da84bc593a805f7169095f Mon Sep 17 00:00:00 2001 From: the-j0k3r <31389848+the-j0k3r@users.noreply.github.com> Date: Sat, 22 Dec 2018 09:16:18 +0000 Subject: [PATCH 34/63] [openssl] openssl-bump-to-1.0.2q-cve-fixes https://www.openssl.org/news/vulnerabilities.html --- ports/openssl-unix/CONTROL | 2 +- ports/openssl-unix/portfile.cmake | 4 ++-- ports/openssl-uwp/CONTROL | 2 +- ports/openssl-uwp/portfile.cmake | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 28dc5da98e80ec..59f68613326040 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,3 +1,3 @@ Source: openssl-unix -Version: 1.0.2p-1 +Version: 1.0.2q Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake index c877905bb38daa..b0064cdf4a6869 100644 --- a/ports/openssl-unix/portfile.cmake +++ b/ports/openssl-unix/portfile.cmake @@ -3,14 +3,14 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM endif() include(vcpkg_common_functions) -set(OPENSSL_VERSION 1.0.2p) +set(OPENSSL_VERSION 1.0.2q) vcpkg_find_acquire_program(PERL) vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 + SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0 ) vcpkg_extract_source_archive_ex( diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL index 4b4871f3c9d901..02b19126a048fd 100644 --- a/ports/openssl-uwp/CONTROL +++ b/ports/openssl-uwp/CONTROL @@ -1,3 +1,3 @@ Source: openssl-uwp -Version: 1.0.2l-winrt +Version: 1.0.2q-winrt Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index ef9801380300a0..77264b3ec301f7 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -19,7 +19,7 @@ endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2l_WinRT) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2q_WinRT) vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(JOM) @@ -28,9 +28,9 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${JOM_EXE_PATH}") vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2l_WinRT.zip" - FILENAME "openssl-microsoft-1.0.2l_WinRT.zip" - SHA512 238b3daad7f1a2486e09d47e6d1bd4b0aa8e8a896358c6dfe11a77c2654da1b29d3c7612f9d200d5be5a020f33d96fe39cd75b99aa35aa4129feb756f7f98ee8 + URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2q_WinRT.zip" + FILENAME "openssl-microsoft-1.0.2q_WinRT.zip" + SHA512 828ddeb10b7d04155df64cb38f3d8b8109ff01494fed7f6c1063673e45414c1c309379e8bbe72478bd0fbae649d6749877c20b1b4a91db136a0853745f4da6b6 ) vcpkg_extract_source_archive(${ARCHIVE}) From 6f398da24938ac65b4a1ccee70e7196e1b790730 Mon Sep 17 00:00:00 2001 From: LazyHamster Date: Tue, 1 Jan 2019 12:59:12 +0300 Subject: [PATCH 35/63] Updated libidn2 to version 2.0.5. --- ports/libidn2/CONTROL | 2 +- ports/libidn2/config.h | 6 +++--- ports/libidn2/portfile.cmake | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL index 46e81c7bf1b6df..8496bc396f1d91 100644 --- a/ports/libidn2/CONTROL +++ b/ports/libidn2/CONTROL @@ -1,4 +1,4 @@ Source: libidn2 -Version: 2.0.4 +Version: 2.0.5 Build-Depends: libiconv Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names. diff --git a/ports/libidn2/config.h b/ports/libidn2/config.h index 9e61bc8f21a30b..5d5e6efcca5087 100644 --- a/ports/libidn2/config.h +++ b/ports/libidn2/config.h @@ -670,7 +670,7 @@ /* #undef PACKAGE_PACKAGER_VERSION */ /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libidn2 2.0.4" +#define PACKAGE_STRING "libidn2 @IDN2_VERSION@" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libidn2" @@ -679,7 +679,7 @@ #define PACKAGE_URL "https://www.gnu.org/software/libidn/#libidn2" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.4" +#define PACKAGE_VERSION "@IDN2_VERSION@" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'ptrdiff_t'. */ @@ -771,7 +771,7 @@ /* Version number of package */ -#define VERSION "2.0.4" +#define VERSION "@IDN2_VERSION@" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'wchar_t'. */ diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 98892e2c0e99d5..9d02b76796a038 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -1,21 +1,21 @@ include(vcpkg_common_functions) -set(IDN2_VERSION 2.0.4) +set(IDN2_VERSION 2.0.5) set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libidn2-${IDN2_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" FILENAME "${IDN2_FILENAME}" - SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2 + SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79 ) vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/string.h DESTINATION ${SOURCE_PATH}/gl) +configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH}) + function(simple_copy_template_header FILE_PATH BASE_NAME) if(NOT EXISTS ${FILE_PATH}/${BASE_NAME}.h) if(EXISTS ${FILE_PATH}/${BASE_NAME}.in.h) From d02df9d2550b0e43ddd12a7c035a1bdc7b37b01b Mon Sep 17 00:00:00 2001 From: Todor Prokopov Date: Mon, 7 Jan 2019 22:33:37 +0200 Subject: [PATCH 36/63] [entityx] Do not build shared library in addition to static one (#5006) --- ports/entityx/CONTROL | 2 +- ports/entityx/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL index dacd86ee90e289..16dbcfc32a4956 100644 --- a/ports/entityx/CONTROL +++ b/ports/entityx/CONTROL @@ -1,3 +1,3 @@ Source: entityx -Version: 1.2.0-2 +Version: 1.2.0-3 Description: EntityX - A fast, type-safe C++ Entity-Component system. diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake index 5df7da6cdce033..bc6afccc39f372 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DENTITYX_BUILD_TESTING=false + -DENTITYX_BUILD_SHARED=0 ) vcpkg_install_cmake() From a0042b8a667f7d1a102eb042a4bcc82204ccccdf Mon Sep 17 00:00:00 2001 From: Aaron Ang Date: Mon, 7 Jan 2019 12:48:44 -0800 Subject: [PATCH 37/63] OpenVDB: Add `/bigobj` as compiler flag only for MSVC (#4948) * Only set `/bigobj` as C++ compiler flag for MSVC * [openvdb] Bump control version --- ports/openvdb/AddLinkageAndToolsChoice.patch | 8 ++++---- ports/openvdb/CONTROL | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/openvdb/AddLinkageAndToolsChoice.patch b/ports/openvdb/AddLinkageAndToolsChoice.patch index 3d155cbe4edfbe..57078be157cfe5 100644 --- a/ports/openvdb/AddLinkageAndToolsChoice.patch +++ b/ports/openvdb/AddLinkageAndToolsChoice.patch @@ -73,7 +73,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_LIBRARY_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" ) - +IF ( OPENVDB_STATIC ) @@ -130,7 +130,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_PRINT_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" ) +IF ( OPENVDB_BUILD_TOOLS ) @@ -142,7 +142,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$:/bigobj>" ) ADD_EXECUTABLE ( vdb_render ${VDB_RENDER_SOURCE_FILES} @@ -151,7 +151,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_VIEW_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 $<$:/bigobj>" ) -IF (NOT WIN32) ADD_EXECUTABLE ( vdb_view diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index 22c216b5cfc3a6..e822bf04cb35e4 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,5 +1,5 @@ Source: openvdb -Version: 5.0.0-1 +Version: 5.0.0-2 Build-Depends: ilmbase, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess Description: Sparse volume data structure and tools From a20ac0957a5834e6e6ee7905ec4a31c330567582 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Mon, 7 Jan 2019 15:52:45 -0500 Subject: [PATCH 38/63] [libiconv] Add mirror (#5056) --- ports/libiconv/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 7de4cac0e68d1a..4b84ecc5fc52b7 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -10,7 +10,7 @@ include(vcpkg_common_functions) set(LIBICONV_VERSION 1.15) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" + URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz" SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a ) @@ -43,4 +43,4 @@ vcpkg_copy_pdbs() file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright) -vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv) \ No newline at end of file +vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv) From 2d63525a154cf6aba8db2014792eec62087fe1e6 Mon Sep 17 00:00:00 2001 From: ivysnow Date: Tue, 8 Jan 2019 08:03:35 +0800 Subject: [PATCH 39/63] [vcpkg] add support for FreeBSD (#4917) * [vcpkg] add support for FreeBSD * [x64-freebsd] Remove triplet because it is not currently in the set of supported triplets --- scripts/bootstrap.sh | 2 ++ scripts/cmake/vcpkg_configure_cmake.cmake | 2 ++ .../cmake/vcpkg_find_acquire_program.cmake | 2 ++ scripts/vcpkgTools.xml | 20 +++++++++++++++++++ toolsrc/src/vcpkg/metrics.cpp | 2 ++ toolsrc/src/vcpkg/tools.cpp | 4 +++- 6 files changed, 31 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4bb42866830546..7a1b2777bd34af 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -123,6 +123,8 @@ fetchTool() os="linux" elif [ "$UNAME" = "Darwin" ]; then os="osx" + elif [ "$UNAME" = "FreeBSD" ]; then + os="freebsd" else echo "Unknown uname: $UNAME" return 1 diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 617fe1a0ffbe51..cf3fc7861cc40e 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -170,6 +170,8 @@ function(vcpkg_configure_cmake) list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/android.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/osx.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/freebsd.cmake") endif() list(APPEND _csc_OPTIONS diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index b6cfc4aab00c4a..0c3a9bca26f701 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -123,6 +123,8 @@ function(vcpkg_find_acquire_program VAR) set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-osx") + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd") else() set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux") endif() diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 9378c783257e56..18ca741c2d997a 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -21,6 +21,13 @@ ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f cmake-3.12.4-Linux-x86_64.tar.gz + + 3.12.4 + cmake-3.12.4-FreeBSD-x86_64/bin/cmake + https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz + b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479 + cmake-3.12.4-FreeBSD-x86_64.tar.gz + 2.20.0 cmd\git.exe @@ -40,6 +47,12 @@ + + 2.7.4 + + + + 2.4.1 vswhere.exe @@ -94,4 +107,11 @@ acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3 ninja-mac-1.8.2.zip + + 1.8.2 + ninja + https://github.com/ivysnow/ninja/releases/download/v1.8.2/ninja-freebsd.zip + 56a55ae9a6b5dfad4f28f9fe9b8114f1475c999d2f07fff7efa7375f987e74b498e9b63c41fc6c577756f15f3a1459c6d5d367902de3bedebdf9a9fd49089a86 + ninja-freebsd-1.8.2.zip + diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 2a73dba899be33..c34f309745372f 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -220,6 +220,8 @@ namespace vcpkg::Metrics "OSX", #elif defined(__linux__) "Linux", +#elif defined(__FreeBSD__) + "FreeBSD", #elif defined(__unix__) "Unix", #else diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 365271872dabcc..b713b2752662b6 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -52,11 +52,13 @@ namespace vcpkg static constexpr StringLiteral OS_STRING = "osx"; #elif defined(__linux__) static constexpr StringLiteral OS_STRING = "linux"; +#elif defined(__FreeBSD__) + static constexpr StringLiteral OS_STRING = "freebsd"; #else return std::string("operating system is unknown"); #endif -#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) +#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) static const std::string XML_VERSION = "2"; static const fs::path XML_PATH = paths.scripts / "vcpkgTools.xml"; static const std::regex XML_VERSION_REGEX {R"###()###"}; From 75675059bfdaf3ca197ce78d881d4968a5da5877 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 8 Jan 2019 15:42:41 -0500 Subject: [PATCH 40/63] Upgrade google-cloud-cpp to v0.5.0. (#5096) This time with less patches! --- ports/google-cloud-cpp/CONTROL | 2 +- ports/google-cloud-cpp/include-protobuf.patch | 13 ------------- ports/google-cloud-cpp/portfile.cmake | 14 +++++--------- 3 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 ports/google-cloud-cpp/include-protobuf.patch diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 5689f78bbd8c60..8be4a8c336fe03 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp -Version: 0.4.0 +Version: 0.5.0 Build-Depends: grpc, gtest, curl, crc32c Description: C++ Client Libraries for Google Cloud Platform APIs. diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch deleted file mode 100644 index d0e3529c7e3142..00000000000000 --- a/ports/google-cloud-cpp/include-protobuf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:56:34.029389338 -0500 -+++ a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:57:18.461259917 -0500 -@@ -53,6 +53,10 @@ - # Configure the location of proto files, particulary the googleapis protos. - list(APPEND PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis" - "${PROJECT_SOURCE_DIR}") -+find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto) -+if(PROTO_INCLUDE_DIR) -+ list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}") -+endif() - - # Include the functions to compile proto files. - include(CompileProtos) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 54fa6d4839b600..94e227c4fe84cc 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -1,17 +1,13 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported yet. Building static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() - include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/google-cloud-cpp - REF v0.4.0 - SHA512 2198a7e055c37c2a0d782e2226c2cfb4009e01c36783fe23a0a32b10c7800c1998fbaea17281cb831e7b58975d1bcdb1b2bfec0a5e4fd9d08f25299b96e8893a + REF v0.5.0 + SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5 HEAD_REF master - PATCHES include-protobuf.patch ) set(GOOGLEAPIS_VERSION 6a3277c0656219174ff7c345f31fb20a90b30b97) @@ -29,7 +25,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=vcpkg + -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF ) From 46825bf4d445a8e251ee026deb43645bc68af130 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 9 Jan 2019 05:01:33 +0800 Subject: [PATCH 41/63] [uriparser] Update to 0.9.1 to fix #5086 (#5094) --- ports/uriparser/CONTROL | 2 +- ports/uriparser/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL index 4777fe8e9a32e4..d14b93dedc0240 100644 --- a/ports/uriparser/CONTROL +++ b/ports/uriparser/CONTROL @@ -1,3 +1,3 @@ Source: uriparser -Version: 0.9.0 +Version: 0.9.1 Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake index 8061a6221dcf0d..342269c7851326 100644 --- a/ports/uriparser/portfile.cmake +++ b/ports/uriparser/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uriparser/uriparser - REF uriparser-0.9.0 - SHA512 d0a317fa55531f75b0e7ec712ea36f8e36a8cf72fdb4f959f3df7cc7c519d09752b194579a4f288bcea56d7be105da3d79dd8323960e74daff93f1dad2b5085d + REF uriparser-0.9.1 + SHA512 5a553bc503b345bd81ad8bcfa25ab1e0f0ea0a0446a0c4beba9129d128d24de418efd10f04f8814b4f8864f6e219b5b9b938934edea76e78c0235428e5062636 HEAD_REF master ) From fbabe0797ca1dd40e69fbbafe79e8cb456f19072 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 8 Jan 2019 16:03:57 -0500 Subject: [PATCH 42/63] [cppgraphqlgen] Update to version 1.0.0 (#5017) * [cppgraphqlgen] Update to version 0.7 * [cppgraphqlgen] Update to 1.0.0 --- ports/cppgraphqlgen/CONTROL | 2 +- ports/cppgraphqlgen/portfile.cmake | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index 7eaa3d6bedd636..5e51572cc9f6a0 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,4 +1,4 @@ Source: cppgraphqlgen -Version: 0.6 +Version: 1.0.0 Build-Depends: pegtl, rapidjson Description: C++ GraphQL schema service generator diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 70ff810706c9fd..926a4ecd2ff137 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,17 +3,17 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cppgraphqlgen - REF v0.6 - SHA512 cc2596f5cd975377fcc9432eee11973e2ff044c244c3ac13c3f45549874c2fe0ac5c48bccb96813b48a1b7c940bb54decc194d9eb358c6ae39d1288b9ce58b01 + REF v1.0.0 + SHA512 3756c31063dc86d1c37d3cb709221b2b6e7dda5f3405d7586e4f395fd4915b1088c0305b116164c615846413042857fd688e61ef36c5c2aab218cfab8f16370c HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF -DUPDATE_SAMPLES=OFF - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 + OPTIONS_RELEASE -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen + OPTIONS_DEBUG -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/debug/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/debug/tools/cppgraphqlgen ) vcpkg_install_cmake() From 6ce206c785d0881f21e2f9e53bb03ce946db23a6 Mon Sep 17 00:00:00 2001 From: Lars Ivar Hatledal Date: Wed, 9 Jan 2019 00:02:25 +0100 Subject: [PATCH 43/63] [fmilib] fmilib not building on x64-windows (#4999) * fix fmilib not building on x64-windows * [fmilib] bump dash version in control file This will force a rebuild when updating * only search for MSVC generator on windows --- ports/fmilib/CONTROL | 2 +- ports/fmilib/portfile.cmake | 40 +++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/ports/fmilib/CONTROL b/ports/fmilib/CONTROL index 859098e3099023..aa6b868d59bfe5 100644 --- a/ports/fmilib/CONTROL +++ b/ports/fmilib/CONTROL @@ -1,3 +1,3 @@ Source: fmilib -Version: 2.0.3 +Version: 2.0.3-1 Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0. See http://www.fmi-standard.org/ diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake index df72dd7eec22b0..5692b7d123c8e0 100644 --- a/ports/fmilib/portfile.cmake +++ b/ports/fmilib/portfile.cmake @@ -69,6 +69,36 @@ SET(OPTIONS file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}) +if (WIN32) + + if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(GENERATOR "Visual Studio 12 2013") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(GENERATOR "Visual Studio 12 2013 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(GENERATOR "Visual Studio 12 2013 ARM") + + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") + set(GENERATOR "Visual Studio 14 2015") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") + set(GENERATOR "Visual Studio 14 2015 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") + set(GENERATOR "Visual Studio 14 2015 ARM") + + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(GENERATOR "Visual Studio 15 2017") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(GENERATOR "Visual Studio 15 2017 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(GENERATOR "Visual Studio 15 2017 ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(GENERATOR "Visual Studio 15 2017") + else() + message(FATAL_ERROR "Unable to determine appropriate generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") + endif() + +endif() + foreach(BUILDTYPE "rel" "dbg") message("Building ${TARGET_TRIPLET}-${BUILDTYPE}...") @@ -81,10 +111,12 @@ foreach(BUILDTYPE "rel" "dbg") file(REMOVE_RECURSE ${BUILD_DIR}) file(MAKE_DIRECTORY ${BUILD_DIR}) - if(RELEASE_BUILD) - SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR}) - else() - SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR}/debug) + SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR}) + if(WIN32) + SET(OPTIONS ${OPTIONS} -G ${GENERATOR}) + endif() + if(NOT RELEASE_BUILD) + STRING(APPEND FMILIB_INSTALL_PREFIX "/debug") endif() # Step 1: Configure From 751db7b568c3bb94084d033fd82e5b6dcd443825 Mon Sep 17 00:00:00 2001 From: Jelani Brandon Date: Tue, 8 Jan 2019 15:26:06 -0800 Subject: [PATCH 44/63] Update Azure IoTHub packages for new release (#5000) * Update Azure IoTHub packages for new release * [azure-c-shared-utility] Avoid double expanding variables --- ports/azure-c-shared-utility/CONTROL | 2 +- .../no-double-expand-cmake.patch | 13 +++++++++++++ ports/azure-c-shared-utility/portfile.cmake | 5 +++-- ports/azure-iot-sdk-c/CONTROL | 2 +- ports/azure-iot-sdk-c/portfile.cmake | 4 ++-- ports/azure-uamqp-c/CONTROL | 2 +- ports/azure-uamqp-c/portfile.cmake | 4 ++-- ports/azure-uhttp-c/portfile.cmake | 4 ++-- ports/azure-umqtt-c/CONTROL | 2 +- ports/azure-umqtt-c/portfile.cmake | 4 ++-- 10 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 ports/azure-c-shared-utility/no-double-expand-cmake.patch diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index c5e51adaf08391..51efe3f6fd9c2d 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,4 +1,4 @@ Source: azure-c-shared-utility -Version: 1.1.11-1 +Version: 1.1.11-3 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) diff --git a/ports/azure-c-shared-utility/no-double-expand-cmake.patch b/ports/azure-c-shared-utility/no-double-expand-cmake.patch new file mode 100644 index 00000000000000..3775ad6b513d26 --- /dev/null +++ b/ports/azure-c-shared-utility/no-double-expand-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 190ea87..a434cee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -264,7 +264,7 @@ if(${use_applessl}) + include_directories(./pal/ios-osx/) + endif() + +-if (WIN32 AND (${CMAKE_SYSTEM_VERSION} VERSION_EQUAL "10.0.17763.0" OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.0.17763.0")) ++if (WIN32 AND (CMAKE_SYSTEM_VERSION VERSION_EQUAL "10.0.17763.0" OR CMAKE_SYSTEM_VERSION VERSION_GREATER "10.0.17763.0")) + # Windows added support for UNIX domain sockets to the OS and SDK + # in the Oct 2018 update (10.0.17763.0, aka RS5) + add_definitions(-DAF_UNIX_ON_WINDOWS) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 838528ce4b4773..cc4514dfee052e 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -5,9 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF bcf6393b1ce3cecf0fcdf8988621fd6e4d414df3 - SHA512 e5ae3c895777df90e725da7686939b46fa4df19ce5626bbe13a5aaf1b844ee56c96ddf2a9ad8426a96cdc34e8be338c95b6759e618143e19445c5180fb0f7ed1 + REF 1d622902d7842f94193fc394987f2b4e978bb700 + SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84 HEAD_REF master + PATCHES no-double-expand-cmake.patch ) vcpkg_configure_cmake( diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 9c9410bfef7f0d..0164d44a048753 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-iot-sdk-c -Version: 1.2.11-1 +Version: 1.2.12-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson Description: A C99 SDK for connecting devices to Microsoft Azure IoT services diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 6ec8ba3eb7bc84..2b1ef492c38a68 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF acff8b1677150cb165a7b111745144cf8fab76cc - SHA512 7e7e0679d48e76539a607a593b1c9ccc57eeb4f8bf33fb49051ad99203d1568f0ac2a38fe32ba0b3670cea32a2318e8c135c709ba5712f95cd8005ff21572e28 + REF 350b51f5abaedc975dae5419ad1fa4add7635fd2 + SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb HEAD_REF master PATCHES improve-external-deps.patch ) diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index 8f5f63c082e778..062c02befd1e3a 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uamqp-c -Version: 1.2.11-1 +Version: 1.2.11-2 Build-Depends: azure-c-shared-utility Description: AMQP library for C diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index 0f7591099581a1..b7ee4162529337 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 075b5a669f49b9d3b68b7bf9b465fe92e1c740aa - SHA512 54b7c9ebdaca13d44634e99a064aac54e9eadaedcbed723aabc62c70414ef54d62c5f58ddc836e8020eba4ca0d03d27c2d73391d4071f973fda228866215ec58 + REF f29401ab5eb3853390d5f573d8fb37c0c96dba16 + SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73 HEAD_REF master ) diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index de34ba4dddf20c..64834510d54d6b 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF ed7d104c4ab96aaa68e429066953874f12be70eb - SHA512 512f8fd46dbc40ff79ffdbc2ea881a29aaa72db4c36f16f96f30a224220183e295d8e39a4965d788f92f4976fa6d37b197c04b32bbd187d456d5c5d516b95c9f + REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed + SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30 HEAD_REF master ) diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 9a5f5e030fff7b..4078446018663e 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-umqtt-c -Version: 1.1.11-1 +Version: 1.1.11-2 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index cb14cfaa8ae1b5..6bfb77f8960198 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF ff05514c9b4742ae8d7785719a399a7fe6eac09b - SHA512 d750390d38555ab00e5d5cc5aa0b07ae452afd2e2af0dade5fc1c55f63ad367688b5ff7e97e65ab00f0153340b8bcc1e5039e80e5795b9f9c0cd2c48eedad081 + REF 3205eb26401e9c6639100934e8fb75b75275760d + SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c HEAD_REF master ) From bd547e5e39c775a0c3332559e015441d62ff2aa4 Mon Sep 17 00:00:00 2001 From: Victor Romero Sanchez Date: Tue, 8 Jan 2019 16:07:42 -0800 Subject: [PATCH 45/63] [libidn2] Use vcpkg_extract_source_archive_ex --- ports/libidn2/CONTROL | 2 +- ports/libidn2/portfile.cmake | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL index 8496bc396f1d91..2fc289034f75d4 100644 --- a/ports/libidn2/CONTROL +++ b/ports/libidn2/CONTROL @@ -1,4 +1,4 @@ Source: libidn2 -Version: 2.0.5 +Version: 2.0.5-1 Build-Depends: libiconv Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names. diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 9d02b76796a038..85cc9e6ced9af9 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -2,14 +2,18 @@ include(vcpkg_common_functions) set(IDN2_VERSION 2.0.5) set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libidn2-${IDN2_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" FILENAME "${IDN2_FILENAME}" SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79 ) -vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${IDN2_VERSION} +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/string.h DESTINATION ${SOURCE_PATH}/gl) From 2b2d6edfdeb4b28cf6f35d18cad8134e681f43c3 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 10 Jan 2019 01:29:24 +0800 Subject: [PATCH 46/63] [cli11] Update to 1.6.2 (#5093) --- ports/cli11/CONTROL | 2 +- ports/cli11/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL index 5174d703763bf6..1e75d2a70bb82e 100644 --- a/ports/cli11/CONTROL +++ b/ports/cli11/CONTROL @@ -1,3 +1,3 @@ Source: cli11 -Version: 1.6.1 +Version: 1.6.2 Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index bda9fa2b36505b..08fb83dc9e1bd4 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v1.6.1 - SHA512 df12510bb78823908535a68af65fb8ea0b8b33b362e0b5f2cfa91223db7ebd9e71a55dfe31902c5d10e29c02a9bb59be58f8c69da7a9b4ab456ace64f200ac93 + REF v1.6.2 + SHA512 0160323a7a87ecdf5cff081a4270a30977b87f0592041d8fde84ec655b28cdbc40813567f95df375a4f6f953b60a638deacfb3cc5dec562c4d348dcc532f0ab7 HEAD_REF master ) From 7d31d1b0ebacb942002ea7c507320a724b847788 Mon Sep 17 00:00:00 2001 From: eao197 Date: Wed, 9 Jan 2019 20:38:44 +0300 Subject: [PATCH 47/63] sobjectizer-v5.5.24 and so5extra-v1.2.2 (#5100) --- ports/so5extra/CONTROL | 2 +- ports/so5extra/portfile.cmake | 4 ++-- ports/sobjectizer/CONTROL | 2 +- ports/sobjectizer/portfile.cmake | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/so5extra/CONTROL b/ports/so5extra/CONTROL index 41bed72c83eaac..e40d92945f6089 100644 --- a/ports/so5extra/CONTROL +++ b/ports/so5extra/CONTROL @@ -1,4 +1,4 @@ Source: so5extra -Version: 1.2.1 +Version: 1.2.2 Description: A set of additional tools for SObjectizer framework. Build-Depends: sobjectizer diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake index 3d21def42c41dc..6fdc213d7e47e6 100644 --- a/ports/so5extra/portfile.cmake +++ b/ports/so5extra/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 1.2.1) +set(VERSION 1.2.2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so_5_extra-${VERSION}/dev/so_5_extra) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/so_5_extra/so_5_extra-${VERSION}.zip/download" FILENAME "so_5_extra-${VERSION}.zip" - SHA512 84294839c800571e98e5599a16609c955296bb10ad90261c5600d3eb13fd1dfc08a7a895e89ad48b3547c9ebe28cd49c944158849a4f1d8e693d8d2259e94100 + SHA512 957b8953f172cc2ea996fe1bd4e4979b0e3fd5fe8d2abff810ff3800c061e4bf5e2935e6bf190d0385621a182a7a623598959716451d9ad5a8f0f14faed725e2 ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL index ca08ad3a42ddac..33dee914137153 100644 --- a/ports/sobjectizer/CONTROL +++ b/ports/sobjectizer/CONTROL @@ -1,3 +1,3 @@ Source: sobjectizer -Version: 5.5.23 +Version: 5.5.24 Description: SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels. diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 5ca178ef549ef0..c79f5adfaabc04 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 5.5.23) +set(VERSION 5.5.24) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip" FILENAME "so-${VERSION}.zip" - SHA512 61c2b9e42d88eafef67b38a1b517af7cbda131835d8ae60c914bd89d21e84801278292064c7ad823c0b31a376b0db68f1ee4a7e87892c2f166c39e8068d86122 + SHA512 d33b5660fb6d7b1182d68069bb86782dd7632071723762875d88dd6d67353f6913b25e0574d87e06b86f472608631f59c3e26dc9c67cda9f8223454ae758b524 ) vcpkg_extract_source_archive(${ARCHIVE}) From c4fee273cf5d45c855d73ae09008b3ed0f34dd09 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 9 Jan 2019 09:48:30 -0800 Subject: [PATCH 48/63] Update urdfdom_headers to version 1.0.2 (#5067) --- ports/urdfdom-headers/CONTROL | 2 +- ports/urdfdom-headers/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL index 0b967f459992f9..9e53e9b2f81b35 100644 --- a/ports/urdfdom-headers/CONTROL +++ b/ports/urdfdom-headers/CONTROL @@ -1,3 +1,3 @@ Source: urdfdom-headers -Version: 1.0.0-2 +Version: 1.0.2 Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF. diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake index eb2c9020e801ca..7d11936ec823b9 100644 --- a/ports/urdfdom-headers/portfile.cmake +++ b/ports/urdfdom-headers/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom_headers - REF 1.0.0 - SHA512 b1f63c1a13f062c987d6be4fcea5eea903577a710d44fdce077722b70d72eb65a265131beac1fdeba576bde189ebf51ac0eb19b2b06a34b0f9fb9dcbd437291a + REF 1.0.2 + SHA512 902cf18b3ccc62dd5d732707e9ca2b8698f3307b8005d3858fcdd0e9585d580bbe5d2ec77c8c8bfa7b8776b870844368a8ec93b0f8a8d71420cf5015a99b8867 HEAD_REF master ) From 11286693b0745dc97246170e06d9e1547a8ce0fd Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Wed, 9 Jan 2019 20:52:58 +0300 Subject: [PATCH 49/63] [asio] Update to 1.12.2 (#5050) --- ports/asio/CONTROL | 2 +- ports/asio/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/asio/CONTROL b/ports/asio/CONTROL index 295b01db8eaa49..6ba9e43181ff3d 100644 --- a/ports/asio/CONTROL +++ b/ports/asio/CONTROL @@ -1,3 +1,3 @@ Source: asio -Version: 1.12.1-1 +Version: 1.12.2 Description: Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach. diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 60d329ed81cd7b..bd5f5af2a131ee 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-12-1 - SHA512 e335eea05c27a72faae95dd5d5ca997ac8bb144cd5fb68e5538129ea6afb3b4d88e2be1c31a1effdbbbe4c93e07ee274a7e5817453c29faf56abf9ab692b2dd6 + REF asio-1-12-2 + SHA512 7c2e213ff154bb2e5776b37906d437a62206f973316c94706e6d42e3c2f0866e7d97f3e40225ab5f28bf2c4a33fa0b38a4b75421aef86ddf9f2da0811caa2d00 HEAD_REF master ) From bb1bb1c94a72b891883efa6522791620ef3bbc0f Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 14 Dec 2018 17:00:47 -0800 Subject: [PATCH 50/63] Updates 2018.12.14 --- ports/abseil/CONTROL | 2 +- ports/abseil/portfile.cmake | 4 ++-- ports/asmjit/CONTROL | 2 +- ports/asmjit/portfile.cmake | 4 ++-- ports/catch2/CONTROL | 2 +- ports/catch2/portfile.cmake | 4 ++-- ports/chakracore/CONTROL | 2 +- ports/chakracore/portfile.cmake | 4 ++-- ports/cimg/CONTROL | 2 +- ports/cimg/portfile.cmake | 4 ++-- ports/dimcli/CONTROL | 2 +- ports/dimcli/portfile.cmake | 4 ++-- ports/directxmesh/CONTROL | 2 +- ports/directxmesh/portfile.cmake | 4 ++-- ports/directxtex/CONTROL | 2 +- ports/directxtex/portfile.cmake | 4 ++-- ports/directxtk/CONTROL | 2 +- ports/directxtk/portfile.cmake | 4 ++-- ports/discord-rpc/CONTROL | 2 +- ports/discord-rpc/portfile.cmake | 4 ++-- ports/doctest/CONTROL | 2 +- ports/doctest/portfile.cmake | 4 ++-- ports/eastl/CONTROL | 2 +- ports/eastl/portfile.cmake | 4 ++-- ports/exprtk/CONTROL | 2 +- ports/exprtk/portfile.cmake | 4 ++-- ports/folly/CONTROL | 2 +- ports/folly/portfile.cmake | 4 ++-- ports/forest/CONTROL | 2 +- ports/forest/portfile.cmake | 4 ++-- ports/libpng/CONTROL | 2 +- ports/libpng/portfile.cmake | 4 ++-- ports/libwebsockets/CONTROL | 2 +- ports/libwebsockets/portfile.cmake | 4 ++-- ports/mbedtls/CONTROL | 2 +- ports/mbedtls/portfile.cmake | 4 ++-- ports/ms-gsl/CONTROL | 2 +- ports/ms-gsl/portfile.cmake | 4 ++-- ports/parson/CONTROL | 2 +- ports/parson/portfile.cmake | 4 ++-- ports/protobuf/CONTROL | 2 +- ports/protobuf/portfile.cmake | 5 +++-- ports/protobuf/version-rc-msvc.patch | 16 ++++++++++++++++ ports/re2/CONTROL | 2 +- ports/re2/portfile.cmake | 4 ++-- ports/rocksdb/CONTROL | 2 +- ports/rocksdb/portfile.cmake | 4 ++-- ports/rs-core-lib/CONTROL | 2 +- ports/rs-core-lib/portfile.cmake | 4 ++-- ports/tbb/CONTROL | 2 +- ports/tbb/portfile.cmake | 4 ++-- ports/thrift/CONTROL | 2 +- ports/thrift/portfile.cmake | 4 ++-- ports/unicorn-lib/CONTROL | 2 +- ports/unicorn-lib/portfile.cmake | 4 ++-- ports/unicorn/CONTROL | 2 +- ports/unicorn/portfile.cmake | 4 ++-- ports/wt/CONTROL | 2 +- ports/wt/portfile.cmake | 4 ++-- ports/wxwidgets/CONTROL | 2 +- ports/wxwidgets/portfile.cmake | 4 ++-- ports/zeromq/CONTROL | 2 +- ports/zeromq/portfile.cmake | 4 ++-- 63 files changed, 110 insertions(+), 93 deletions(-) create mode 100644 ports/protobuf/version-rc-msvc.patch diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 95191fcf00eace..e6a265d6bc5ee8 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-11-08-1 +Version: 2018-12-14 Description: an open-source collection designed to augment the C++ standard library. Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index cc70f7250932f7..2e24888459ea02 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 070f6e47b33a2909d039e620c873204f78809492 - SHA512 84bc7b17519d3cae471f0e2602ed32111e99d20abfdff26f1e36fd712ff9013b9768b3d37b9179dc40cb1b4a350da1b6955a881c5300ea9b608f97a3101c2762 + REF 389ec3f906f018661a5308458d623d01f96d7b23 + SHA512 20d2cc8d23eb729607692d861049dccbd6b4af56fc4ed7733492348e3fe879d7acc6316f0d6e1c683f98188f028d460a40cab35667856cf334aa5f00fc830911 HEAD_REF master ) diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL index f4a9931f85170d..0c64640caa79a2 100644 --- a/ports/asmjit/CONTROL +++ b/ports/asmjit/CONTROL @@ -1,3 +1,3 @@ Source: asmjit -Version: 2018-11-08 +Version: 2018-12-14 Description: Complete x86/x64 JIT and Remote Assembler for C++ diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index 5d2e7b230acebd..cfd1ed034769ed 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit - REF 771d66b301e60ebc3ffa69b11765622c547df6ab - SHA512 02ae822a33d50810fc0833b647bd6c29851b147ae4e388fd29d54567e6ed928173b961d3f3f323b243719092c2947bd6f374bc5d6051817e8153688868473830 + REF 3092065f148d951df281d3f0f1b4922e580b3930 + SHA512 4557bcbbe5b49e2303cfccc2ef9acdb59281a13fe9efe28ac49711736dd45db856f9f67aa9ebcf841e631fc83b8b7e14eee08e3a56d6f982fcc24e23b70b7cc5 HEAD_REF master ) diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL index de2d71c35abbb9..15a9da60aa2484 100644 --- a/ports/catch2/CONTROL +++ b/ports/catch2/CONTROL @@ -1,4 +1,4 @@ Source: catch2 -Version: 2.4.2 +Version: 2.5.0 Description: A modern, header-only test framework for unit testing. Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2 diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index b36595d2c1f533..f6ed65251780e5 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.4.2 - SHA512 7422c5c114d93b57cac5596e573d0993ecc6db37708df3491d346bb3aad7a1ee1d1008689ae7b8ef4b0b4fa41aa66566580f807778ae2e4f278687d6fe7aa38b + REF v2.5.0 + SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8 HEAD_REF master ) diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index 0050599090d62b..7277d68323fbfa 100644 --- a/ports/chakracore/CONTROL +++ b/ports/chakracore/CONTROL @@ -1,3 +1,3 @@ Source: chakracore -Version: 1.11.2 +Version: 1.11.4 Description: Core part of the Chakra Javascript engine diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 43bb1606ce35e1..aff3cb1ca9ab31 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/ChakraCore - REF v1.11.2 - SHA512 6261a7028bf398703a610d9ad42b6bde7c6309d2997c7cfaa785c1fbcf582adbbbe60756bbe411af1d6e1d26ac9acca5cbe734608885d8b5f2881819477292b7 + REF v1.11.4 + SHA512 903336fae63573991c539fd1652dd2a61c580845aca21253bce76efd884fb7d575c8bb1d91818112a6ba7c69cdcb1847175d9f09080cdc599c0afb3d36f474e2 HEAD_REF master ) diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL index 9d8704ea193a6d..8a04a83bfcdc00 100644 --- a/ports/cimg/CONTROL +++ b/ports/cimg/CONTROL @@ -1,3 +1,3 @@ Source: cimg -Version: 2.4.1 +Version: 2.4.2 Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake index 70b397e45d19fe..3baed452db4df0 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -2,9 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" - REF v.2.4.1 + REF v.2.4.2 HEAD_REF master - SHA512 b0582a158024a13c9d6779e4e6a37487bb8c18b3e91f8fa56a6d0ee3dbaede2567f00c29432f41ca8e3845e98566375b285fb674721225705f6ade91894db081) + SHA512 dc27e7c0b06cd619c4270a91d830dbd3e0dfea851e04d7aab46fe9f2131e4b3717f73ac53bc4d70497ff2efe3bee1ae693e621d993cd63735d00368a362833f3) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index b1526996e828cf..e9d17c1221217f 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,3 +1,3 @@ Source: dimcli -Version: 4.0.1-1 +Version: 4.1.0 Description: C++ command line parser toolkit diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index f66120c5efa9fe..6362aa98727e8d 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gknowles/dimcli - REF v4.0.1 - SHA512 e36008eed42997c467ef7f4780cacd7eb8acebeb48be56445914c0ae125c5dbf29a172e1fb2f9490a6f21db8f6de5fa0420f499aff996ee148ec3a5bef0adba5 + REF v4.1.0 + SHA512 5de010b5abfda9e6996bba8c621e03ae0cf81dbc2f69cd859e2ebf7b1706c451f7f8e142299784646d89ca3c3e5803e8711215680b8bdb8eb663158bff3b4f3d HEAD_REF master ) set(staticCrt OFF) diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index 728f61b5f8e818..d8e03d986dfe5d 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,3 +1,3 @@ Source: directxmesh -Version: oct2018 +Version: nov2018 Description: DirectXMesh geometry processing library \ No newline at end of file diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 81adb18b6a6b47..31b74abea15ae7 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF oct2018 - SHA512 eb96fa3104932650bff3b051005e84f1eb52c135085ec1f4f56b7bbd99300ca600721cd18c3a9c8d4334e3280369df7d1d92ab6556fc82c72e1a54d04853331a + REF nov2018 + SHA512 b1abeabd81c7d6c12adfea1ca8d563aa7c22ba1a64aa7a49b7839c0788922cec604a041dddbd3aca6a3b7c8412b1117dfee9c1163862de10757a7747669017ed HEAD_REF master ) diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index 05edc2238819e4..d86662ef250ff0 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,3 +1,3 @@ Source: directxtex -Version: oct2018 +Version: nov2018 Description: DirectXTex texture processing library \ No newline at end of file diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index a5d6deca518dd5..93eb8d6d1ecc83 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF oct2018 - SHA512 6bb395c92ca60af03fb3b86dd64542feb0a633b49386a438d0e73f108a4af60913bd695a1c90069eeb83df4ec49289e1a8ae3ac131ddca372eb6dd20d14590d7 + REF nov2018 + SHA512 bcf721820e0a4069b7b1daac44d776b2c69a6ebdc0a817fb2e1fcd94938df8b3fbabc1827c28050d0db4b26cc42a011987f50b7db04487a7075741b34ddb58a8 HEAD_REF master ) diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 100f7f99a7357c..c3e9b194c035ad 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,3 +1,3 @@ Source: directxtk -Version: oct2018b +Version: nov2018 Description: A collection of helper classes for writing DirectX 11.x code in C++. diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 2e6267bad3c970..16828462e70f50 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF oct2018b - SHA512 d9eb0d0537dd6638bfe089bbaa77ad4c4065d43c53143686e60b8c62814f1c7a0fc9a0361a418b1f0fa0881faa14c92c604fffb6670dd8c1260e67d56fea9bab + REF nov2018 + SHA512 ee696245c914c1ede99c12d301e15f3d70ae7a0375b6c6f94afcbb1fd1a80844d1cd053a87f66c2008394a1b8f1165db0e835344a0311f0a8418c32aff9f592a HEAD_REF master ) diff --git a/ports/discord-rpc/CONTROL b/ports/discord-rpc/CONTROL index b6af1dc984e4e6..e4d98f5247c5c7 100644 --- a/ports/discord-rpc/CONTROL +++ b/ports/discord-rpc/CONTROL @@ -1,4 +1,4 @@ Source: discord-rpc -Version: 3.3.0-2 +Version: 3.4.0 Description: Rich Presence allows you to leverage the totally overhauled "Now Playing" section in a Discord user's profile to help people play your game together. Build-Depends: rapidjson diff --git a/ports/discord-rpc/portfile.cmake b/ports/discord-rpc/portfile.cmake index 1dd6d300106f29..b4d191bf8bbb78 100644 --- a/ports/discord-rpc/portfile.cmake +++ b/ports/discord-rpc/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO discordapp/discord-rpc - REF v3.3.0 - SHA512 8bb2674edefabf75670ceca29364d69e2002152bff9fe55757f4cda03544b4d827ff33595d98e6d8acdc73ca61cef8ab8054ad0a1ffc905cb26496068b15025f + REF v3.4.0 + SHA512 ca981b833aff5f21fd629a704deadd8e3fb5423d959ddb75e381313f6462d984c567671b10c8f031905c08d85792ddbe2dddc402ba2613c42de9e80fc68d0d51 HEAD_REF master PATCHES disable-downloading.patch ) diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL index 07885a75d0fa31..65ac705dd400ed 100644 --- a/ports/doctest/CONTROL +++ b/ports/doctest/CONTROL @@ -1,3 +1,3 @@ Source: doctest -Version: 2.0.1 +Version: 2.2.0 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index a84d9a21df4602..fffe1bb305276b 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.0.1 - SHA512 bbd676c8485d9bee4be3f2f6bdd0f72bced09767427533c8de3ea46b298182acaeff64e42683a4283512edd81bb444880b229e65f3296bb4afc8b5b93c03b970 + REF 2.2.0 + SHA512 edf35be338194c7abfb991e6bcc766fe9badc1cc0f21dd7147a6a42ecf451ef6a4eaa1e63b46337fb14a8ed9b107fd381e1b3b502039d7d23476b3f52b12d89c HEAD_REF master ) diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index 5674e0345e4f68..cb7704c8a469f6 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,4 +1,4 @@ Source: eastl -Version: 3.12.04 +Version: 3.12.07 Description: Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations. diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index c090f0fa863a90..4d61ff01f19496 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -8,8 +8,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF 3.12.04 - SHA512 99e8fdc5fb589410187f3538b6f491bc6f988babcb29b74be90a938ba6c94ad1b16d55ff62ddcf5ae539c67f473d43a6af581278b8b39d0d8686b0161dd0e5cf + REF 3.12.07 + SHA512 d7ae29661ef8dbf13f9b8d195c5088992f23d3ca4751249385e8068f034dd687e178b2aac0f228b354e9019f0ea69f377a7b20aacb5d2b23a98b8032437f9f25 HEAD_REF master ) diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL index d00c2aaae441cb..2ba795fa7b84eb 100644 --- a/ports/exprtk/CONTROL +++ b/ports/exprtk/CONTROL @@ -1,3 +1,3 @@ Source: exprtk -Version: 2018-10-11 +Version: 2018-12-14 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine. diff --git a/ports/exprtk/portfile.cmake b/ports/exprtk/portfile.cmake index a863941af19276..dea82b4d530513 100644 --- a/ports/exprtk/portfile.cmake +++ b/ports/exprtk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArashPartow/exprtk - REF 9836f21d07b1bf799e6877324268708f61c01f73 - SHA512 44acb6e835dc215d4338ff4c2b3444373a93475ece15b3f1bfdc0781f7c28992af7c289644bf9557d041f78c7435f5907e4ba606321aab17faee6f4a70562065 + REF d89d2f5f46fbd33372c81e8ad4b997fa84569fae + SHA512 bad42b83a0f1d8142ceafac862ec62dafc040fa8293bfbca29e49afdc8dca1000fc43537a5cf28d1dae00f5e86516899bd37f996975fbbccdd6a8298d1adb359 ) file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 1711bda0341406..89862610cd7cf6 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.11.26.00 +Version: 2018.12.10.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index c66599f7e269b8..aab53792b13b59 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.11.26.00 - SHA512 7a404df7287c9a3278bc47205023881ade188a1d3ade35748ae9ae4f35485faedc9f8c0264cfd0f3565b2d5891235deda0f515946a2c313570ef41751a3693ac + REF v2018.12.10.00 + SHA512 d571c08f764a7670b8313336d52c02190d001085385ce92073823887fe435945a821f623b8009e846435e3461bed2dbc58427bd3960a90469461d38386bb76b9 HEAD_REF master PATCHES find-gflags.patch diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL index ceae2bbdacaba2..05a8bd84e6c36c 100644 --- a/ports/forest/CONTROL +++ b/ports/forest/CONTROL @@ -1,3 +1,3 @@ Source: forest -Version: 9.0.6 +Version: 10.1.1 Description: Template library of tree data structures diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake index c1f0db8811c875..b618233f51707c 100644 --- a/ports/forest/portfile.cmake +++ b/ports/forest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xorz57/forest - REF 9.0.6 - SHA512 7cb6f25226bbd543332599d5ad2b8e13df6f06342ea12b58ed123ffd81d1362e10c2e01ff95132f7b25431a3ae984bee5cfb86852aa222e1fad1f4e6928f76bc + REF 10.1.1 + SHA512 145f60bc202c7a0ab0dad514e08606ace45780855f71d9ba6a9461c5242b751a3fefa25101387f797ecc53198cd792859927b6bd2c2aa4a1f114a311d0b74e26 HEAD_REF master ) diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index e16f6b1c83780b..7f3de459d08fa8 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,4 +1,4 @@ Source: libpng -Version: 1.6.35-1 +Version: 1.6.36 Build-Depends: zlib Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index ef82635af0cb0a..01edce90d710b8 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glennrp/libpng - REF v1.6.35 - SHA512 1b6e2664bd80726e8f6ef7ea4f23d311a883841086a4a60700dfd11621130808c24487c744c8a942219980eb29b244e81965aebfc4ab7f637693f537f4e8e148 + REF v1.6.36 + SHA512 aeb00b48347c9e84d31995b3fe7e40580029734aa8103d774eee5745f5ca1fd1fd91a15f32d492277ab94346e4e7f731ee9bfea1783f930094f9f87eb3d9397d HEAD_REF master ) diff --git a/ports/libwebsockets/CONTROL b/ports/libwebsockets/CONTROL index fdc4e7a552fd09..449b34fc53ece3 100644 --- a/ports/libwebsockets/CONTROL +++ b/ports/libwebsockets/CONTROL @@ -1,4 +1,4 @@ Source: libwebsockets -Version: 3.0.1 +Version: 3.1.0 Build-Depends: zlib, openssl Description: Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server. diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 7d95b5addedef0..b869fcc2ab364d 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets - REF v3.0.1 - SHA512 ba96af918dc53e5fe15792985892e726154ec6cd8b0e6b71ec133e1ac53792c42276fd6ae2c48c274acf4163579d8326e403201a8090fc58be29518c9c5b4304 + REF v3.1.0 + SHA512 e2a4c1b25bc6f028654a63fc01a2732e6c63414868f8d3d01fa477752fdabe0f61e8d271fe7dd2734db0e15b1250f6b0101285b6d694f971ec4bf67ba7ee067c HEAD_REF master PATCHES 0001-Fix-UWP.patch diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL index 04cb1003c1e932..0a4183cb75faa6 100644 --- a/ports/mbedtls/CONTROL +++ b/ports/mbedtls/CONTROL @@ -1,3 +1,3 @@ Source: mbedtls -Version: 2.13.1 +Version: 2.15.1 Description: An open source, portable, easy to use, readable and flexible SSL library diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 59d067f11022d1..fa87630a401395 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -5,8 +5,8 @@ set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ARMmbed/mbedtls - REF mbedtls-2.13.1 - SHA512 1a70446b533534c075de38ce0839f7947077ffdddffa57172594b8f8a3c4a3fbdfa9b06d13c198008abad33633e509f06abe5362f603f63850d9ec44734b3c0b + REF mbedtls-2.15.1 + SHA512 361bac49bc179c020855a59140a3e9e31ec9e89ebde9d630e9f3491cdfdf466c8dc2313276d6b257a7728784f5478bdcfd14d26e81f90d432bad2e9a94151fc2 HEAD_REF master ) diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL index 8d6d0214798aea..c782ee097db3d0 100644 --- a/ports/ms-gsl/CONTROL +++ b/ports/ms-gsl/CONTROL @@ -1,3 +1,3 @@ Source: ms-gsl -Version: 2018-11-08 +Version: 2018-12-14 Description: Microsoft implementation of the Guidelines Support Library \ No newline at end of file diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake index a130f9a351cc6a..1b0711977bae94 100644 --- a/ports/ms-gsl/portfile.cmake +++ b/ports/ms-gsl/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/GSL - REF c02ddae4bcff82b17826fe3127e835f5aa54b485 - SHA512 5fcb67d410a46a4e202c367bae59b1dd4f4220ac2b75a70bc34503612a616b2792e74a18b50901656d18a031cc32cf42da8673d3412ccfe8a236daa54eae44c7 + REF 0f68d133fa6fd2973951b8aaab481e34bbfd2cf4 + SHA512 1aa8116a75dd6ffd3a879dcf52f804e1d67e03bac3788559441ddebe2db6fd43a362bfa5ddac36954848555ba1e7fccb2d26b6060a9e171a04497ea551402b42 HEAD_REF master ) diff --git a/ports/parson/CONTROL b/ports/parson/CONTROL index 1210c7e2eda438..614ff7243bcea6 100644 --- a/ports/parson/CONTROL +++ b/ports/parson/CONTROL @@ -1,3 +1,3 @@ Source: parson -Version: 2018-09-18 +Version: 2018-12-14 Description: a lighweight json library written in C diff --git a/ports/parson/portfile.cmake b/ports/parson/portfile.cmake index cfc1d861ec5348..16c5578f1fd182 100644 --- a/ports/parson/portfile.cmake +++ b/ports/parson/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kgabis/parson - REF 0a1896939faff5f69e179637fc49f678ff0128ba - SHA512 cb982ce7dbbe0b5a4d08a28a459e9dce5347f90d75b0a37c56698f5b79ad37aa0bd22fe6b6d5c8a6fda2dd83b072605486581360b8ed3591012ebaa1e1518fc6 + REF 302fba9cbb31ffc523bf10a1ce705040194c289d + SHA512 ecc1594fe6e27b8919ccdaf3c7e082d0d47aa5e20aec52235762b9cab8e371adec5a1760f4ea36405bf97cfb587d2bcbd81221f97a9d39290673e2ce61f5a49f HEAD_REF master ) diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index c2be8e0f35780d..89719093ce6011 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,5 @@ Source: protobuf -Version: 3.6.1-4 +Version: 3.6.1.3 Description: Protocol Buffers - Google's data interchange format Feature: zlib diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 1dc7e6cf503584..31f1b3819f9eb5 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -3,12 +3,13 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/protobuf - REF v3.6.1 - SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 + REF v3.6.1.3 + SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e HEAD_REF master PATCHES fix-uwp.patch disable-lite.patch + version-rc-msvc.patch ) if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") diff --git a/ports/protobuf/version-rc-msvc.patch b/ports/protobuf/version-rc-msvc.patch new file mode 100644 index 00000000000000..b24a862d9dcc76 --- /dev/null +++ b/ports/protobuf/version-rc-msvc.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/protoc.cmake b/cmake/protoc.cmake +index 9bf6f5a..b58a12a 100644 +--- a/cmake/protoc.cmake ++++ b/cmake/protoc.cmake +@@ -2,9 +2,11 @@ set(protoc_files + ${protobuf_source_dir}/src/google/protobuf/compiler/main.cc + ) + ++if(MSVC) + set(protoc_rc_files + ${CMAKE_CURRENT_BINARY_DIR}/version.rc + ) ++endif() + + add_executable(protoc ${protoc_files} ${protoc_rc_files}) + target_link_libraries(protoc libprotobuf libprotoc) diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index 6e82bc86eaf4ef..4a92b48354068c 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,3 @@ Source: re2 -Version: 2018-11-01-1 +Version: 2018-12-14 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. \ No newline at end of file diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index b5689944b2ad31..b1ecb3f0e96f86 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 - REF d9cebde0175aa1ffd38aab9a395a038464d55ce7 - SHA512 820ebc96f6cc583e50bdd637b8bf6b4e8ef6be5a74a49174bf845d037f0dd21ee3b1fbc220bc3cbbd6987205195b6c0990040f43da723f90038a20690a7553ff + REF e7c832772ec55f495927bfa4526d2fc17f0381be + SHA512 d79b5f5a5b97cc1f305abcf3799b00e335ba74c7c73b347b231e4796f45821398f952336dc94011fd8347de8c0e5af78b6cfa61387df002c1ba5e34954ec64c9 HEAD_REF master ) diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 9f70efb787486c..94bcc35fd0585e 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 5.15.10 +Version: 5.17.2 Description: A library that provides an embeddable, persistent key-value store for fast storage Default-Features: zlib diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 0d124361bc3639..2b20131907f42e 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF v5.15.10 - SHA512 3faef43cc343c20e044f92af7cd9eae9783612d888bfe17b7d0ae6812090088f43a128e5686600ec56f5a88c100eaa893b2551f8c32df793a4ccd94330c07037 + REF v5.17.2 + SHA512 c9f9bff747d0d2c97f8adb71d6a3bd5dc206c2fc567a47d0400abac61fec7f2a386d16cda5447bcf592cca006fd6d4c5ae1a68d122e2e2a03d3ebcc002dae147 HEAD_REF master PATCHES 0001-disable-gtest.patch diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL index 564b25807bc4af..34eaa31db448a7 100644 --- a/ports/rs-core-lib/CONTROL +++ b/ports/rs-core-lib/CONTROL @@ -1,4 +1,4 @@ Source: rs-core-lib -Version: 2018-10-25 +Version: 2018-12-14 Description: Minimal common utilities by Ross Smith diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake index a3eddc38d5bb6f..13f0b9ed27e22b 100644 --- a/ports/rs-core-lib/portfile.cmake +++ b/ports/rs-core-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/rs-core-lib - REF 5e2e7bb8663d078957a2f6994d9f1e3d4cf50601 - SHA512 d159b11c650572e486ce8376c03e688b5448fdf00d956edf141106d2e1173d86faf0eda843da69687a6f79eb443017dfe0fb1d9f70284444bfda7006d78aee38 + REF 23ed1ddc676c74f19c333ebbe5dafe68ad3118f3 + SHA512 2b1b0ddb13ba258ce82cb659ca989cb96e9a72ba242df01de7963de50671d6ac6ab93b0e8bb05fa030970e7efb7b894fa4daa7778d77ebb930cba96da3a55317 HEAD_REF master ) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 8aa6dee78a1f34..94126c5e758fc8 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 2018_U6 +Version: 2019_U3 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index a4e91274264ccf..09398ae9235f15 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO 01org/tbb - REF 2018_U6 - SHA512 efcd020a24fa41e07ff9232098cecce42ceec5882849bc30edc29ead1694fcc8820a0defb307e0a065c1db1d649a731e13d8cb6fd6f927b4bd3bdc46de0d1709 + REF 2019_U3 + SHA512 b6eaaea95658c4d49e6894811eb9ca38541820462bf1b606db16ca697af4329a94627d8ae01a73f2b07567280865b3ea92ca0ce091fa95dd3551cebbdd35976d HEAD_REF tbb_2018 ) diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index d52f25eba86f05..076c7dbfafa924 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,4 +1,4 @@ Source: thrift -Version: 2018-11-01 +Version: 2018-12-14 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 9fb495c84d04af..1635579b83d2f0 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF 92be4f312b88eac0a4ac450eda29fd20de11b1f0 - SHA512 0c1c7eb30fc63efa483cd9970305b5285c7d6f57151a9e0f602ff757b05cede3adb13688c5d1436c05ffd4bd142ca7676db8e35cbf4d38e9112033f6a2e77ff4 + REF 2b7365c54f823013cc6a4760798051b22743c103 + SHA512 439d4860f029e083c2f9da5b87f3b6119f34da085fb8000020b4bb17195838f6ea029157ce8537176024a9dec6c163ba5495b59e66eefc344fbbb4b323d2f334 HEAD_REF master ) diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL index 29f822e701743c..c6ecb0a3fc42e8 100644 --- a/ports/unicorn-lib/CONTROL +++ b/ports/unicorn-lib/CONTROL @@ -1,4 +1,4 @@ Source: unicorn-lib -Version: 2018-10-25 +Version: 2018-12-14 Description: Unicode library for C++ by Ross Smith Build-Depends: rs-core-lib, pcre2, zlib, libiconv diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index 009d54cbe315a1..76e9ccb9b31a60 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF 40da6ff4c2af8a393674513285f00ada5960e79c - SHA512 39657646ea04777fb083a049d4fa8e48a57808817d718f0f7f942d3c19da1249341f9010ab00466a33d64d5a196ff35a8bd5f8ffe24230903b3c7e83b4273c59 + REF a4015d502f462ad5ba1003a51edcbd07400c14d2 + SHA512 bfdfe4062c17a5d0d1971f1482ddbc28f4d041c7bcc173350e5b2210ad466c2e5496d3a548e31fa1e1f83c12bd8d646e766cf3b8388d13d3782af50a189fb47d HEAD_REF master ) diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL index bd863c73e53bff..ab167b4da59e3b 100644 --- a/ports/unicorn/CONTROL +++ b/ports/unicorn/CONTROL @@ -1,3 +1,3 @@ Source: unicorn -Version: 2018-10-25 +Version: 2018-12-14 Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index 849726575b499a..f734e13862ce80 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -14,8 +14,8 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF 873fffc505b29c6179a8aece18b7e331e5f879e8 - SHA512 7fce35aaee00871ee7ab0517a51ef65f7e748252ac2a97a07ee18a04dcc733b5470fd6de8e0bc433c4bbecd47b8269b33871ba7df64975600d52b3ece15715ea + REF 536c4e77c4350fac3e5c2b9b57d8c16f69b934d3 + SHA512 295a88381fbb765d3ffb6a8e58a85c9385a978e49957ad35db828952c0144e392abab77f529ea12aa62b7e495e75df8f02b032f8fd8b87502517d7e46b889e3c HEAD_REF master ) diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL index a66c39f42b6023..5db330a5c13382 100644 --- a/ports/wt/CONTROL +++ b/ports/wt/CONTROL @@ -1,4 +1,4 @@ Source: wt -Version: 4.0.4-2 +Version: 4.0.5 Description: Wt is a C++ library for developing web applications Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 0ac9fef61e6627..3c2e709620953f 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emweb/wt - REF 4.0.4 - SHA512 7f9fee9b1c145adb610bf9b0860867a2f09699a1c914418938955c5648b3207db361ec48b3afe9e6faa6cc0b5874bedd44481fdd8adb8fc558cfc3dc17369ee7 + REF 4.0.5 + SHA512 5513b428bfd3e778726c947606677f3e0774b38e640e61cd94906a2e0c75d204a68072b54ddeb3614a7ba08f5668e6eb3a96d9c8df3744b09dc36ad9be12d924 HEAD_REF master PATCHES 0001-boost-1.66.patch diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index af985fa674ec44..c833a3e4a5c3e7 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,4 +1,4 @@ Source: wxwidgets -Version: 3.1.1-2 +Version: 3.1.2 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 06223894616cfc..75663fb9afa95a 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets - REF v3.1.1 - SHA512 f6d8974e2f48bae7e96a8938df3ad5efc403036c1dcbe2b48edd276ee7923802ba3e95e3f3bd9db17985e427b8e4f78950df0cbba83ae99d508ed04633816c95 + REF v3.1.2 + SHA512 c6f8a6065e837e145633ddbd0e10910f32009900e1f7155abe0ef53b6fc83dceb9eaf6c56369d13b6526e4b8bd6073bbcbdb790d667c0dab381b67ec5d567f6f HEAD_REF master PATCHES disable-platform-lib-dir.patch ) diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index 84b0ad93c574f9..ae33c6f6826ccd 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,3 +1,3 @@ Source: zeromq -Version: 2018-11-01 +Version: 2018-12-14 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index ebff91236e39db..2ae912e07032f0 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF efc9a3021fb61ca92b9869f0ad8308d29a3ebfa3 - SHA512 04c2d94c497a0398243c1fc8c5e1bdcc3a9da873ccf688a9345db334d12e562c8131e7976fa2123fb8f760cc450bd0cfe33a486d1f31880b7d69379e10be7caa + REF ed8ed727c6f532f1a7d7bdf14b72aa83e2a4f0e9 + SHA512 32034fac0bc9f2d0c40e0d9e999200af43146b015ea3663da2d1f58e47da38f292fc03284e39e6c3e30311cd80f4787492e7d993e4d36fa1031e62a8d3dd3c35 HEAD_REF master ) From bdc430c8ec3925ee3de10be152a192459ef84ce1 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 18 Dec 2018 17:31:37 -0800 Subject: [PATCH 51/63] [protobuf] Fix protoc.exe on non-windows --- ports/protobuf/CONTROL | 2 +- ports/protobuf/portfile.cmake | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index 89719093ce6011..88bc7d3ee6b7f7 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,5 @@ Source: protobuf -Version: 3.6.1.3 +Version: 3.6.1.3-1 Description: Protocol Buffers - Google's data interchange format Feature: zlib diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 31f1b3819f9eb5..32e8ccd91b6b25 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -106,9 +106,12 @@ if(CMAKE_HOST_WIN32) protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin/protoc.exe) endif() else() + file(GLOB EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/protoc*) + foreach(E IN LISTS EXECUTABLES) + file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ) + endforeach() protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ) protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin) endif() From d931d74c11e3052c1396e3a7fa384fb02a7bdd20 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 8 Jan 2019 15:35:20 -0800 Subject: [PATCH 52/63] [wxwidgets] Disable cotire on OSX due to appleclang --- ports/wxwidgets/CONTROL | 2 +- ports/wxwidgets/portfile.cmake | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index c833a3e4a5c3e7..b922c1a24f531c 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,4 +1,4 @@ Source: wxwidgets -Version: 3.1.2 +Version: 3.1.2-1 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 75663fb9afa95a..7319f9749bb001 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -8,6 +8,11 @@ vcpkg_from_github( PATCHES disable-platform-lib-dir.patch ) +set(OPTIONS) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -20,10 +25,13 @@ vcpkg_configure_cmake( -DwxUSE_LIBTIFF=sys -DwxUSE_STL=ON -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON + ${OPTIONS} ) vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") if(DLLS) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) From 0af8b7825aacb3144cec6e557db3356fa5a3e843 Mon Sep 17 00:00:00 2001 From: evpobr Date: Thu, 10 Jan 2019 01:38:46 +0500 Subject: [PATCH 53/63] [ebml] Update to v1.3.6 (#5091) * [ebml] Update to v1.3.6 * [ebml] Cleanup --- ports/ebml/CMakeLists.txt | 132 ------------------------------------ ports/ebml/CONTROL | 6 +- ports/ebml/EbmlConfig.cmake | 1 - ports/ebml/portfile.cmake | 82 ++++++++-------------- 4 files changed, 33 insertions(+), 188 deletions(-) delete mode 100644 ports/ebml/CMakeLists.txt delete mode 100644 ports/ebml/EbmlConfig.cmake diff --git a/ports/ebml/CMakeLists.txt b/ports/ebml/CMakeLists.txt deleted file mode 100644 index 7d99a13a4750ad..00000000000000 --- a/ports/ebml/CMakeLists.txt +++ /dev/null @@ -1,132 +0,0 @@ -cmake_minimum_required(VERSION 3.1.2) - -project(ebml VERSION 1.3.5) - -option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF) -option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF) - -include(GNUInstallDirs) - -set(libebml_SOURCES - src/Debug.cpp - src/EbmlBinary.cpp - src/EbmlContexts.cpp - src/EbmlCrc32.cpp - src/EbmlDate.cpp - src/EbmlDummy.cpp - src/EbmlElement.cpp - src/EbmlFloat.cpp - src/EbmlHead.cpp - src/EbmlMaster.cpp - src/EbmlSInteger.cpp - src/EbmlStream.cpp - src/EbmlString.cpp - src/EbmlSubHead.cpp - src/EbmlUInteger.cpp - src/EbmlUnicodeString.cpp - src/EbmlVersion.cpp - src/EbmlVoid.cpp - src/IOCallback.cpp - src/MemIOCallback.cpp - src/MemReadIOCallback.cpp - src/SafeReadIOCallback.cpp - src/StdIOCallback.cpp) - -set(libebml_PUBLIC_HEADERS - ebml/Debug.h - ebml/EbmlBinary.h - ebml/EbmlConfig.h - ebml/EbmlContexts.h - ebml/EbmlCrc32.h - ebml/EbmlDate.h - ebml/EbmlDummy.h - ebml/EbmlElement.h - ebml/EbmlEndian.h - ebml/EbmlFloat.h - ebml/EbmlHead.h - ebml/EbmlId.h - ebml/EbmlMaster.h - ebml/EbmlSInteger.h - ebml/EbmlStream.h - ebml/EbmlString.h - ebml/EbmlSubHead.h - ebml/EbmlTypes.h - ebml/EbmlUInteger.h - ebml/EbmlUnicodeString.h - ebml/EbmlVersion.h - ebml/EbmlVoid.h - ebml/IOCallback.h - ebml/MemIOCallback.h - ebml/MemReadIOCallback.h - ebml/SafeReadIOCallback.h - ebml/StdIOCallback.h) -if(WIN32) - list(APPEND libebml_SOURCES - src/platform/win32/WinIOCallback.cpp) - list(APPEND libebml_PUBLIC_HEADERS - src/platform/win32/WinIOCallback.h) -endif() - -set(libebml_C_PUBLIC_HEADERS ebml/c/libebml_t.h) - -add_library(ebml ${libebml_SOURCES} ${libebml_PUBLIC_HEADERS} ${libebml_C_PUBLIC_HEADERS}) -if(WIN32) - include(CheckIncludeFile) - check_include_file(winapifamily.h HAVE_WINAPIFAMILY_H) - if(HAVE_WINAPIFAMILY_H) - target_compile_definitions(ebml PUBLIC HAVE_WINAPIFAMILY_H) - endif() -endif() -set_target_properties(ebml PROPERTIES - VERSION 4.0.0 - SOVERSION 4) -target_include_directories(ebml PUBLIC - $ - $) -if(MSVC) - target_compile_definitions(ebml PRIVATE _CRT_SECURE_NO_WARNINGS) -endif() -if(BUILD_SHARED_LIBS) - set_target_properties(ebml - PROPERTIES - DEFINE_SYMBOL "EBML_DLL_EXPORT" - C_VISIBILITY_PRESET hidden - VISIBILITY_INLINES_HIDDEN 1) - target_compile_definitions(ebml - PUBLIC EBML_DLL - PRIVATE EBML_DLL_EXPORT) -endif() - -install(TARGETS ebml - EXPORT EbmlTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -install(FILES ${libebml_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ebml) -install(FILES ${libebml_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ebml/c) - -if(NOT DISABLE_PKGCONFIG) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\$\{prefix\}") - set(libdir "\$\{prefix\}/${CMAKE_INSTALL_LIBDIR}") - set(includedir "\$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}") - set(PACKAGE_VERSION ${PROJECT_VERSION}) - configure_file(libebml.pc.in libebml.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libebml.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -endif() - -if(NOT DISABLE_CMAKE_CONFIG) - if(WIN32) - set(CMAKE_INSTALL_PACKAGEDIR cmake) - else() - set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - endif() - include(CMakePackageConfigHelpers) - write_basic_package_version_file(EbmlConfigVersion.cmake COMPATIBILITY SameMajorVersion) - install(EXPORT EbmlTargets DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) - install(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/EbmlConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/EbmlConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) -endif() diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL index e4872dd6ad408b..1b3ec442a27281 100644 --- a/ports/ebml/CONTROL +++ b/ports/ebml/CONTROL @@ -1,3 +1,3 @@ -Source: ebml -Version: 1.3.5-1 -Description: a C++ libary to parse EBML files +Source: ebml +Version: 1.3.6-1 +Description: a C++ libary to parse EBML files diff --git a/ports/ebml/EbmlConfig.cmake b/ports/ebml/EbmlConfig.cmake deleted file mode 100644 index 5752fa632983bf..00000000000000 --- a/ports/ebml/EbmlConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/EbmlTargets.cmake) diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake index 4b92f37bb8a676..573801fb6a7c27 100644 --- a/ports/ebml/portfile.cmake +++ b/ports/ebml/portfile.cmake @@ -1,52 +1,30 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - -include(vcpkg_common_functions) - -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() - - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Matroska-Org/libebml - REF release-1.3.5 - SHA512 ccfa58aebb8685b2dbbab7038ab7f7e0788dba2fc391abafad5a0e05c71c8f02c7e1e3521e1c59076057f9643737c2d96a4fffdeb7991214234f2db80c78254b - HEAD_REF master -) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/EbmlConfig.cmake DESTINATION ${SOURCE_PATH}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/export-endofstreamx.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS -DDISABLE_PKGCONFIG=1 - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 -) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/ebml RENAME copyright) +include(vcpkg_common_functions) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Matroska-Org/libebml + REF release-1.3.6 + SHA512 249ff2e9b381d827311eaec910962685243a3b65335c7bd404a35e11cd204c63bc7ea69787f0e27ea9c9144024e45867fd4ae7d30688a3695cd45fee1ce89ec9 + HEAD_REF master + PATCHES export-endofstreamx.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DDISABLE_PKGCONFIG=1 +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/ebml RENAME copyright) From bbb68a2ec882df1fa76b21ba30d686f915e668a4 Mon Sep 17 00:00:00 2001 From: evpobr Date: Thu, 10 Jan 2019 03:26:43 +0500 Subject: [PATCH 54/63] [matroska] Update to 1.4.9 (#5092) --- ports/matroska/CONTROL | 2 +- ports/matroska/MatroskaConfig.cmake | 1 - ports/matroska/portfile.cmake | 7 ++----- 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 ports/matroska/MatroskaConfig.cmake diff --git a/ports/matroska/CONTROL b/ports/matroska/CONTROL index cd688d69726c83..04feb0dd4a0040 100644 --- a/ports/matroska/CONTROL +++ b/ports/matroska/CONTROL @@ -1,4 +1,4 @@ Source: matroska -Version: 1.4.8 +Version: 1.4.9 Description: a C++ libary to parse Matroska files (.mkv and .mka) Build-Depends: ebml diff --git a/ports/matroska/MatroskaConfig.cmake b/ports/matroska/MatroskaConfig.cmake deleted file mode 100644 index e9a88bd49196a0..00000000000000 --- a/ports/matroska/MatroskaConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/MatroskaTargets.cmake) diff --git a/ports/matroska/portfile.cmake b/ports/matroska/portfile.cmake index fd3624584ee65b..b89a1cb6e8997f 100644 --- a/ports/matroska/portfile.cmake +++ b/ports/matroska/portfile.cmake @@ -19,14 +19,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Matroska-Org/libmatroska - REF release-1.4.8 - SHA512 3591508674ff69a185d143b4ce5c34a4c9913ad806ad94c6a96b694752f3e67b029037573564ab3bf5d9303a4b6c5fdd55865f140ab0d26df53b051b71957d0a + REF release-1.4.9 + SHA512 0c2e7324d62e1fc28b00a899f1d2fda88a3de474ea25c51624d716b869db72b4645b64cc434a0bdb7cefdd63b354de59920d4011889554f95a2905020b139fb1 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/MatroskaConfig.cmake DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja From 7578a485b181ded330b87cc72726f01e38ff7ed6 Mon Sep 17 00:00:00 2001 From: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Wed, 9 Jan 2019 17:19:27 -0600 Subject: [PATCH 55/63] [pybind11] Upgrade to v2.2.4 (#5087) --- ports/pybind11/CONTROL | 2 +- ports/pybind11/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index 67fdaea5d1e27f..880d6c3b7b585a 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,4 +1,4 @@ Source: pybind11 -Version: 2.2.3-1 +Version: 2.2.4 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. Build-Depends: python3 (windows) \ No newline at end of file diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 16a9b972653a03..55cfb1fa10fb0b 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.2.3 - SHA512 3a43b43f44ae4a6453fe3b875384acc868310177216938cb564536e6b73c56002743137e5f61cf4ecbd6c56e3b39476ebf06aea33d460581fc7d8ba7b2a22a67 + REF v2.2.4 + SHA512 6bddf5c885ff92a3e373bcedc6574dfefe8be9ebb6176c6c96d475457466c76bfb982c6df4066cb0fbead4b867f87dbc4fbc1605c80852635016f614330ce041 HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/aliastemplates.patch From 5985b82b053cb9a371151485ea010a28ccce4e34 Mon Sep 17 00:00:00 2001 From: LarryIII <33021067+LarryIII@users.noreply.github.com> Date: Thu, 10 Jan 2019 10:19:09 -0800 Subject: [PATCH 56/63] Fix typo of the source name in port.camke (#5098) --- ports/milerius-sfml-imgui/CONTROL | 2 +- ports/milerius-sfml-imgui/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/milerius-sfml-imgui/CONTROL b/ports/milerius-sfml-imgui/CONTROL index a9f8e909696fc3..88eb539eff63e9 100644 --- a/ports/milerius-sfml-imgui/CONTROL +++ b/ports/milerius-sfml-imgui/CONTROL @@ -1,4 +1,4 @@ Source: milerius-sfml-imgui -Version: 1.1 +Version: 1.1-1 Description: imgui dll for sfml usage Build-Depends: sfml (windows), imgui diff --git a/ports/milerius-sfml-imgui/portfile.cmake b/ports/milerius-sfml-imgui/portfile.cmake index 1520d5e35adc2e..d4975da157a37f 100644 --- a/ports/milerius-sfml-imgui/portfile.cmake +++ b/ports/milerius-sfml-imgui/portfile.cmake @@ -20,5 +20,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sfml-imgui) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfml-imgui) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/sfml-imgui/copyright) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/copyright) From 4d2ffdfbcf9ed9239549d8620af59e0469e56a4d Mon Sep 17 00:00:00 2001 From: Nikolay Simakov Date: Thu, 10 Jan 2019 14:54:05 -0500 Subject: [PATCH 57/63] fixed building plplot with wxwidget feature on (#5089) * fixed builting plplot with wxwidget feature on * [plplot] Use vcpkg_extract_source_archive_ex --- ports/plplot/0001-findwxwidgets-fixes.patch | 59 +++++++++++++++++++++ ports/plplot/0002-wxwidgets-dev-fixes.patch | 12 +++++ ports/plplot/CONTROL | 2 +- ports/plplot/portfile.cmake | 24 +++++---- 4 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 ports/plplot/0001-findwxwidgets-fixes.patch create mode 100644 ports/plplot/0002-wxwidgets-dev-fixes.patch diff --git a/ports/plplot/0001-findwxwidgets-fixes.patch b/ports/plplot/0001-findwxwidgets-fixes.patch new file mode 100644 index 00000000000000..72b1d6c2530df5 --- /dev/null +++ b/ports/plplot/0001-findwxwidgets-fixes.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/modules/FindwxWidgets.cmake b/cmake/modules/FindwxWidgets.cmake +index 4d3a2d1..eaaa358 100644 +--- a/cmake/modules/FindwxWidgets.cmake ++++ b/cmake/modules/FindwxWidgets.cmake +@@ -515,7 +515,16 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + set(_WX_ARCH _x64) + endif() + endif() +- if(BUILD_SHARED_LIBS) ++ if(VCPKG_TARGET_TRIPLET) ++ find_library(wxWidgets_LIB_DIR ++ NAMES ++ wxmsw31ud_core.lib ++ wxmsw31u_core.lib ++ PATHS ++ DOC "Path to wxWidgets libraries" ++ ) ++ get_filename_component(wxWidgets_LIB_DIR ${wxWidgets_LIB_DIR} DIRECTORY) ++ elseif(BUILD_SHARED_LIBS) + find_path(wxWidgets_LIB_DIR + NAMES + msw/wx/setup.h +@@ -571,6 +580,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + set(wxWidgets_DEFINITIONS WXUSINGDLL) + DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}") + endif() ++ if(VCPKG_TARGET_TRIPLET) ++ set(wxWidgets_DEFINITIONS WXUSINGDLL) ++ endif(VCPKG_TARGET_TRIPLET) + + # Search for available configuration types. + foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw) +@@ -582,6 +594,15 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + endif() + endforeach() + DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}") ++ ++ if(VCPKG_TARGET_TRIPLET) ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(WX_CONFIGURATION "mswud") ++ else() ++ set(WX_CONFIGURATION "mswu") ++ endif() ++ set(WX_${WX_CONFIGURATION}_FOUND TRUE) ++ endif(VCPKG_TARGET_TRIPLET) + + if(WX_CONFIGURATION) + set(wxWidgets_FOUND TRUE) +@@ -616,7 +637,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG) + + # Set wxWidgets lib setup include directory. +- if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) ++ if(VCPKG_TARGET_TRIPLET) ++ set(wxWidgets_INCLUDE_DIRS "${wxWidgets_ROOT_DIR}/include") ++ elseif(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) + set(wxWidgets_INCLUDE_DIRS + ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}) + else() diff --git a/ports/plplot/0002-wxwidgets-dev-fixes.patch b/ports/plplot/0002-wxwidgets-dev-fixes.patch new file mode 100644 index 00000000000000..707c64796e23a2 --- /dev/null +++ b/ports/plplot/0002-wxwidgets-dev-fixes.patch @@ -0,0 +1,12 @@ +diff --git a/drivers/wxwidgets_dev.cpp b/drivers/wxwidgets_dev.cpp +index f025bd8..f5881b1 100644 +--- a/drivers/wxwidgets_dev.cpp ++++ b/drivers/wxwidgets_dev.cpp +@@ -31,6 +31,7 @@ + + // Headers needed for Rand + #ifdef WIN32 ++#define _WINSOCKAPI_ + // This include must occur before any other include of stdlib.h due to + // the #define _CRT_RAND_S + #define _CRT_RAND_S diff --git a/ports/plplot/CONTROL b/ports/plplot/CONTROL index c278778b066cd2..71bdb1a51726e5 100644 --- a/ports/plplot/CONTROL +++ b/ports/plplot/CONTROL @@ -1,5 +1,5 @@ Source: plplot -Version: 5.13.0-1 +Version: 5.13.0-2 Build-Depends: freetype, zlib, libpng, bzip2 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. diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index 7b35f0a15f5c50..c98c8253bf5f63 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -2,26 +2,28 @@ include(vcpkg_common_functions) set(PLPLOT_VERSION 5.13.0) set(PLPLOT_HASH 1d5cb5da17d4bde6d675585bff1f8dcb581719249a0b2687867e767703f8dab0870e7ea44b9549a497f4ac0141a3cabf6761c49520c0e2b26ffe581468512cbb) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/plplot-${PLPLOT_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/plplot/files/plplot/${PLPLOT_VERSION}%20Source/plplot-${PLPLOT_VERSION}.tar.gz/download" FILENAME "plplot-${PLPLOT_VERSION}.tar.gz" SHA512 ${PLPLOT_HASH} ) -vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PLPLOT_VERSION} + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/0001-findwxwidgets-fixes.patch" + "${CMAKE_CURRENT_LIST_DIR}/0002-wxwidgets-dev-fixes.patch" + "${CMAKE_CURRENT_LIST_DIR}/install-interface-include-directories.patch" +) set(BUILD_with_wxwidgets OFF) if("wxwidgets" IN_LIST FEATURES) set(BUILD_with_wxwidgets ON) endif() -# Patch build scripts -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/install-interface-include-directories.patch" -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -32,9 +34,7 @@ vcpkg_configure_cmake( -DPLPLOT_USE_QT5=OFF -DENABLE_ocaml=OFF -DPL_DOUBLE=ON - -DENABLE_wxwidgets=${ENABLE_wxwidgets} - -DPLD_wxpng=${ENABLE_wxwidgets} - -DPLD_wxwidgets=${ENABLE_wxwidgets} + -DPLD_wxwidgets=${BUILD_with_wxwidgets} -DENABLE_DYNDRIVERS=OFF -DDATA_DIR=${CURRENT_PACKAGES_DIR}/share/plplot OPTIONS_DEBUG @@ -51,6 +51,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/plplot) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/pltek.exe ${CURRENT_PACKAGES_DIR}/bin/pltek.exe + ${CURRENT_PACKAGES_DIR}/debug/bin/wxPLViewer.exe + ${CURRENT_PACKAGES_DIR}/bin/wxPLViewer.exe ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") From 1955e755b729fcc086fce76b82172a88ced22ca8 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Thu, 10 Jan 2019 15:51:21 -0500 Subject: [PATCH 58/63] [gettext] Add mirror (#5055) * [gettext] Add mirror * [gettext] http -> https for original download URL --- ports/gettext/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 7f0b6bc12b8318..2a26817d764df7 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -8,7 +8,7 @@ endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gettext-0.19) vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.tar.gz" + URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-0.19.tar.gz" FILENAME "gettext-0.19.tar.gz" SHA512 a5db035c582ff49d45ee6eab9466b2bef918e413a882019c204a9d8903cb3770ddfecd32c971ea7c7b037c7b69476cf7c56dcabc8b498b94ab99f132516c9922 ) From 1fe5a31cd771313e38c46cd63ad3a33aa0acad90 Mon Sep 17 00:00:00 2001 From: LarryIII <33021067+LarryIII@users.noreply.github.com> Date: Thu, 10 Jan 2019 14:22:39 -0800 Subject: [PATCH 59/63] Fix error C2169 (#5118) --- ports/libmupdf/CONTROL | 2 +- ports/libmupdf/Fix-error-C2169.patch | 12 ++++++++++++ ports/libmupdf/portfile.cmake | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/libmupdf/Fix-error-C2169.patch diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL index 36ae69488dd3db..df04d00a2ad18e 100644 --- a/ports/libmupdf/CONTROL +++ b/ports/libmupdf/CONTROL @@ -1,4 +1,4 @@ Source: libmupdf -Version: 1.12.0 +Version: 1.12.0-1 Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec Description: a lightweight PDF, XPS, and E-book library diff --git a/ports/libmupdf/Fix-error-C2169.patch b/ports/libmupdf/Fix-error-C2169.patch new file mode 100644 index 00000000000000..164ffe157411ab --- /dev/null +++ b/ports/libmupdf/Fix-error-C2169.patch @@ -0,0 +1,12 @@ +diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h +index 0552771..42fd037 100644 +--- a/include/mupdf/fitz/system.h ++++ b/include/mupdf/fitz/system.h +@@ -117,7 +117,6 @@ static __inline int signbit(double x) + #define isinf(x) (!_finite(x)) + #endif + +-#define hypotf _hypotf + #define atoll _atoi64 + + char *fz_utf8_from_wchar(const wchar_t *s); diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index b3618ea80b39ad..2af2327ccf8d57 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.12.0 SHA512 893a1958e34355acf73624e9c47f4a97adf13d5fe33604ac384df9ac22a56ef7c18e02143eaffc3c2a08f460e4c71fee00c094b6d6696f8446977bb18f65e3da HEAD_REF master + PATCHES + "${CURRENT_PORT_DIR}/Fix-error-C2169.patch" ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) From 0e08805a7b60e9c74cf1232cc28652d8761c88dc Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 10 Jan 2019 17:05:54 -0800 Subject: [PATCH 60/63] [openssl-uwp] Patch Configure script to set UNICODE --- .../fix-uwp-configure-unicode.patch | 19 +++++++++++++++++++ ports/openssl-uwp/portfile.cmake | 12 ++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 ports/openssl-uwp/fix-uwp-configure-unicode.patch diff --git a/ports/openssl-uwp/fix-uwp-configure-unicode.patch b/ports/openssl-uwp/fix-uwp-configure-unicode.patch new file mode 100644 index 00000000000000..a3b645ad1e792b --- /dev/null +++ b/ports/openssl-uwp/fix-uwp-configure-unicode.patch @@ -0,0 +1,19 @@ +diff --git a/Configure b/Configure +index 67df080..57a15d8 100644 +--- a/Configure ++++ b/Configure +@@ -598,12 +598,12 @@ my %table=( + # 'perl Configure VC-WINSTORE + "VC-WINSTORE","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + # 'perf Configure VC-WINUNIVERSAL +-"VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + + "debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "debug-VC-WINPHONE","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINAPP -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "debug-VC-WINSTORE","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", +-"debug-VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINUCRT -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"debug-VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINUCRT -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + + # Unified CE target + "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32", diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index 77264b3ec301f7..83eff7dcc617fb 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -19,7 +19,6 @@ endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2q_WinRT) vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(JOM) @@ -33,11 +32,12 @@ vcpkg_download_distfile(ARCHIVE SHA512 828ddeb10b7d04155df64cb38f3d8b8109ff01494fed7f6c1063673e45414c1c309379e8bbe72478bd0fbae649d6749877c20b1b4a91db136a0853745f4da6b6 ) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-configure-unicode.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/tmp32dll) From bcdabb33868787e3efb227bb2150f65d6acbd7f5 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 10 Jan 2019 17:42:56 -0800 Subject: [PATCH 61/63] Change CONTROL version --- ports/openssl-uwp/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL index 02b19126a048fd..1bfa6651a2fb35 100644 --- a/ports/openssl-uwp/CONTROL +++ b/ports/openssl-uwp/CONTROL @@ -1,3 +1,3 @@ Source: openssl-uwp -Version: 1.0.2q-winrt +Version: 1.0.2q-winrt-1 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. From 885ca2ce6cd1c9353f4a0f28f94547a1342a7ae2 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 11 Jan 2019 20:15:34 +0100 Subject: [PATCH 62/63] [libjpeg-turbo] use d suffix for debug libs (#4965) * use d suffix for debug libs, improve compatibility with official FindJPEG.cmake (cmake 3.13) * [libjpeg] fix also non-static case * [libjpeg-turbo] bump version * [libjpeg-turbo] fixes for regression on Linux/macOS * [libjpeg-turbo] fix regression in qt5-base * [linkjpeg-turbo] force CI test --- ports/libjpeg-turbo/CONTROL | 2 +- ports/libjpeg-turbo/portfile.cmake | 9 ++++++--- ports/qt5-base/portfile.cmake | 6 ++++-- ports/vxl/portfile.cmake | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index fa72d68b0bd113..88f6e689ae8ffb 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,3 +1,3 @@ Source: libjpeg-turbo -Version: 1.5.3-1 +Version: 1.5.3-2 Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems. diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index c077fd16c4e1ed..002818c4752c57 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -51,11 +51,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Rename libraries for static builds -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") endif() file(COPY diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index b6d140f88cf55a..696ae0cb63f22e 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -79,13 +79,14 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore ${CORE_OPTIONS} -mp -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - LIBJPEG_LIBS="-ljpeg" OPTIONS_RELEASE + LIBJPEG_LIBS="-ljpeg" ZLIB_LIBS="-lzlib" LIBPNG_LIBS="-llibpng16" FREETYPE_LIBS="-lfreetype" PSQL_LIBS="-llibpq" OPTIONS_DEBUG + LIBJPEG_LIBS="-ljpegd" ZLIB_LIBS="-lzlibd" LIBPNG_LIBS="-llibpng16d" PSQL_LIBS="-llibpqd" @@ -100,8 +101,8 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") ${CORE_OPTIONS} -no-sqlite -no-opengl # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - LIBJPEG_LIBS="-ljpeg" OPTIONS_RELEASE + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a" "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a" @@ -109,6 +110,7 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a" "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a" OPTIONS_DEBUG + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake index 75d89ee2d9a4b7..9735f144baeb0b 100644 --- a/ports/vxl/portfile.cmake +++ b/ports/vxl/portfile.cmake @@ -47,4 +47,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/core/vxl_copyright.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/core/vxl_copyright.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +# \ No newline at end of file From e4a767245a63261d5b0291d85c0bd5661f4287b7 Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Fri, 11 Jan 2019 22:23:09 +0300 Subject: [PATCH 63/63] [nlohmann-json] Update to 3.5.0 (#5033) --- ports/nlohmann-json/CONTROL | 2 +- ports/nlohmann-json/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL index 1e628ba81b53a3..6d8f59edcb552f 100644 --- a/ports/nlohmann-json/CONTROL +++ b/ports/nlohmann-json/CONTROL @@ -1,3 +1,3 @@ Source: nlohmann-json -Version: 3.4.0 +Version: 3.5.0 Description: JSON for Modern C++ diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index d3926cab6399aa..66096ce89aa1f2 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(SOURCE_VERSION 3.4.0) +set(SOURCE_VERSION 3.5.0) vcpkg_download_distfile(HEADER URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/json.hpp" FILENAME "nlohmann-json-${SOURCE_VERSION}.hpp" - SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d + SHA512 6e8df9c0a8b5e74cc03f1c7620820215d43b642e213d30481830e5608c8196455dab5a5b604758c25dc6f45bd394fc0be6c8f8712a6498e96b3fd2e7d388d3c0 ) vcpkg_download_distfile(LICENSE