Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[many ports] Updates 2019.05.24 #6618

Merged
merged 35 commits into from
Jun 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
bde4119
[many ports] Updates 2019.05.24
ras0219-msft May 25, 2019
293b90d
Update SHA512 and resolve conflict for ebml and matroska
May 28, 2019
d24c52d
Merge branch 'master' into dev/roschuma/upgrades
May 29, 2019
deb4b66
[avro-c]Fix build error caused by jansson upgrades.
May 30, 2019
0e96baa
[xxhash]Update to the next version to fix build error.(xxhash issue:#…
May 30, 2019
6350427
Fix failures and undo asio
May 31, 2019
7540330
Merge branch 'dev/roschuma/upgrades' of https://github.com/ras0219-ms…
May 31, 2019
144597b
Merge branch 'master' into dev/roschuma/upgrades
May 31, 2019
d2b3dcf
[libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches
LilyWangL May 31, 2019
6377ffd
Merge branch 'dev/roschuma/upgrades' of https://github.com/ras0219-ms…
LilyWangL May 31, 2019
586a19f
Update REF
May 31, 2019
d56db68
Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes
Jun 3, 2019
901fe94
Merge branch 'master' into dev/roschuma/upgrades
Jun 3, 2019
5eeefe6
[flann, fastcdr] Fix old patches and build error.
LilyWangL Jun 3, 2019
b7f3a4e
[flann, fastcdr] Fix build error.
LilyWangL Jun 4, 2019
65ac0c2
Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common …
Jun 4, 2019
88d6642
Merge branch 'master' into dev/roschuma/upgrades
Rastaban Jun 4, 2019
47fd890
[dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Upda…
LilyWangL Jun 5, 2019
625541c
Merge branch 'dev/roschuma/upgrades' of https://github.com/ras0219-ms…
LilyWangL Jun 5, 2019
14ae075
fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flan…
Jun 5, 2019
03d10af
Merge branch 'master' into dev/roschuma/upgrades
Jun 5, 2019
2919acd
fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbu…
Jun 5, 2019
3434c7a
undo libmupdf forge kd-soap qca
Jun 6, 2019
0c39109
Merge branch 'master' into dev/roschuma/upgrades
Jun 6, 2019
ba43775
Merge remote-tracking branch 'origin/master' into HEAD
ras0219-msft Jun 10, 2019
f93e532
[mosquitto] Fix installation of import libs
ras0219-msft Jun 10, 2019
d1ec23f
[arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebm…
ras0219-msft Jun 10, 2019
d4c8c34
[fastcdr] Minimize patch
ras0219-msft Jun 10, 2019
ae34aa9
[many ports] Revert trivial changes
ras0219-msft Jun 10, 2019
e1d4ec0
[libyaml] Switch to non-dist tag
ras0219-msft Jun 10, 2019
5e9d36b
[sqlite-modern-cpp] Track master due to infrequent release
ras0219-msft Jun 10, 2019
6c8cd05
[nano-signal-slot] Revert downgrade
ras0219-msft Jun 10, 2019
232b276
[openvpn3] Bump control version to account for portfile change
ras0219-msft Jun 10, 2019
8ac9039
[sqlite-modern-cpp] Fixup wrong hash
ras0219-msft Jun 10, 2019
c216200
[mosquitto] Commit missing patch
ras0219-msft Jun 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/avro-c/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: avro-c
Version: 1.8.2-1
Version: 1.8.2-2
Description: Apache Avro is a data serialization system
Build-Depends: jansson, liblzma, zlib
20 changes: 20 additions & 0 deletions ports/avro-c/fix-build-error.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/lang/c/src/CMakeLists.txt b/lang/c/src/CMakeLists.txt
index c21f1ce..accb0e3 100644
--- a/lang/c/src/CMakeLists.txt
+++ b/lang/c/src/CMakeLists.txt
@@ -85,13 +85,13 @@ source_group(Avro FILES ${AVRO_SRC})
string(REPLACE ":" "." LIBAVRO_DOT_VERSION ${LIBAVRO_VERSION})

add_library(avro-static STATIC ${AVRO_SRC})
-target_link_libraries(avro-static ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+target_link_libraries(avro-static jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro)

if (NOT WIN32)
# TODO: Create Windows DLLs. See http://www.cmake.org/Wiki/BuildingWinDLL
add_library(avro-shared SHARED ${AVRO_SRC})
-target_link_libraries(avro-shared ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+target_link_libraries(avro-shared jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
set_target_properties(avro-shared PROPERTIES
OUTPUT_NAME avro
SOVERSION ${LIBAVRO_DOT_VERSION})
10 changes: 4 additions & 6 deletions ports/avro-c/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@ vcpkg_from_github(
REF release-1.8.2
SHA512 a48cc353aadd45ad2c8593bf89ec3f1ddb0fcd364b79dd002a60a54d49cab714b46eee8bd6dc47b13588b9eead49c754dfe05f6aff735752fca8d2cd35ae8649
HEAD_REF master
PATCHES
avro.patch
avro-pr-217.patch
fix-build-error.patch # Since jansson updated, use jansson::jansson instead of the macro ${JANSSON_LIBRARIES}
)

vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/avro.patch
${CMAKE_CURRENT_LIST_DIR}/avro-pr-217.patch)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/lang/c
PREFER_NINJA
Expand Down
2 changes: 1 addition & 1 deletion ports/cppcms/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: cppcms
Version: 1.1.0-2
Version: 1.2.1
Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development
Build-Depends: icu, pcre, openssl, zlib
8 changes: 4 additions & 4 deletions ports/cppcms/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO artyom-beilis/cppcms
REF v1.1.0
SHA512 cfc77f28ddee05b8a350fff1dbd7c09adcf008b8662d4f977b203dee50b5fadae97df499a655ebb48263a7448e0bdca514c8ac52ea805bf33e48612dabaa69f4
REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4
SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df
)

vcpkg_find_acquire_program(PYTHON2)
Expand All @@ -27,5 +27,5 @@ file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
file(REMOVE ${EXE_FILES})

# Handle copyright
file(COPY ${SOURCE_PATH}/LGPLv3.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppcms)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppcms/LGPLv3.txt ${CURRENT_PACKAGES_DIR}/share/cppcms/copyright)
file(COPY ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppcms)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppcms/MIT.TXT ${CURRENT_PACKAGES_DIR}/share/cppcms/copyright)
2 changes: 1 addition & 1 deletion ports/dcmtk/CONTROL
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: dcmtk
Version: 3.6.3-1
Version: 3.6.4
Description: This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.
19 changes: 10 additions & 9 deletions ports/dcmtk/dcmtk.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
diff --git "a/CMake/dcmtkPrepare.cmake" "b/CMake/dcmtkPrepare.cmake"
--- a/CMake/dcmtkPrepare.cmake 2018-02-05 12:58:13.000000000 -0500
+++ b/CMake/dcmtkPrepare.cmake 2018-04-25 15:07:12.927851000 -0400
@@ -192,9 +192,9 @@
diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake
index e9f77b5..4f7ebe3 100644
--- a/CMake/dcmtkPrepare.cmake
+++ b/CMake/dcmtkPrepare.cmake
@@ -192,9 +192,9 @@ include(GNUInstallDirs)
# CMake's files (DCMTKTarget.cmake, DCMTKConfigVersion.cmake and DCMTKConfig.cmake) are installed
# to different installation paths under Unix- and Windows-based systems
IF(UNIX)
- SET(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk")
if(UNIX)
- set(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk")
+ SET(DCMTK_INSTALL_CMKDIR "share/dcmtk")
ELSEIF(WIN32)
- SET(DCMTK_INSTALL_CMKDIR "cmake")
elseif(WIN32)
- set(DCMTK_INSTALL_CMKDIR "cmake")
+ SET(DCMTK_INSTALL_CMKDIR "share/dcmtk")
ENDIF(UNIX)
endif()

#-----------------------------------------------------------------------------
4 changes: 2 additions & 2 deletions ports/dcmtk/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DCMTK/dcmtk
REF DCMTK-3.6.3
SHA512 5863d0c05f046075b998bced7c8c71bf8e969dd366f26d48cdf26012ea744ae4a22784a5c3c12e12b0f188e997c93a6890ef0c3c336865ea93f13c45f70b258d
REF 1967b13134308f311e6a827e616958c6a4da5bc9
SHA512 a63a773e339081720adb0f3260a3b21ee11cde8009b321c3f45eeb40402ff29bd580926fb44f0dd784ba8369e2597933196bdaa324517d91fa5201b11b7504c0
HEAD_REF master
PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch
)
Expand Down
3 changes: 2 additions & 1 deletion ports/ensmallen/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Source: ensmallen
Version: 1.15.0-1
Version: 1.15.1
Description: A header-only C++ library for mathematical optimization.
Build-Depends: openblas (!osx), clapack (!osx), armadillo

4 changes: 2 additions & 2 deletions ports/ensmallen/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mlpack/ensmallen
REF ensmallen-1.15.0
SHA512 4264bbba856e8fd4fb00d8a4e5f90d93b853d5358cea0ab7231f38d22af3b1e22b238af03edf292086937c16fe7575549d0a1e4fba1d49c85452ec1d3cc9f31a
REF 8bea8d214b40be3cb42e817328c0791541fbcd6c
SHA512 b075b763c136c1d2d5088c533a8557e3d425da7bcfeb3748063c1e3225e58969eddfc5bd786cb02f29f71ea5e3288327481a0961f64b1d2ff1251a0f59c07779
HEAD_REF master
PATCHES
disable_tests.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/fastcdr/CONTROL
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: fastcdr
Version: 1.0.6-2
Version: 1.0.9-1
Description: eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.
31 changes: 9 additions & 22 deletions ports/fastcdr/install-cmake.patch
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index 46d6f20..5d73ec5 100644
index 14747c9..65c3ddb 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -139,7 +139,12 @@ if(MSVC OR MSVC_IDE)
set(DIR_EXTENSION "/${MSVC_ARCH}")
endif()
@@ -155,7 +155,7 @@ elseif(NOT EPROSIMA_INSTALLER)
COMPONENT cmake
)

- install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static
+ if(BUILD_SHARED_LIBS)
+ set(PROJECT_TARGETS ${PROJECT_NAME})
+ else()
+ set(PROJECT_TARGETS ${PROJECT_NAME}_static)
+ endif()
+ install(TARGETS ${PROJECT_TARGETS}
EXPORT ${PROJECT_NAME}Targets
RUNTIME DESTINATION ${BIN_INSTALL_DIR}${DIR_EXTENSION}
LIBRARY DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}
@@ -147,7 +152,6 @@ if(MSVC OR MSVC_IDE)
COMPONENT libraries_${MSVC_ARCH}
)

- export(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static FILE ${PROJECT_BINARY_DIR}/cmake/config/${PROJECT_NAME}Targets.cmake)
install(EXPORT ${PROJECT_NAME}Targets
DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}/${PROJECT_NAME}/cmake
COMPONENT cmake
- if(MSVC OR MSVC_IDE)
+ if(MSVC OR MSVC_IDE AND 0)
if(TARGET_TYPE STREQUAL "SHARED_LIBRARY")
# Install pdb files
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Debug/
13 changes: 6 additions & 7 deletions ports/fastcdr/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO eProsima/Fast-CDR
REF v1.0.6
SHA512 80861ff6a0283e1398306e081fe70d7d185f980e5714ae51864cae012b8f79719efa24e7f41025b2bfb2052cb2a3098436c75a38407f8f5a331593cb91868fb2
REF v1.0.9
SHA512 2825e61fc4736c9364fc3130f649798cec11fcb56dc5e202c17731121ad8a2795f0fbf8acb5d8d662181bc470e7a3e95a5027283872714be505bb2562c2e2312
HEAD_REF master
PATCHES install-cmake.patch
)
Expand All @@ -19,17 +19,16 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/fastcdr/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/fastcdr/cmake)

