mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-06 06:10:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/roschuma/4845

Browse Source
This commit is contained in:
Robert Schumacher 2018-11-28 23:13:17 -08:00
commit c7e3589fb9
28 changed files with 140 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/azure-c-shared-utility/CONTROL
View File

@ -1,4 +1,4 @@
Source: azure-c-shared-utility
Version: 1.1.10-1
Version: 1.1.11-1
Description: Azure C SDKs common code
Build-Depends: curl (linux), openssl (linux)

4
ports/azure-c-shared-utility/portfile.cmake
View File

@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-c-shared-utility
REF 68ede5bbc58c7d976f3bd68325edec181c254e5e
SHA512 97253c081cab90c7c879da9ecfa076be43d19fd0d442d91fcab8ab3149e792b868c363c56b5afc3e3880a18b400e663661d257237d2f1ef97544522a1cabcd5a
REF bcf6393b1ce3cecf0fcdf8988621fd6e4d414df3
SHA512 e5ae3c895777df90e725da7686939b46fa4df19ce5626bbe13a5aaf1b844ee56c96ddf2a9ad8426a96cdc34e8be338c95b6759e618143e19445c5180fb0f7ed1
HEAD_REF master
)

2
ports/azure-iot-sdk-c/CONTROL
View File

@ -1,4 +1,4 @@
Source: azure-iot-sdk-c
Version: 1.2.10-1
Version: 1.2.11-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

4
ports/azure-iot-sdk-c/portfile.cmake
View File

@ -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 0ca9b92d4ff7f7a44fe1687e81f919bd7dcaa944
SHA512 a4d43d5615d3571fda29f3d47467b816745f939941da899df799a0c4cf09c920c20b924aa29e2e2d6f4a19b81ff83969e773b6cf333bec9e2170376fe07b42ec
REF acff8b1677150cb165a7b111745144cf8fab76cc
SHA512 7e7e0679d48e76539a607a593b1c9ccc57eeb4f8bf33fb49051ad99203d1568f0ac2a38fe32ba0b3670cea32a2318e8c135c709ba5712f95cd8005ff21572e28
HEAD_REF master
PATCHES improve-external-deps.patch
)

2
ports/azure-uamqp-c/CONTROL
View File

@ -1,4 +1,4 @@
Source: azure-uamqp-c
Version: 1.2.10-1
Version: 1.2.11-1
Build-Depends: azure-c-shared-utility
Description: AMQP library for C

4
ports/azure-uamqp-c/portfile.cmake
View File

@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uamqp-c
REF ec107011716bc797d3d7a4a4a1141df4367038a3
SHA512 db25018a6f93a29da4bae8426f6e021a0d823075375f69f617c6aba776f5ac6ed5107e055f0a436f22ede2057045d28fab15607a58703c6c43937abec87ab076
REF 075b5a669f49b9d3b68b7bf9b465fe92e1c740aa
SHA512 54b7c9ebdaca13d44634e99a064aac54e9eadaedcbed723aabc62c70414ef54d62c5f58ddc836e8020eba4ca0d03d27c2d73391d4071f973fda228866215ec58
HEAD_REF master
)

2
ports/azure-uhttp-c/CONTROL
View File

@ -1,4 +1,4 @@
Source: azure-uhttp-c
Version: 1.1.10-1
Version: 1.1.11-2
Build-Depends: azure-c-shared-utility
Description: Azure HTTP Library written in C

4
ports/azure-uhttp-c/portfile.cmake
View File

@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uhttp-c
REF 8ec55bb8596dae1154ae897b5064b8eba34c136c
SHA512 73b861409dede5c1936711ec04e76e8467dadc08acda6ac1b832046a4f9b2f6d35403c01acb818b5655c2c43f700d9f83edf11b8b00f7a565f260700a12c9f7c
REF ed7d104c4ab96aaa68e429066953874f12be70eb
SHA512 512f8fd46dbc40ff79ffdbc2ea881a29aaa72db4c36f16f96f30a224220183e295d8e39a4965d788f92f4976fa6d37b197c04b32bbd187d456d5c5d516b95c9f
HEAD_REF master
)

2
ports/azure-umqtt-c/CONTROL
View File

@ -1,4 +1,4 @@
Source: azure-umqtt-c
Version: 1.1.10-1
Version: 1.1.11-1
Build-Depends: azure-c-shared-utility
Description: General purpose library for communication over the mqtt protocol

4
ports/azure-umqtt-c/portfile.cmake
View File

@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-umqtt-c
REF e5ab6b66ccba5a7ff7ed7421ffe0fa13ecabe000
SHA512 19878f798d73f98afdee6ac574e136f1b2f8ddd3a7537ee666a98d04cade6ecd2526714eb74335af2eff05165492933ec90cb79a9cb914093fa96cfe35a84cb4
REF ff05514c9b4742ae8d7785719a399a7fe6eac09b
SHA512 d750390d38555ab00e5d5cc5aa0b07ae452afd2e2af0dade5fc1c55f63ad367688b5ff7e97e65ab00f0153340b8bcc1e5039e80e5795b9f9c0cd2c48eedad081
HEAD_REF master
)

