From 2a0bf9c488d5291e82a37d19d4b0f81e79678f0d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 12 Jun 2018 10:32:58 -0700 Subject: [PATCH] Upgrades for 2018.06.12 --- ports/abseil/CMakeLists.txt | 2 +- ports/abseil/CONTROL | 2 +- ports/abseil/portfile.cmake | 4 +-- ports/aws-sdk-cpp/CONTROL | 2 +- ports/aws-sdk-cpp/portfile.cmake | 4 +-- ports/azure-c-shared-utility/CONTROL | 2 +- ports/azure-c-shared-utility/portfile.cmake | 4 +-- ports/azure-uhttp-c/CONTROL | 2 +- ports/azure-uhttp-c/portfile.cmake | 4 +-- ports/azure-umqtt-c/CONTROL | 2 +- ports/azure-umqtt-c/portfile.cmake | 4 +-- ports/benchmark/CONTROL | 2 +- ports/benchmark/portfile.cmake | 4 +-- ports/breakpad/CONTROL | 2 +- ports/breakpad/portfile.cmake | 4 +-- ports/catch2/CONTROL | 2 +- ports/catch2/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/exiv2/CONTROL | 2 +- ports/exiv2/iconv.patch | 28 ++++++++++++++++ ports/exiv2/portfile.cmake | 10 ++---- ports/exiv2/use-iconv.patch | 37 --------------------- ports/forest/CONTROL | 2 +- ports/forest/portfile.cmake | 6 ++-- ports/gdcm2/CONTROL | 2 +- ports/gdcm2/portfile.cmake | 4 +-- ports/harfbuzz/CONTROL | 2 +- ports/harfbuzz/portfile.cmake | 4 +-- ports/jsonnet/CONTROL | 2 +- ports/jsonnet/portfile.cmake | 4 +-- ports/lodepng/CONTROL | 2 +- ports/lodepng/portfile.cmake | 4 +-- ports/luasocket/CONTROL | 2 +- ports/luasocket/portfile.cmake | 4 +-- ports/ms-gsl/CONTROL | 2 +- ports/ms-gsl/portfile.cmake | 4 +-- ports/mujs/CONTROL | 2 +- ports/mujs/portfile.cmake | 4 +-- ports/nuklear/CONTROL | 2 +- ports/nuklear/portfile.cmake | 4 +-- ports/openimageio/CONTROL | 2 +- ports/openimageio/portfile.cmake | 4 +-- ports/rocksdb/CONTROL | 2 +- ports/rocksdb/portfile.cmake | 4 +-- ports/spdlog/CONTROL | 2 +- ports/spdlog/portfile.cmake | 4 +-- ports/tbb/CONTROL | 2 +- ports/tbb/portfile.cmake | 4 +-- 53 files changed, 106 insertions(+), 119 deletions(-) create mode 100644 ports/exiv2/iconv.patch delete mode 100644 ports/exiv2/use-iconv.patch diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt index fabe1516c0f..88a20935aeb 100644 --- a/ports/abseil/CMakeLists.txt +++ b/ports/abseil/CMakeLists.txt @@ -16,7 +16,7 @@ endif() function(add_sublibrary LIB) file(GLOB_RECURSE SOURCES "absl/${LIB}/*.cc") - list(FILTER SOURCES EXCLUDE REGEX "_test(ing)?(_.+)?.cc$|_nonprod.cc$|test_util.cc$") + list(FILTER SOURCES EXCLUDE REGEX "_test(ing)?(_.+)?.cc$|_nonprod.cc$|test_util.cc$|_benchmark.cc$") file(GLOB HEADERS "absl/${LIB}/*.h" "absl/${LIB}/*.inc") file(GLOB INTERNAL_HEADERS "absl/${LIB}/internal/*.h") diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 0b46aff1e91..1636f5b4c53 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-05-01-1 +Version: 2018-06-12-1 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 46a31b2e4f5..c04e698ab14 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 9613678332c976568272c8f4a78631a29159271d - SHA512 a3694d4c74f542f7a55872707548469e1bdc6dcd05d40ffd62de41d7440dc1fb98d260f690a6799ad39142e35226b04aacc6122aa1edf104fc9d396997995a8c + REF e5be80532b5d998813f9db952d2cc5401b1532df + SHA512 8123be7d2e5958a965089b43b010d5851d848f1c35ee93bdb9e18dd6d3bc7e831f0b063a33a88ea97276835afba85e30fab8c703a46a9a9d06775c05df2b3c59 HEAD_REF master ) diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index d91cf33c75c..0ebb370c113 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,5 +1,5 @@ Source: aws-sdk-cpp -Version: 1.4.52 +Version: 1.4.65 Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows) Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 1d566339e90..afb334937c7 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF 1.4.52 - SHA512 ef10a2d9d491ae28179ec7622b34470153cf3a6fdf50ca8f942c098d74a12a9e555c314537c91e06285990fe942bee9e4ff21396752153d482e9db1776981d6b + REF 1.4.65 + SHA512 88cf31cbdab8896510b471900492e8f7c080ba4081a474d605192480dabdd0b693a885a3bc5e610e85f24b9554a9e8fa623ca86cc5d219a4fcf4af0a76072166 HEAD_REF master ) diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 08fecee673b..7dfb375ffa2 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,3 +1,3 @@ Source: azure-c-shared-utility -Version: 1.1.3 +Version: 1.1.5 Description: Azure C SDKs common code diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 6b706aae3a8..be98ce23d81 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 1.1.3 - SHA512 8c69f39ccca30d11a7e665a46e3ec33826af062657a87d32f68e80c6182b15d5e02839f9e541f5dc840219e3256ac090452f4873b6a1a62b3fe6682780314056 + REF 1.1.5 + SHA512 046dbe7561c7c18cffb7e2fc51160cda754c8a896fdae1399cf7bc3c42def02da12ce780c28b57522831eea5ebf9ef0306644127b94473489fb60734e793b9af HEAD_REF master ) diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index 3711a7dfef4..d5236d62ae5 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uhttp-c -Version: 2018-02-09 +Version: LTS_01_2018_Ref01 Build-Depends: azure-c-shared-utility Description: Azure HTTP Library written in C diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index a04290ec182..7a2c51545b0 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 2018-02-09 - SHA512 0668be0f7624d021b6d24e81c21c606ab4a59990eb3d83fea6d2c6cf9ea3f2c6904ad021afcf9645c3c5f2238e9b83146f36522c662b0a2626d928cb4a0218ba + REF LTS_01_2018_Ref01 + SHA512 baf7366e499c32210d0227188044ea1f7f7a78e2bad83d52ca6a71a76a59118ab2cd08ae9e7c511b612b885dcd94fe7a24a619136d3ee03187f780a9bc862218 HEAD_REF master ) diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 68cfaaa05a9..d819a2f5344 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-umqtt-c -Version: 1.1.3 +Version: 1.1.5 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 f24e087bfff..a0891683141 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 1.1.3 - SHA512 5c57fe40dce8166e1e138db45b642152a337dbbbc4d85998ac99b016627c0135b99bd7b189d249c6278837ef4af5ba4e4f964a9b65788acef37d7b37ae125b16 + REF 1.1.5 + SHA512 c72c32f3dcacd5e39094ca244b140dee5da92f85212cece1a7f14e5af05fa6b0af3ba649218aa38b2911f4bda120789fe419f303ad29b7543e039bb5410b58d3 HEAD_REF master ) diff --git a/ports/benchmark/CONTROL b/ports/benchmark/CONTROL index 9853a1509f8..ffdb53881f2 100644 --- a/ports/benchmark/CONTROL +++ b/ports/benchmark/CONTROL @@ -1,3 +1,3 @@ Source: benchmark -Version: 1.4.0 +Version: 1.4.1 Description: A library to support the benchmarking of functions, similar to unit-tests. diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index d724bf5eee1..d370a6991f0 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -16,8 +16,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF v1.4.0 - SHA512 4bb5119fe6c0558e5a8b39486169ffcbf24e877ec7f28636dfab1692936b77334f76d28bda2cdada18e5070579da7a5bf0617bfbb6a09848f0b071df8e694d76 + REF v1.4.1 + SHA512 e9d71b4679cb4e4d755f7bb4101e131b37e209b6aebd0853e0c63eb11c42b75faa5da4ff8c265149808a475f3a1cfb140c5b49f877acfda908a4bb7add983aae HEAD_REF master ) diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL index d6622f15a83..ac4db60b5d9 100644 --- a/ports/breakpad/CONTROL +++ b/ports/breakpad/CONTROL @@ -1,4 +1,4 @@ Source: breakpad -Version: 2018-04-17 +Version: 2018-06-12 Build-Depends: libdisasm Description: a set of client and server components which implement a crash-reporting system. diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake index 939988ef21a..8656bada9b5 100644 --- a/ports/breakpad/portfile.cmake +++ b/ports/breakpad/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/breakpad - REF 9eac2058b70615519b2c4d8c6bdbfca1bd079e39 - SHA512 2bdbfc7455bde3b93c1b0e3d47250722525ffeddbe99277e48d0c2930c461162e9342ed7560b4ea5d1245baf162b1102f0e01176611b403c672435e4f518a7fd + REF 7b3afa9258e58a57ffbeb395d445811f92616ae9 + SHA512 9ed5b3788529ca7ae6adec6abe8e56110eccd74f558013d396de89438bb8178d8b614de64ee6ba7c9bdd5b5a7b16f0fa1060884441e61b66741df427194c2c05 HEAD_REF master ) diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL index a466f7be5e9..6cefca9db86 100644 --- a/ports/catch2/CONTROL +++ b/ports/catch2/CONTROL @@ -1,4 +1,4 @@ Source: catch2 -Version: 2.2.2 +Version: 2.2.3 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 5329d9cab67..d3c4cee0394 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.2.2 - SHA512 ab91036c6c3ace087d0382ce99f26b2c30a4b75d52f285619ca282a618470fe388afe47495f3b2764268d600c6834c60ba464483d06f3a1c4316c099477c8e38 + REF v2.2.3 + SHA512 d065d5797045ce85f576977f78cbdc77a1e8ab820e164aafd91d305aa10a29f7f306734d484714ec05078858457d0a17a57a6246166da3c8f3c708a23a2adc46 HEAD_REF master ) diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index 82f5bcb2742..c54cac57117 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,3 +1,3 @@ Source: directxmesh -Version: may2018-9f0b4e3 +Version: may2018b Description: DirectXMesh geometry processing library \ No newline at end of file diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 25d0eaa9d3d..5d4cd172936 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 9f0b4e3591e528f09eb454681297d7bf22e2ee9a - SHA512 38b8a62bb591c9da034ba3a3186a5c2a4144eba0c9ee3b4ed851a0fc9492a3bdd6f33e508206e0fe6d4b9b58241a10f1bd1b7de5a39691ce8dea51fbaf0e0c65 + REF may2018b + SHA512 97bc498c4e72c6ecdd579772f978da67c671a79132555a8505636df775cca4659944a6a05e0e30b6ce3c28ee7bf5dab0269aa7db233b1dbc79e2aa1d998749a9 HEAD_REF master ) diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index 42efa2233a1..a351a497ff0 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,3 +1,3 @@ Source: directxtex -Version: may2018 +Version: may2018b Description: DirectXTex texture processing library \ No newline at end of file diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index d80a831c101..498244a4dbb 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 may2018 - SHA512 208186f9efe045b6219ac19748896e3630494f75bec33030248b0d7b37d6d6c2433d3fce7141157f85ce068a27a170d0af153dfc4465a9d280aef181ebe3a51f + REF may2018b + SHA512 31b55ceb6b299ac51cba35664e541c7b162db23604c44306f7b2ba410bc0de96b02f6b2f58085c035574580648ab7c6521bc8fe1aa13c34c7ad66060260d0dcd HEAD_REF master ) diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index e52f8dc1455..5d18e7c928f 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,3 +1,3 @@ Source: directxtk -Version: may2018 +Version: may2018b 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 cd290e14270..ebeceeddb2c 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 may2018 - SHA512 0d492fcd72882aa91270b8fbaf9caa897bf4499931921fdded052129ecbb5476a373fa32ac0870897bc5ead9dae749f9b52e86fc617654f64b263041001cdfb5 + REF may2018b + SHA512 0d6f47e99d50c4d98234734d050bf8d302d08960221a114387aa11bebd4da98bcd9617d03214490aa55b97c49c2024f22defc18136ad9f26685437ff74c1db07 HEAD_REF master ) diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL index 085efe4810d..30bcd969217 100644 --- a/ports/exiv2/CONTROL +++ b/ports/exiv2/CONTROL @@ -1,4 +1,4 @@ Source: exiv2 -Version: 2018-05-17 +Version: 2018-06-12 Build-Depends: zlib, expat, libiconv Description: Image metadata library and tools http://www.exiv2.org diff --git a/ports/exiv2/iconv.patch b/ports/exiv2/iconv.patch new file mode 100644 index 00000000000..27bedd314b8 --- /dev/null +++ b/ports/exiv2/iconv.patch @@ -0,0 +1,28 @@ +diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake +index e220e2f..992b887 100644 +--- a/cmake/findDependencies.cmake ++++ b/cmake/findDependencies.cmake +@@ -50,7 +50,7 @@ if( EXIV2_ENABLE_NLS ) + # the manual check in cmake/generateConfigFile.cmake + endif( ) + +-find_package(Iconv) ++find_package(unofficial-iconv CONFIG REQUIRED) + if( ICONV_FOUND ) + message ( "-- ICONV_INCLUDE_DIR : " ${Iconv_INCLUDE_DIR} ) + message ( "-- ICONV_LIBRARIES : " ${Iconv_LIBRARY} ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 91469b6..4c51068 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -274,8 +274,8 @@ if( EXIV2_ENABLE_NLS ) + target_link_libraries( exiv2lib PRIVATE ${LIBINTL_LIBRARIES} ) + endif() + +-if( ICONV_FOUND ) +- target_link_libraries( exiv2lib PRIVATE Iconv::Iconv ) ++if( ICONV_FOUND OR 1 ) ++ target_link_libraries( exiv2lib PRIVATE unofficial::iconv::libiconv ) + endif() + + diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index c4c3173d220..ac6cbf73816 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -3,14 +3,10 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 - REF 4b24e011dc485102a68a8809621e718fc77830a2 - SHA512 acd192c585a074fae3308cce9355e735165142dc19c4a1ab6040fe4e686aa199f30d664eb2b450fe297c9ce0b027952bf784e8aea18c893d80b28e331bf48839 + REF 341de4500ab993103c215bfb07d43d4a08654ac4 + SHA512 b03102a8349050239ae558bbad7ffffb60c555dc9d81cb6c43f0ace5b8cc3a725b75816122f29406678696ca2a280da4d883c7b76fb751bdb0eafd343dda8fcc HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH "${SOURCE_PATH}" - PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-iconv.patch" + PATCHES "${CMAKE_CURRENT_LIST_DIR}/iconv.patch" ) vcpkg_configure_cmake( diff --git a/ports/exiv2/use-iconv.patch b/ports/exiv2/use-iconv.patch deleted file mode 100644 index 4305ec550e4..00000000000 --- a/ports/exiv2/use-iconv.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/config/FindIconv.cmake b/config/FindIconv.cmake -index 15a0e39..53718bf 100644 ---- a/config/FindIconv.cmake -+++ b/config/FindIconv.cmake -@@ -36,12 +36,13 @@ if(NOT ICONV_INCLUDE_DIR STREQUAL "ICONV_INCLUDE_DIR-NOTFOUND") - endif() - - if(NOT ICONV_IN_GLIBC) -- find_library(ICONV_LIBRARY NAMES iconv) -+ find_library(ICONV_LIBRARY NAMES iconv libiconv) - set(ICONV_TEST ${ICONV_LIBRARY}) - else() - set(ICONV_TEST "In glibc") - endif() - -+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY}) - check_cxx_source_compiles( - "#include -@@ -59,7 +60,8 @@ else(ICONV_FOUND) - set(ICONV_LIBRARIES) - endif(ICONV_FOUND) - --if(ICONV_FOUND) -+if(ICONV_FOUND) -+ set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) - check_cxx_source_compiles( - "#include -@@ -69,6 +71,7 @@ if(ICONV_FOUND) - }" - ICONV_ACCEPTS_NONCONST_INPUT) - -+ set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) - check_cxx_source_compiles( - "#include diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL index ba9d0f53b6f..ef3b552ace4 100644 --- a/ports/forest/CONTROL +++ b/ports/forest/CONTROL @@ -1,3 +1,3 @@ Source: forest -Version: 7.0.7 +Version: 8.0.1 Description: Template library of tree data structures diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake index c9975bbb038..ea1465bd3c3 100644 --- a/ports/forest/portfile.cmake +++ b/ports/forest/portfile.cmake @@ -3,13 +3,13 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xorz57/forest - REF 7.0.7 - SHA512 23488008d92736b4d1460cca95216918085071bf107356989158752faac14248a81a35e0acfd7e119895006304c0e3dda86174e551e87f588c62c1f264168d63 + REF 8.0.1 + SHA512 37ce3d623827be124c0c84c7b70af440a54b4e88a118cffa4a38156bfe66f9c1636c5b640cc6e7fde21702b51a03d5dfa56a349f1937b5a82a5085b4a05142cc HEAD_REF master ) # Handle headers -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h") +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forest RENAME copyright) diff --git a/ports/gdcm2/CONTROL b/ports/gdcm2/CONTROL index 45900dbab61..ddf669fb733 100644 --- a/ports/gdcm2/CONTROL +++ b/ports/gdcm2/CONTROL @@ -1,4 +1,4 @@ Source: gdcm2 -Version: 2.8.6 +Version: 2.8.7 Description: Grassroots DICOM library Build-Depends: zlib, expat diff --git a/ports/gdcm2/portfile.cmake b/ports/gdcm2/portfile.cmake index 65fa7a6e14e..bea1d6db31c 100644 --- a/ports/gdcm2/portfile.cmake +++ b/ports/gdcm2/portfile.cmake @@ -14,8 +14,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO malaterre/GDCM - REF v2.8.6 - SHA512 c04c131afae6a326978d82ea7c6f42eaa5d8e0f9d9dc3b6ad531a2d6ef7261e603cef32f364609ae99ff33f144373fe7bdd62056e535b6d487b0a4b13919062e + REF v2.8.7 + SHA512 06e58a201d2bf59273cd871d7fc7b858eaa1b02badcc1cdbd99aca6ff7d6b0b0199f2fe7ead935ff1edb9403d594e9d73ffaf4e388705e96c76d7eefa0b6c2ec ) vcpkg_apply_patches( diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index e6cf6a8e5e9..4cca37139f9 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,4 +1,4 @@ Source: harfbuzz -Version: 1.7.6-1 +Version: 1.8.0 Description: HarfBuzz OpenType text shaping engine Build-Depends: freetype, ragel, glib (windows) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 906e42d9530..f87acc7b33b 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO behdad/harfbuzz - REF 1.7.6 - SHA512 90b51475d532377fe1686264a40f4a5555fc024f6984c1e3c114d8f4662e0c7f4a13e6a95e35fd5b3c54d1bb1b3cb97840b23f5ec2c6a799da61db1614b0fce3 + REF 1.8.0 + SHA512 47066f029ac166a8ff4b6327cb4bafdcf183b50ff7ffa96430fe9ce68d8084d6970cb5fa4b01ce435af93fda3b8a2038cd5ffc4fc6f3123ec3653e6c03cf355c HEAD_REF master ) diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL index ff23cda3ecd..8dcf4cb61df 100644 --- a/ports/jsonnet/CONTROL +++ b/ports/jsonnet/CONTROL @@ -1,3 +1,3 @@ Source: jsonnet -Version: 2018-05-17 +Version: 2018-06-12 Description: Jsonnet - The data templating language diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 51a7118c29a..286a6a5d100 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/jsonnet - REF d0ef48c976d9b72992001507ed3055baf56c2ba9 - SHA512 ffa1a0da01dd770e3de37ffc78cc623efecd4e667de184116b8d9fdcc28ebb1fd2b09425d7f20c3f4dc2f3e4c8a637a1057eb7de0c41d042dce9941fcd593b0a + REF 80c9160b33503d2812ea807414f5a585168696d0 + SHA512 3cddf983bbfd9dc29c40106c472d01d420d3644dc8f1de3d5968ec91b5a8aaefa1b7c0789df335a8791ff155337a47260f646b068faf9c0fe60e2e15bd3d1c67 HEAD_REF master ) diff --git a/ports/lodepng/CONTROL b/ports/lodepng/CONTROL index 0f31c87fb71..38329ca9ea7 100644 --- a/ports/lodepng/CONTROL +++ b/ports/lodepng/CONTROL @@ -1,3 +1,3 @@ Source: lodepng -Version: 2018-05-17 +Version: 2018-06-12 Description: PNG encoder and decoder in C and C++ diff --git a/ports/lodepng/portfile.cmake b/ports/lodepng/portfile.cmake index 9b390b4ff27..495807fd7ab 100644 --- a/ports/lodepng/portfile.cmake +++ b/ports/lodepng/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lvandeve/lodepng - REF d03d7df9888aafb9c7f615895c34b05acf033908 - SHA512 a7139f839ad161075909611527645c75758959626fbb5d892dc1bfba8df2d4c3cfa86328de5534386e6053843727d2bc453fd439a2e329fd3be5d36d77903a0f + REF 9426bf43031a3b0c37bc0c19b97448f316f5cf7e + SHA512 2b6018f9bfa37ce8aebf476cab60e192e9cd58642f9aae58f42678e8f870f4f06f45791733fe0c5335bf7a3e980ee0f17eaee283525e910864fd8dca123ef879 HEAD_REF master ) diff --git a/ports/luasocket/CONTROL b/ports/luasocket/CONTROL index 3eeada1cac7..c46c2afd3de 100644 --- a/ports/luasocket/CONTROL +++ b/ports/luasocket/CONTROL @@ -1,4 +1,4 @@ Source: luasocket -Version: 2018-02-25 +Version: 2018-06-12 Description: LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet. Build-Depends: lua diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake index 831cd1b5e74..650e1ca2e6a 100644 --- a/ports/luasocket/portfile.cmake +++ b/ports/luasocket/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO diegonehab/luasocket - REF 652959890943c34d7180cae372339b91e62f0d7b - SHA512 8666e3dec0a3a0429e59a66c79b167f88b05a2a0b2c7f5456754cb5c505bcf8c39c4d358880a2f78a488ad07bee4e6e5b9a6a63c2affcee788091dee15ed2f6a + REF 4df569e9f867432f25f0bfbfa56b0962feb3326e + SHA512 ef4aa61f12822a6004096c422ba2ea4f109bee1cc2eb3847bd2b16f6ec2dd28b20a767bfd8b1ee73e355f7b0ced3c2f7c4cf5123e8d0472e25c193920c2d34a1 HEAD_REF master) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL index 68398fb19c5..d312deb6654 100644 --- a/ports/ms-gsl/CONTROL +++ b/ports/ms-gsl/CONTROL @@ -1,3 +1,3 @@ Source: ms-gsl -Version: 2018-05-17 +Version: 2018-06-12 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 0a3518a8ad1..065f32a4b1a 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 d6a2242d97827449f3f1c1c2e54214ceb9e80d62 - SHA512 d98d294e6560bc47f6b30fddf046be2a97bf9091c6e096c2c699db582d0322260c825c2357df2d2e55d017973c17798dd1d994931403534570789883f1d00321 + REF ffdaf0fb211d3a2920e480c7a8315cff98fe1b19 + SHA512 77af8ad24d15ecb1ef00bcfbea851e7f1b11a2a27ff9aedef400bd6faaa6b44b8a03f14e93a6d8beaa32b67cae0f7b2f3e63e9638998e360c99c0e287cfbd715 HEAD_REF master ) diff --git a/ports/mujs/CONTROL b/ports/mujs/CONTROL index bb9ab194f0b..ccd2d73d349 100644 --- a/ports/mujs/CONTROL +++ b/ports/mujs/CONTROL @@ -1,3 +1,3 @@ Source: mujs -Version: 2018-05-17 +Version: 2018-06-12 Description: An embeddable Javascript interpreter in C diff --git a/ports/mujs/portfile.cmake b/ports/mujs/portfile.cmake index 5724f459367..8dd0cfad88d 100644 --- a/ports/mujs/portfile.cmake +++ b/ports/mujs/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ccxvii/mujs - REF cbdf814ee25841ce2130e6d58b0ac607b508f045 - SHA512 7477d539c409985ca5849b7b7ef5f0dfd974f850b763bdbb1024faeda82a01eefdeb94ca6f7505f234e1670017d9e68b8d5de68f34124a83528b99301c02f03f + REF 34cb61711fe29934dfa82ab55ea59ed85ae62642 + SHA512 7b813f0f081b68b2582dac31abdd0c0cbb7f9ceaa83510682319faf3e55f67d6fff27b4b10b6a8be5e9d1bc267e480b5937013e7ee06baa8aecec7c37e86ac69 HEAD_REF master ) diff --git a/ports/nuklear/CONTROL b/ports/nuklear/CONTROL index ffc589cb1fb..bd44594c2bd 100644 --- a/ports/nuklear/CONTROL +++ b/ports/nuklear/CONTROL @@ -1,3 +1,3 @@ Source: nuklear -Version: 2018-05-17 +Version: 2018-06-12 Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake index 9ad603d7b75..c1c1ddd6553 100644 --- a/ports/nuklear/portfile.cmake +++ b/ports/nuklear/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vurtun/nuklear - REF b1209dbb2e087dacb1d5224c3f85675cabbe2330 - SHA512 940730caf6f3732c7846feaf48d3a91538985bc9f0c3b2fea66e395c99c1ca0c6252829152cac3d58dc04d39da19a9aa9b4d9134a6cd1a4ed2594931e22e0461 + REF f42a76e1763117420dac08496151ec4935217a62 + SHA512 ac82026dd79c73bba4f86b6c6889c64b8da88179fb4a92c80c824c5c41652a01eb181d6de23fb4eeb90e0bfc293cae0e760c2f8061920a2d27da1383354a375f HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index 2639d87e9a7..3e9fecc495d 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -1,4 +1,4 @@ Source: openimageio -Version: Release-1.9.2dev +Version: Release-1.8.12 Description: A library for reading and writing images, and a bunch of related classes, utilities, and application Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 83d139f0331..29eb55866f4 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF Release-1.9.2dev - SHA512 11293f09189f26a68e2e899e15081644c17f6ad1be070d090d9df133b98f7f30a09344a2b599c8b82dc8daba64847a9dfa278f9857bc110e975e9e06c3a2fa6f + REF Release-1.8.12 + SHA512 2475792ff475d34b47b6af5ca71c6cf6d9d8c60452a506b1bf740b9dbb20ea72109117dc9a531b8302095de99f6280172723f26e23dc6e038256cbb43b697145 HEAD_REF master ) diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index a2747e3f517..d5925e20a7c 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 5.13.1 +Version: 5.13.3 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 1e2720b5158..b18a6f1a0f9 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.13.1 - SHA512 70942aecb4decbe79a92cf3122c4d5d3232572084e2b018a911ce7149783c8047dbd338911644b7f3b6fc795fdd5f2971f75a8c5e4502f0765d6de0045bc970c + REF v5.13.3 + SHA512 23b4d6f1f3484243c6334866c4e1fb41d75ad28d289cbbb8a56f002c801ec207eb321ac6a47b3511a1ad007325185161ad15d4f62aceeb98f5b728e30d998440 HEAD_REF master ) diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 1bb6b3ebfd9..f6ba84ed7e7 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,4 +1,4 @@ Source: spdlog -Version: 0.16.3 +Version: 0.17.0 Description: Very fast, header only, C++ logging library Build-Depends: fmt diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index a7d13527e5e..ec1d82f3915 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v0.16.3 - SHA512 6e08473825cf97dfb10b0e919b77996c1023bbfb583d851e961ec4a95094e4afffd1fc6f6e7e728ce8c2c69c9fb280c59f8d6494b50224bdf8cc68914ffd21e8 + REF v0.17.0 + SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef HEAD_REF master ) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 0e19d650bff..94c8d53645c 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 2018_U3 +Version: 2018_U4 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 4a0b80ec489..9519d7b12d2 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -10,8 +10,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO 01org/tbb - REF 633b01ad27e012e1dc4e392c3230250d1f4967a4 - SHA512 5576b5e1efa0c7938dc08a1a9503ea19234b20f6a742f3d13a8de19b47f5bdafa1bb855e4de022a4b096a429e66739599a198fdf687c167c659f7556235fa01f + REF 2018_U4 + SHA512 1903bf68f428f99e1d309f4d094c579f23504967c42a95d033fa7e9eeb15bd9da239a6670cb5ad13a08c29509dbffe4eec9117db109a86a1444f947865bb9d89 HEAD_REF tbb_2018) if(TRIPLET_SYSTEM_ARCH STREQUAL x86)