file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" _contents)
string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdrTargets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdrTargets.cmake)" _contents "${_contents}")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" "${_contents}")
file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" _contents)
string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdr-targets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdr-targets.cmake)" _contents "${_contents}")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" "${_contents}")

vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/lib/fastcdr ${CURRENT_PACKAGES_DIR}/debug/lib/fastcdr)

# always build static and share library default
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(READ ${CURRENT_PACKAGES_DIR}/include/fastcdr/eProsima_auto_link.h EPROSIMA_AUTO_LINK_H)
string(REPLACE "#define EPROSIMA_LIB_PREFIX \"lib\"" "#define EPROSIMA_LIB_PREFIX" EPROSIMA_AUTO_LINK_H "${EPROSIMA_AUTO_LINK_H}")
Expand Down
2 changes: 1 addition & 1 deletion ports/fizz/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: fizz
Version: 2019.05.13.00
Version: 2019.05.20.00
Build-Depends: folly, openssl, libsodium, zlib
Description: a TLS 1.3 implementation by Facebook
4 changes: 2 additions & 2 deletions ports/fizz/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz
REF v2019.05.13.00
SHA512 f1ce2a74ad0c06fb29b37bf02dce832ffc6581723e92f11bfde075307cb0d0e2000e686e48f2f77f07a8abc425a61c2621b7d1211551ee93867cb042f1100598
REF 6d26a1be8d7a20d8d89c374ee3dc5c452d18c18d
SHA512 bc6aa17a97fdfc53d0a247b876cbd1fea8214608b7e463dcf21e34df65015fe77e617c5a6c6bfa84b87e60e56b6aeb89aa2d8d774f97fc1f76f415869948a48a
HEAD_REF master
PATCHES find-zlib.patch
)
Expand Down
2 changes: 1 addition & 1 deletion ports/folly/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: folly
Version: 2019.05.13.00
Version: 2019.05.20.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, boost-smart-ptr
Default-Features: zlib
Expand Down
4 changes: 2 additions & 2 deletions ports/folly/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF v2019.05.13.00
SHA512 5dfeef0c2845b15e32a29119921d65e349a7ae9bcfa25c406d42d8df1614d2542153cd0ad8d0cf22592045b24272375a7839af91579d6be685cb8a3512586689
REF 354223ec1602913667c52cee1ce0782a82cb0cad
SHA512 53dd401e5fe8aebf35bec7c1b49e45a7abf152ad12f7392f31653f9e644207d0926424948ad2d7974bf3e5eabaa97e3e9113f1318883bfc99b968b3700b19023
HEAD_REF master
PATCHES
missing-include-atomic.patch
Expand Down
26 changes: 0 additions & 26 deletions ports/ftgl/0001-fix-building-DLL-on-Windows.patch