4
ports/bitserializer-cpprestjson/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: bitserializer-cpprestjson
Version: 0.8
Build-Depends: bitserializer, cpprestsdk
Description: This is an implementation of the BitSerializer archive for serialization JSON (based on CppRestSDK library).

13
ports/bitserializer-cpprestjson/portfile.cmake Normal file
View File

@ -0,0 +1,13 @@
include(vcpkg_common_functions)
vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO Pavel_Kisliak/BitSerializer
REF 0.8
SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/archives/bitserializer_cpprest_json DESTINATION ${CURRENT_PACKAGES_DIR}/include)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-cpprestjson RENAME copyright)

4
ports/bitserializer-rapidjson/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: bitserializer-rapidjson
Version: 0.8
Build-Depends: bitserializer, rapidjson
Description: This is an implementation of the BitSerializer archive for serialization JSON (based on the RapidJson library).

13
ports/bitserializer-rapidjson/portfile.cmake Normal file
View File

@ -0,0 +1,13 @@
include(vcpkg_common_functions)
vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO Pavel_Kisliak/BitSerializer
REF 0.8
SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/archives/bitserializer_rapidjson DESTINATION ${CURRENT_PACKAGES_DIR}/include)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-rapidjson RENAME copyright)

5
ports/bitserializer/CONTROL
View File

@ -1,4 +1,3 @@
Source: bitserializer
Version: 0.7
Build-Depends: cpprestsdk
Description: The library for simple serialization of arbitrary C++ types to various output formats (currently just supported JSON based on CppRestSDK).
Version: 0.8
Description: The core part of library for serialization of arbitrary C++ types to various output formats.

6
ports/bitserializer/portfile.cmake
View File

@ -2,12 +2,12 @@ include(vcpkg_common_functions)
vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO Pavel_Kisliak/BitSerializer
REF 0.7
SHA512 3a50b1b3077115f60d298f4257ae6a5a350c1d8b3d575af83b4f0746757ab3393da7c81ac9c7db4e30540fe94f1742b1d39de724b2dec080faf727b885bb19a4
REF 0.8
SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
file(INSTALL ${SOURCE_PATH}/core/bitserializer DESTINATION ${CURRENT_PACKAGES_DIR}/include)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer RENAME copyright)

2
ports/folly/CONTROL
View File

@ -1,5 +1,5 @@
Source: folly
Version: 2018.11.05.00
Version: 2018.11.26.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

26
ports/folly/find-gflags.patch
View File

@ -1,13 +1,13 @@
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
index 396fa6c..9d80d99 100644
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
set(FOLLY_HAVE_LIBGFLAGS OFF)
-find_package(GFlags CONFIG QUIET)
+find_package(gflags CONFIG REQUIRED)
if (gflags_FOUND)
message(STATUS "Found gflags from package config")
set(FOLLY_HAVE_LIBGFLAGS ON)
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
index 437c0cd..5530a35 100644
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
set(FOLLY_HAVE_LIBGFLAGS OFF)
-find_package(gflags CONFIG QUIET)
+find_package(gflags CONFIG REQUIRED)
if (gflags_FOUND)
message(STATUS "Found gflags from package config")
set(FOLLY_HAVE_LIBGFLAGS ON)

24
ports/folly/no-werror.patch
View File

@ -1,12 +1,12 @@
diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake
index b7d994b..a518cbe 100644
--- a/CMake/FollyCompilerUnix.cmake
+++ b/CMake/FollyCompilerUnix.cmake
@@ -16,7 +16,6 @@ function(apply_folly_compile_options_to_target THETARGET)
-std=gnu++14
-finput-charset=UTF-8
-fsigned-char
- -Werror
-Wall
-Wno-deprecated
-Wdeprecated-declarations
diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake
index a9cc2c1..de7d714 100644
--- a/CMake/FollyCompilerUnix.cmake
+++ b/CMake/FollyCompilerUnix.cmake
@@ -34,7 +34,6 @@ function(apply_folly_compile_options_to_target THETARGET)
-std=${CXX_STD}
-finput-charset=UTF-8
-fsigned-char
- -Werror
-Wall
-Wno-deprecated
-Wno-deprecated-declarations

4
ports/folly/portfile.cmake
View File

@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF v2018.11.05.00
SHA512 08eee201c2b1179a4e52398cc65964fb299abfb95934687f4ce3d72df1ff70493964835d5e52c8821c63553e0be0d578e1130e50e353a7eab6b0334532e4df2e
REF v2018.11.26.00
SHA512 7a404df7287c9a3278bc47205023881ade188a1d3ade35748ae9ae4f35485faedc9f8c0264cfd0f3565b2d5891235deda0f515946a2c313570ef41751a3693ac
HEAD_REF master
PATCHES
find-gflags.patch

2
ports/graphicsmagick/CONTROL
View File

@ -1,5 +1,5 @@
Source: graphicsmagick
Maintainer: josuegomes@gmail.com
Version: 1.3.30-1
Version: 1.3.31
Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff
Description: Image processing library

4
ports/graphicsmagick/portfile.cmake
View File