This file was deleted.

2 changes: 1 addition & 1 deletion ports/ftgl/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: ftgl
Version: 2.3.1
Version: 2.4.0-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.
Expand Down
23 changes: 23 additions & 0 deletions ports/ftgl/Fix-headersFilePath.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 693e49f..c47ff3c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,5 @@
-
-
-
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cmake)

-
ADD_DEFINITIONS(-DPACKAGE_VERSION="${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}")

IF(WIN32)
@@ -26,7 +22,7 @@ SET(libftgl_la_SOURCES
FTGlyphContainer.h
FTInternals.h
FTLibrary.cpp
- FTLibrary.h
+ FTGL/FTLibrary.h
FTList.h
FTPoint.cpp
FTSize.cpp
7 changes: 4 additions & 3 deletions ports/ftgl/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
include(vcpkg_common_functions)
vcpkg_find_acquire_program(DOXYGEN)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO frankheckenbach/ftgl
REF 2.3.1
SHA512 4c3c92e79371aa9048a0de6c27bd008036be19fe6179bce472f36ced359026aaeaa5b63c83f90ffc1d425dd2e587479efc700dc1082c2ed0189d16ea87838c9a
REF 483639219095ad080538e07ceb5996de901d4e74
SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f
HEAD_REF master
PATCHES "0001-fix-building-DLL-on-Windows.patch"
PATCHES Fix-headersFilePath.patch
)

vcpkg_configure_cmake(
Expand Down
2 changes: 1 addition & 1 deletion ports/gherkin-c/CONTROL
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: gherkin-c
Version: c-libs-e63e83104b
Version: 4.1.2
Description: Gherkin parser/compiler in C
4 changes: 2 additions & 2 deletions ports/gherkin-c/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO c-libs/gherkin-c
REF e63e83104b835e217140e9dc77d9ce2bb50f234e
SHA512 a99b3f695257b45df8ff7b8ec46bff28991cf2b9bc51a25247550471c724bd14ee64340db684f096131f47d7f4ff278d23dda546e7dfe29134bbc1dbccaf0d1e
REF 8f31c2ff6a7b58196a061c8847508563679f67b3
SHA512 f78a1f9da7ff38fe2546e0db9ed33a2e25e12aa8a407ce827933a379ce083e6f872b39eb2321ff8c35199015c3c2299e46567171c5edfeff07600765f3f0a6ec
HEAD_REF master
)

Expand Down
26 changes: 13 additions & 13 deletions ports/grpc/00003-undef-base64-macro.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
index 09306110c6..eb0ad96a7a 100644
--- a/src/core/lib/transport/transport.cc
+++ b/src/core/lib/transport/transport.cc
@@ -134,6 +134,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
refcount->slice_refcount.sub_refcount = &refcount->slice_refcount;
}