@ -1,11 +1,11 @@
include(vcpkg_common_functions)
set(GM_VERSION 1.3.30)
set(GM_VERSION 1.3.31)
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z"
FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z"
SHA512 9e4cfff57ae547f133e6208033213d3aa790cd8c95a061c101c63b8ae8896e7504d02f302efdd20ff24f72c07760a0a5e2b32e21fe454717ed1deb2edeef159c
SHA512 ff67f5e6adf352527264e7a6a76d45ce34470263dc764760d876b9ab5d5078e3a46b9d9cb2e7ab52d53106ffe584d44c66b42f3d4d62c972662d488c86510881
)
vcpkg_extract_source_archive_ex(

2
ports/pcl/CONTROL
View File

@ -1,5 +1,5 @@
Source: pcl
Version: 1.9.0-1
Version: 1.9.1-1
Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio

36
ports/pcl/pcl_utils.patch
View File

@ -1,22 +1,28 @@
diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
index 41a64a269..a12718339 100644
index f523dbc8c..a171b6d24 100644
--- a/cmake/pcl_utils.cmake
+++ b/cmake/pcl_utils.cmake
@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS)
@@ -97,21 +97,12 @@ macro(SET_INSTALL_DIRS)
if (NOT DEFINED LIB_INSTALL_DIR)
set(LIB_INSTALL_DIR "lib")
endif (NOT DEFINED LIB_INSTALL_DIR)
if(NOT ANDROID)
set(INCLUDE_INSTALL_ROOT
- "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
+ "include")
else(NOT ANDROID)
set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
endif(NOT ANDROID)
@@ -114,7 +114,7 @@ macro(SET_INSTALL_DIRS)
- if(NOT ANDROID)
- set(INCLUDE_INSTALL_ROOT
- "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
- else(NOT ANDROID)
- set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
- endif(NOT ANDROID)
+ set(INCLUDE_INSTALL_ROOT "include")
set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
set(BIN_INSTALL_DIR "bin")
set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
if(WIN32 AND NOT MINGW)
- if(WIN32 AND NOT MINGW)
- set(PCLCONFIG_INSTALL_DIR "cmake")
+ set(PCLCONFIG_INSTALL_DIR "share/pcl")
else(WIN32 AND NOT MINGW)
set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
endif(WIN32 AND NOT MINGW)
- else(WIN32 AND NOT MINGW)
- set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
- endif(WIN32 AND NOT MINGW)
+ set(PCLCONFIG_INSTALL_DIR "share/pcl")
endmacro(SET_INSTALL_DIRS)

4
ports/pcl/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO PointCloudLibrary/pcl
REF pcl-1.9.0
SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc
REF pcl-1.9.1
SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf
HEAD_REF master
PATCHES pcl_utils.patch
pcl_config.patch

2
ports/wxwidgets/CONTROL
View File

@ -1,4 +1,4 @@
Source: wxwidgets
Version: 3.1.1
Version: 3.1.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

13
ports/wxwidgets/portfile.cmake
View File

@ -5,11 +5,7 @@ vcpkg_from_github(
REF v3.1.1
SHA512 f6d8974e2f48bae7e96a8938df3ad5efc403036c1dcbe2b48edd276ee7923802ba3e95e3f3bd9db17985e427b8e4f78950df0cbba83ae99d508ed04633816c95
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-platform-lib-dir.patch"
PATCHES disable-platform-lib-dir.patch
)
vcpkg_configure_cmake(
@ -48,4 +44,11 @@ endif()
# Handle copyright
file(COPY ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/wxwidgets/licence.txt ${CURRENT_PACKAGES_DIR}/share/wxwidgets/copyright)
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h ${CURRENT_PACKAGES_DIR}/include/wx/setup.h)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/mswu)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/mswud)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

22
toolsrc/src/vcpkg/base/downloads.cpp
View File

@ -42,6 +42,28 @@ namespace vcpkg::Downloads
0);
Checks::check_exit(VCPKG_LINE_INFO, hSession, "WinHttpOpen() failed: %d", GetLastError());
// Win7 IE Proxy fallback
if (IsWindows7OrGreater() && !IsWindows8Point1OrGreater()) {
// First check if any proxy has been found automatically
WINHTTP_PROXY_INFO proxyInfo;
DWORD proxyInfoSize = sizeof(WINHTTP_PROXY_INFO);
auto noProxyFound =
!WinHttpQueryOption(hSession, WINHTTP_OPTION_PROXY, &proxyInfo, &proxyInfoSize)
|| proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY;
// If no proxy was found automatically, use IE's proxy settings, if any
if (noProxyFound) {
WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ieProxy;
if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr) {
WINHTTP_PROXY_INFO proxy;
proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
proxy.lpszProxy = ieProxy.lpszProxy;
proxy.lpszProxyBypass = ieProxy.lpszProxyBypass;
WinHttpSetOption(hSession, WINHTTP_OPTION_PROXY, &proxy, sizeof(proxy));
}
}
}
// Use Windows 10 defaults on Windows 7
DWORD secure_protocols(WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 |
WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2);