+#undef move64
+
static void move64(uint64_t* from, uint64_t* to) {
*to += *from;
*from = 0;
diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
index 29c1e56..29de9d8 100644
--- a/src/core/lib/transport/transport.cc
+++ b/src/core/lib/transport/transport.cc
@@ -96,6 +96,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
refcount, &refcount->slice_refcount);
}
+#undef move64
+
static void move64(uint64_t* from, uint64_t* to) {
*to += *from;
*from = 0;
2 changes: 1 addition & 1 deletion ports/grpc/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: grpc
Version: 1.20.1-1
Version: 1.21.1
Build-Depends: zlib, openssl, protobuf, c-ares (!uwp)
Description: An RPC library and framework
4 changes: 2 additions & 2 deletions ports/grpc/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
REF v1.20.1
SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
REF 75475f090875e737ad6909a6057c59577f0c79b1
SHA512 db9ff82dee38cb0f4ba10874d10bf6cb20c8a4d49e7dd24bcd9f71388c54c782ee12fda6f1bfedd79ad988b0275d3f96df4686217465acfafcfb5e4c30093a5b
HEAD_REF master
PATCHES
00001-fix-uwp.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/inih/CONTROL
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: inih
Version: 43
Version: 44
Description: Simple .INI file parser
4 changes: 2 additions & 2 deletions ports/inih/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO benhoyt/inih
REF r43
SHA512 4ad87d69b033886d170257174f0dd97c475f86e311b875bbaf6835e5c4c5c0d98d788702b3880a0befb304f5440ee61de3ea1948f1432198949265013f4146e4
REF b1dbff4b0bd1e1f40d237e21011f6dee0ec2fa69
SHA512 b250a7d2a9a1a18793a5f7421d444cbf92c21f1aca5f767781221e2e64b0ba5e0804e82c3f8e4f2c0e08516f4ddbf1533e4d254c557bfb38d9a0da879b98cffb
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/ismrmrd/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: ismrmrd
Version: 1.4
Version: 1.4.0
Description: ISMRM Raw Data Format
Build-Depends: pugixml, hdf5
Loading