From 3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 10 Jun 2019 17:01:54 -0700 Subject: [PATCH] [many ports] Updates 2019.05.24 (#6618) * [many ports] Updates 2019.05.24 * Update SHA512 and resolve conflict for ebml and matroska * [avro-c]Fix build error caused by jansson upgrades. * [xxhash]Update to the next version to fix build error.(xxhash issue:#179) * Fix failures and undo asio * [libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches * Update REF * Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes * [flann, fastcdr] Fix old patches and build error. * [flann, fastcdr] Fix build error. * Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common libopusenc arb taglib changes * [dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Update old patches and fix build error. * fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flann libffi * fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbuffers * undo libmupdf forge kd-soap qca * [mosquitto] Fix installation of import libs * [arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebml] Revert trivial/undesired changes * [fastcdr] Minimize patch * [many ports] Revert trivial changes * [libyaml] Switch to non-dist tag * [sqlite-modern-cpp] Track master due to infrequent release * [nano-signal-slot] Revert downgrade * [openvpn3] Bump control version to account for portfile change * [sqlite-modern-cpp] Fixup wrong hash * [mosquitto] Commit missing patch --- ports/avro-c/CONTROL | 2 +- ports/avro-c/fix-build-error.patch | 20 ++++ ports/avro-c/portfile.cmake | 10 +- ports/cppcms/CONTROL | 2 +- ports/cppcms/portfile.cmake | 8 +- ports/dcmtk/CONTROL | 2 +- ports/dcmtk/dcmtk.patch | 19 +-- ports/dcmtk/portfile.cmake | 4 +- ports/ensmallen/CONTROL | 3 +- ports/ensmallen/portfile.cmake | 4 +- ports/fastcdr/CONTROL | 2 +- ports/fastcdr/install-cmake.patch | 31 ++--- ports/fastcdr/portfile.cmake | 13 +-- ports/fizz/CONTROL | 2 +- ports/fizz/portfile.cmake | 4 +- ports/folly/CONTROL | 2 +- ports/folly/portfile.cmake | 4 +- .../0001-fix-building-DLL-on-Windows.patch | 26 ----- ports/ftgl/CONTROL | 2 +- ports/ftgl/Fix-headersFilePath.patch | 23 ++++ ports/ftgl/portfile.cmake | 7 +- ports/gherkin-c/CONTROL | 2 +- ports/gherkin-c/portfile.cmake | 4 +- ports/grpc/00003-undef-base64-macro.patch | 26 ++--- ports/grpc/CONTROL | 2 +- ports/grpc/portfile.cmake | 4 +- ports/inih/CONTROL | 2 +- ports/inih/portfile.cmake | 4 +- ports/ismrmrd/CONTROL | 2 +- ports/ismrmrd/portfile.cmake | 4 +- ports/jansson/CONTROL | 2 +- ports/jansson/portfile.cmake | 4 +- ports/libgit2/CONTROL | 2 +- ports/libgit2/portfile.cmake | 4 +- ports/libics/CONTROL | 2 +- ports/libics/portfile.cmake | 4 +- ports/libimobiledevice/CONTROL | 2 +- ports/libimobiledevice/portfile.cmake | 4 +- ports/libplist/CONTROL | 2 +- ports/libplist/portfile.cmake | 8 +- ports/libqglviewer/CONTROL | 2 +- ports/libqglviewer/portfile.cmake | 4 +- ports/librabbitmq/portfile.cmake | 4 +- ports/libunibreak/CONTROL | 2 +- ports/libunibreak/portfile.cmake | 4 +- ports/libusbmuxd/CONTROL | 2 +- ports/libusbmuxd/portfile.cmake | 7 +- ports/libuv/CONTROL | 2 +- ports/libuv/portfile.cmake | 4 +- ports/libyaml/0001-fix-version.patch | 15 --- ports/libyaml/CONTROL | 2 +- ports/libyaml/portfile.cmake | 7 +- ports/miniz/CMakeLists-targets.patch | 109 +++++++++--------- ports/miniz/CONTROL | 2 +- ports/miniz/portfile.cmake | 4 +- ports/mosquitto/CONTROL | 2 +- ports/mosquitto/archive-dest.patch | 13 +++ ports/mosquitto/output_folders-cmake.patch | 54 --------- ports/mosquitto/portfile.cmake | 7 +- ports/mosquitto/win64-cmake.patch | 48 ++++---- ports/nmslib/CONTROL | 2 +- ports/nmslib/fix-headers.patch | 16 +-- ports/nmslib/portfile.cmake | 6 +- ports/ogre/001-cmake-install-dir.patch | 8 +- ports/ogre/CONTROL | 2 +- ports/ogre/portfile.cmake | 4 +- ports/openvpn3/CMakeLists.txt | 4 + ports/openvpn3/CONTROL | 2 +- ports/openvr/CONTROL | 2 +- ports/openvr/portfile.cmake | 4 +- ports/pdcurses/CONTROL | 2 +- ports/pdcurses/portfile.cmake | 6 +- ports/robin-map/CONTROL | 2 +- ports/robin-map/portfile.cmake | 6 +- ports/snowhouse/CONTROL | 2 +- ports/snowhouse/portfile.cmake | 6 +- ports/sol2/CONTROL | 2 +- ports/sol2/portfile.cmake | 4 +- ports/sqlite-modern-cpp/CONTROL | 2 +- ports/sqlite-modern-cpp/portfile.cmake | 6 +- .../0001-Find-external-sqlite3.patch | 40 +++---- ports/sqlitecpp/CONTROL | 2 +- ports/sqlitecpp/portfile.cmake | 5 +- ports/strict-variant/CONTROL | 2 +- ports/strict-variant/portfile.cmake | 4 +- ports/tbb/CONTROL | 2 +- ports/tbb/portfile.cmake | 6 +- ports/tinyobjloader/CONTROL | 2 +- ports/tinyobjloader/portfile.cmake | 4 +- ports/urdfdom-headers/CONTROL | 2 +- ports/urdfdom-headers/portfile.cmake | 4 +- ports/uvatlas/CONTROL | 2 +- ports/uvatlas/portfile.cmake | 8 +- ports/wangle/CONTROL | 2 +- ports/wangle/portfile.cmake | 4 +- ports/xeus/CONTROL | 2 +- ports/xeus/portfile.cmake | 4 +- ports/xmsh/portfile.cmake | 2 +- 98 files changed, 352 insertions(+), 401 deletions(-) create mode 100644 ports/avro-c/fix-build-error.patch delete mode 100644 ports/ftgl/0001-fix-building-DLL-on-Windows.patch create mode 100644 ports/ftgl/Fix-headersFilePath.patch delete mode 100644 ports/libyaml/0001-fix-version.patch create mode 100644 ports/mosquitto/archive-dest.patch delete mode 100644 ports/mosquitto/output_folders-cmake.patch diff --git a/ports/avro-c/CONTROL b/ports/avro-c/CONTROL index 5bcf16fe5..527090f0d 100644 --- a/ports/avro-c/CONTROL +++ b/ports/avro-c/CONTROL @@ -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 diff --git a/ports/avro-c/fix-build-error.patch b/ports/avro-c/fix-build-error.patch new file mode 100644 index 000000000..6e07310fa --- /dev/null +++ b/ports/avro-c/fix-build-error.patch @@ -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}) diff --git a/ports/avro-c/portfile.cmake b/ports/avro-c/portfile.cmake index d868738df..ee0b6f7ca 100644 --- a/ports/avro-c/portfile.cmake +++ b/ports/avro-c/portfile.cmake @@ -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 diff --git a/ports/cppcms/CONTROL b/ports/cppcms/CONTROL index f33c94ed9..b2db0ffa1 100644 --- a/ports/cppcms/CONTROL +++ b/ports/cppcms/CONTROL @@ -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 diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index c9ccca85b..e6c6cfa2a 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -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) @@ -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) diff --git a/ports/dcmtk/CONTROL b/ports/dcmtk/CONTROL index ab248db1c..ad087563d 100644 --- a/ports/dcmtk/CONTROL +++ b/ports/dcmtk/CONTROL @@ -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. diff --git a/ports/dcmtk/dcmtk.patch b/ports/dcmtk/dcmtk.patch index c25a8db7b..cca14e28e 100644 --- a/ports/dcmtk/dcmtk.patch +++ b/ports/dcmtk/dcmtk.patch @@ -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() #----------------------------------------------------------------------------- diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index d11878a0e..cdf9b73e6 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -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 ) diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL index 9e0245aa9..024a7617b 100644 --- a/ports/ensmallen/CONTROL +++ b/ports/ensmallen/CONTROL @@ -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 + diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake index e98be1863..edded904a 100644 --- a/ports/ensmallen/portfile.cmake +++ b/ports/ensmallen/portfile.cmake @@ -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 diff --git a/ports/fastcdr/CONTROL b/ports/fastcdr/CONTROL index 9076962c7..4d3dc062c 100644 --- a/ports/fastcdr/CONTROL +++ b/ports/fastcdr/CONTROL @@ -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. diff --git a/ports/fastcdr/install-cmake.patch b/ports/fastcdr/install-cmake.patch index 0eff05063..04296897b 100644 --- a/ports/fastcdr/install-cmake.patch +++ b/ports/fastcdr/install-cmake.patch @@ -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/ diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake index c3b6967d9..f4f2f81f0 100644 --- a/ports/fastcdr/portfile.cmake +++ b/ports/fastcdr/portfile.cmake @@ -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 ) @@ -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}") diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL index b5c027cda..4f4856c47 100644 --- a/ports/fizz/CONTROL +++ b/ports/fizz/CONTROL @@ -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 diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 3ebe020a9..0eb0f81bf 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -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 ) diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 1d673877f..c466edebb 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -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 diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index e77c084f6..7e7f40565 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -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 diff --git a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch b/ports/ftgl/0001-fix-building-DLL-on-Windows.patch deleted file mode 100644 index e9b8c52a5..000000000 --- a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 index 2abfa8778..b8e652144 100644 --- a/ports/ftgl/CONTROL +++ b/ports/ftgl/CONTROL @@ -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. diff --git a/ports/ftgl/Fix-headersFilePath.patch b/ports/ftgl/Fix-headersFilePath.patch new file mode 100644 index 000000000..f3459352a --- /dev/null +++ b/ports/ftgl/Fix-headersFilePath.patch @@ -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 diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake index a8878af0f..65df89b20 100644 --- a/ports/ftgl/portfile.cmake +++ b/ports/ftgl/portfile.cmake @@ -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( diff --git a/ports/gherkin-c/CONTROL b/ports/gherkin-c/CONTROL index 171dedae0..b25786ca3 100644 --- a/ports/gherkin-c/CONTROL +++ b/ports/gherkin-c/CONTROL @@ -1,3 +1,3 @@ Source: gherkin-c -Version: c-libs-e63e83104b +Version: 4.1.2 Description: Gherkin parser/compiler in C diff --git a/ports/gherkin-c/portfile.cmake b/ports/gherkin-c/portfile.cmake index f229ba836..453387f5f 100644 --- a/ports/gherkin-c/portfile.cmake +++ b/ports/gherkin-c/portfile.cmake @@ -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 ) diff --git a/ports/grpc/00003-undef-base64-macro.patch b/ports/grpc/00003-undef-base64-macro.patch index 8417e3eea..193b1fd38 100644 --- a/ports/grpc/00003-undef-base64-macro.patch +++ b/ports/grpc/00003-undef-base64-macro.patch @@ -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; diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index c2ce84cc2..4c73364c5 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -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 diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index e8576d533..e97082ede 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -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 diff --git a/ports/inih/CONTROL b/ports/inih/CONTROL index 22721b8ae..22c519e21 100644 --- a/ports/inih/CONTROL +++ b/ports/inih/CONTROL @@ -1,3 +1,3 @@ Source: inih -Version: 43 +Version: 44 Description: Simple .INI file parser diff --git a/ports/inih/portfile.cmake b/ports/inih/portfile.cmake index 75e538ae3..a0a34d77f 100644 --- a/ports/inih/portfile.cmake +++ b/ports/inih/portfile.cmake @@ -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 ) diff --git a/ports/ismrmrd/CONTROL b/ports/ismrmrd/CONTROL index 3725293f7..7f7c26ef7 100644 --- a/ports/ismrmrd/CONTROL +++ b/ports/ismrmrd/CONTROL @@ -1,4 +1,4 @@ Source: ismrmrd -Version: 1.4 +Version: 1.4.0 Description: ISMRM Raw Data Format Build-Depends: pugixml, hdf5 diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake index 2422752ea..7427cb1b2 100644 --- a/ports/ismrmrd/portfile.cmake +++ b/ports/ismrmrd/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ismrmrd/ismrmrd - REF 0d05ad0cf0b09adb975566ff6a817a01d69f4325 - SHA512 7127658c3339ca3022a61093fb037aa02ac0cec4885e03657935dc41bc7266e74b437108cd0a9455c91bc74bdbb6e3a182752effca3564a36d3ddc29d3972496 + REF 4d4004d91ccadd41ddb30b019f970a69bb23a1bc + SHA512 648901de4629c8b11574894763a5fa61a3cb0420c5aa62cdff02c4641ba702ca73efba12b403076301e44a4f0a7c915da1f2c7a34b24377d0385af92f2eda892 HEAD_REF master PATCHES ${WIN32_INCLUDE_STDDEF} diff --git a/ports/jansson/CONTROL b/ports/jansson/CONTROL index 6050b464d..ec808a999 100644 --- a/ports/jansson/CONTROL +++ b/ports/jansson/CONTROL @@ -1,3 +1,3 @@ Source: jansson -Version: 2.11-2 +Version: 2.12 Description: Jansson is a C library for encoding, decoding and manipulating JSON data diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake index e243422fb..b6f3caef0 100644 --- a/ports/jansson/portfile.cmake +++ b/ports/jansson/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO akheron/jansson - REF v2.11 - SHA512 5dd94951e1aedd3f3a9ab6a43170d2395ec70c5a00e6da58538816b2dcd98835fc4ca43ab1e9b78864c01e48075505573f4f8d1da5c9d2c094622518d19525e8 + REF 71c4e8ec215afa225ac20eed269a14963cd37b50 + SHA512 cdb955996768d6c7ed15b9f1bb7ddf4905f881c4e604d9e7a863f42c513eaaa9fb8799dacfa392424fbf725aac125d4716e10c44c3415449b5c5edd38a87b290 HEAD_REF master ) diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL index 55a90bea5..71ba1a4c9 100644 --- a/ports/libgit2/CONTROL +++ b/ports/libgit2/CONTROL @@ -1,4 +1,4 @@ Source: libgit2 -Version: 0.28.1 +Version: 0.28.2 Build-Depends: openssl (!windows&&!uwp) Description: Git linkable library diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 3516788b7..711da201e 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -8,8 +8,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgit2/libgit2 - REF v0.28.1 - SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647 + REF b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3 + SHA512 2a992759c0892300eff6d4e823367e2cfc5bcaa6e37a0e87de45a16393c53ccd286f47f37d38c104e79eed8688b9834ada00000b2d6894f89773f75c83e23022 HEAD_REF master ) diff --git a/ports/libics/CONTROL b/ports/libics/CONTROL index 5f98c9614..115540291 100644 --- a/ports/libics/CONTROL +++ b/ports/libics/CONTROL @@ -1,3 +1,3 @@ Source: libics -Version: 1.6.2 +Version: 1.6.3 Description: Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject. \ No newline at end of file diff --git a/ports/libics/portfile.cmake b/ports/libics/portfile.cmake index 9bcf997ed..f0d27363a 100644 --- a/ports/libics/portfile.cmake +++ b/ports/libics/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO svi-opensource/libics - REF 8d8d2dbe72450cbaf88080b6c0e24a7a4a58009e - SHA512 739668b4d51ddb67d50ed1d41bd6965b90b5e4eafc7ec19e2f1d668f48af6e237f6a1872673e3fec5888efe94c2b321295c4de9502aba1f677fc6d0e0399c141 + REF b9532b738ad7f17569dfcaae74eb53d3c2959394 + SHA512 a7c0d89125570021494feaf0a187e3a1695e92c85a03d59ac9729618cdddb2ae13af94e4ce93241acbbb9d28465f75297bf03f2c46061bb7a0bba7ec28a23da4 HEAD_REF master PATCHES cmakelists.patch diff --git a/ports/libimobiledevice/CONTROL b/ports/libimobiledevice/CONTROL index b6d3c2960..0a6a21bf8 100644 --- a/ports/libimobiledevice/CONTROL +++ b/ports/libimobiledevice/CONTROL @@ -1,4 +1,4 @@ Source: libimobiledevice -Version: 1.2.1.215-1 +Version: 1.2.76 Description: A cross-platform protocol library to communicate with iOS devices Build-Depends: libplist, libusbmuxd, openssl, dirent, getopt \ No newline at end of file diff --git a/ports/libimobiledevice/portfile.cmake b/ports/libimobiledevice/portfile.cmake index 4bc505163..f91cad8cc 100644 --- a/ports/libimobiledevice/portfile.cmake +++ b/ports/libimobiledevice/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libimobiledevice - REF 1.2.1.215 - SHA512 192ac12eb4fdf518a934cb8061d4a40e48f483e969e34167f2a5346efac1d745e4041eff84d7175d106b1a3b3f806d5e69643daa1459e48e69bc9c38d722be3c + REF d6b24aae971b990d2777a88ec3a1e31b40d6152f + SHA512 75e45162fecd80464846ff51c9b3e722017f738de8f6b55e9f41f5eadcd93730b12512087d427badbc0c2b54a76a66359a472ab5bc5be5fa02826db1171565d0 HEAD_REF msvc-master ) diff --git a/ports/libplist/CONTROL b/ports/libplist/CONTROL index bb7db384c..9189b4f48 100644 --- a/ports/libplist/CONTROL +++ b/ports/libplist/CONTROL @@ -1,3 +1,3 @@ Source: libplist -Version: 2.0.1.197-2 +Version: 1.2.77 Description: A library to handle Apple Property List format in binary or XML diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake index 51549e4ca..5b6ce749c 100644 --- a/ports/libplist/portfile.cmake +++ b/ports/libplist/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libplist - REF 2.0.1.197 - SHA512 55e1817c61d608b11646eb9c28c445f9ee801c7beb2121bd810235561117262adb73dbecb23b9ef5b0c54b0fc8089e0a46acc0e8f4845329a50a663ab004052c + REF f279ef534ab5adeb81f063dee5e8a8fc3ca6d3ab + SHA512 52001a46935693e3ac5f0b8c3d13d9bf51c5f34189f6f006bd697d7e965f402460060708c4fb54ed43f49a217ac442fcb8dca252fcbccd3e6a154b6c9a8c2104 HEAD_REF msvc-master PATCHES dllexport.patch ) @@ -21,3 +21,7 @@ vcpkg_install_msbuild( LICENSE_SUBPATH COPYING.lesser REMOVE_ROOT_INCLUDES ) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() \ No newline at end of file diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL index c9e66ef18..add042b7e 100644 --- a/ports/libqglviewer/CONTROL +++ b/ports/libqglviewer/CONTROL @@ -1,4 +1,4 @@ Source: libqglviewer -Version: 2.7.1-1 +Version: 2.7.0 Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers. Build-Depends: qt5-base diff --git a/ports/libqglviewer/portfile.cmake b/ports/libqglviewer/portfile.cmake index f57092521..7a7cc9fdf 100644 --- a/ports/libqglviewer/portfile.cmake +++ b/ports/libqglviewer/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GillesDebunne/libQGLViewer - REF 28a23f14997dc2e08990b884c07075b48979cac7 - SHA512 58058543e07857f8b1480301b72f789290eee2d65382bee29773bcc1e3f45cedcee33b762bdb870b6cae8a0daab38ebdecde40e2f02720cf0f6fcf10f2007f25 + REF 781d914c003466b342b45d19266a9613fc0e7e0e + SHA512 0586020c159fa4b3acb3ea3fa0a361bcc757d840298d7a436c356d0929b5ace3da4d054e3c0d107a499076413336e3b9a2f35750e6bf0add9320cc52a5c7afd5 HEAD_REF master PATCHES "use-default-config-on-all-platforms.patch" ) diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index 02ca27c8d..79463c26c 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alanxz/rabbitmq-c - REF v0.9.0 - SHA512 a63fe267a3ec112a5e9456a03066132b91f897181947fba18ea3efb14ca0a69996d7dfaecda61a0dd360e03a4e56569e70592e1674b75d20b937a118e1acfc64 + REF 77e3805d1662034339c3c19bcdaaa62a56c1fa7e + SHA512 f20a841d184a2448b12c59b551ac5f1bf70a4cc0e0226fe803bab64bd6e26be5f275fb36717b3abb614e88212668cb87de5f9f749fc17ff565b2fe15f66c090e HEAD_REF master PATCHES fix-uwpwarning.patch diff --git a/ports/libunibreak/CONTROL b/ports/libunibreak/CONTROL index 26fc64c37..76f9b3432 100644 --- a/ports/libunibreak/CONTROL +++ b/ports/libunibreak/CONTROL @@ -1,3 +1,3 @@ Source: libunibreak -Version: 4.1 +Version: 4.2 Description: an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information. diff --git a/ports/libunibreak/portfile.cmake b/ports/libunibreak/portfile.cmake index 29e5a4fc0..c054ce685 100644 --- a/ports/libunibreak/portfile.cmake +++ b/ports/libunibreak/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adah1972/libunibreak - REF libunibreak_4_1 - SHA512 9dea703a9c969f58944817cf014f27b2e9c373dff1b26cbc7d2539a1797e61480893841cf3c7398870be7ddd974a899c8d60b07a238e343a698c17e9e4ba7a10 + REF 15b579aac410b7c11ba596f4a9abbf405a187e34 + SHA512 a46196ad276134dad19fbc4ad49a2f4a4563137e30657b0f06cee9e6b4dab803723ae270f9682c4b8245c9d10297ce44b7bfb08bfa16894552cdb916fc758c02 HEAD_REF master ) diff --git a/ports/libusbmuxd/CONTROL b/ports/libusbmuxd/CONTROL index 3773d17f9..05faa6a1c 100644 --- a/ports/libusbmuxd/CONTROL +++ b/ports/libusbmuxd/CONTROL @@ -1,4 +1,4 @@ Source: libusbmuxd -Version: 1.0.107-2 +Version: 1.2.77 Description: A client library to multiplex connections from and to iOS devices Build-Depends: libplist diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake index c4d338b19..9a03b5e53 100644 --- a/ports/libusbmuxd/portfile.cmake +++ b/ports/libusbmuxd/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libusbmuxd - REF 1.0.109 - SHA512 104205ebcac96765f4bf0b42dbe5df084be4f87fc64454b4e02049fbd18caf9282d070f8949935977eda76fba68b6a909571afea58d4ad4091f02d0e6b7a08e0 + REF a4422aa65f3635d99c3b80fad18f093ef3c5f653 + SHA512 9446bbcd6b901e6183f6e86d7fe7301c01182ae5b9330182fbca529bb1db54250cd6012256a420d457a7243388811c94bb2ecf5a0747238714d00b3850e60e8e HEAD_REF msvc-master PATCHES dllexport.patch ) @@ -24,3 +24,6 @@ vcpkg_install_msbuild( ) file(REMOVE "${CURRENT_PACKAGES_DIR}/include/Makefile.am") +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() \ No newline at end of file diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL index 0066853b2..79033b5a0 100644 --- a/ports/libuv/CONTROL +++ b/ports/libuv/CONTROL @@ -1,3 +1,3 @@ Source: libuv -Version: 1.29.0 +Version: 1.29.1 Description: libuv is a multi-platform support library with a focus on asynchronous I/O. diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index b95d4f295..ba7cdfeb0 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF v1.29.0 - SHA512 19f1f25ffdb287a755f773488e3da5fd5b5b43c333e3dfb019bbac430ccd77456da96dbf60c38b97c87880f90f08438366e29bbcc8d81a28f777f39fca8af529 + REF d16e6094e1eb3b0b5981ef1dd7e03ec4d466944d + SHA512 338d25fec26ab69d300141086de825edabc5e65c50b6d9cf0e2f8f1937a930e4ecf4460ba2789cef64a85ad4a63c9b5f2a482ee2498c542f73e5915bbff6170f HEAD_REF v1.x ) diff --git a/ports/libyaml/0001-fix-version.patch b/ports/libyaml/0001-fix-version.patch deleted file mode 100644 index c2a59d30f..000000000 --- a/ports/libyaml/0001-fix-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1abdd77..60a6b44 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.0) - project (yaml C) - - set (YAML_VERSION_MAJOR 0) --set (YAML_VERSION_MINOR 1) --set (YAML_VERSION_PATCH 7) -+set (YAML_VERSION_MINOR 2) -+set (YAML_VERSION_PATCH 1) - set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}") - - option(BUILD_SHARED_LIBS "Build libyaml as a shared library" OFF) diff --git a/ports/libyaml/CONTROL b/ports/libyaml/CONTROL index 1c770b2b9..df8b2b1fe 100644 --- a/ports/libyaml/CONTROL +++ b/ports/libyaml/CONTROL @@ -1,3 +1,3 @@ Source: libyaml -Version: 0.2.1-1 +Version: 0.2.2 Description: A C library for parsing and emitting YAML. diff --git a/ports/libyaml/portfile.cmake b/ports/libyaml/portfile.cmake index 047692719..210fc2d7f 100644 --- a/ports/libyaml/portfile.cmake +++ b/ports/libyaml/portfile.cmake @@ -3,15 +3,16 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yaml/libyaml - REF 0.2.1 - SHA512 8b91738183a6d81c2c0381b4279cff9d8f811dac643ce5e08aa869058f5653ad8a2d9d8f9e563b26ad75b617b80b10ccb32753984a50ed684529a90bdd248bff + REF 0.2.2 + SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06 HEAD_REF master - PATCHES 0001-fix-version.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() diff --git a/ports/miniz/CMakeLists-targets.patch b/ports/miniz/CMakeLists-targets.patch index 3b4c70468..c9d32e479 100644 --- a/ports/miniz/CMakeLists-targets.patch +++ b/ports/miniz/CMakeLists-targets.patch @@ -1,54 +1,55 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7dd6309..eaf160f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,12 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "") - CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) - endif () - --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) -- - set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c) - --add_library(miniz ${miniz_SOURCE}) -+add_library(miniz STATIC ${miniz_SOURCE}) -+target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS) - -+if(FALSE) - set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c") - set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c") - set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c") -@@ -41,12 +41,28 @@ if(${UNIX}) - target_link_libraries(example6 m) - endif() - -+target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS) -+ - # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST}) - # target_link_libraries(miniz_tester miniz) -+endif() - --install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib -+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+export(TARGETS ${PROJECT_NAME} -+ NAMESPACE miniz:: -+ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" -+) -+install(EXPORT ${PROJECT_NAME}Config -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz" -+ NAMESPACE miniz:: -+) - file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) --install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME}) -\ No newline at end of file -+install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f3e453a..094a4e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,13 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "") + CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) + endif () + +-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) +- + set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c) + +-add_library(miniz ${miniz_SOURCE}) +-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") +- ++add_library(miniz STATIC ${miniz_SOURCE}) ++target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS) ++ ++if(FALSE) + set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c") + set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c") + set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c") +@@ -41,12 +40,28 @@ if(${UNIX}) + target_link_libraries(example6 m) + endif() + ++target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS) ++target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS) ++ + # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST}) + # target_link_libraries(miniz_tester miniz) ++endif() + +-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++export(TARGETS ${PROJECT_NAME} ++ NAMESPACE miniz:: ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" ++) ++install(EXPORT ${PROJECT_NAME}Config ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz" ++ NAMESPACE miniz:: ++) + file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) + install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME}) +\ No newline at end of file diff --git a/ports/miniz/CONTROL b/ports/miniz/CONTROL index 51a370a80..88eacdb85 100644 --- a/ports/miniz/CONTROL +++ b/ports/miniz/CONTROL @@ -1,3 +1,3 @@ Source: miniz -Version: 2.0.8 +Version: 2.1.0 Description: Single C source file zlib-replacement library diff --git a/ports/miniz/portfile.cmake b/ports/miniz/portfile.cmake index 9c67ea8c9..4de2dc3f3 100644 --- a/ports/miniz/portfile.cmake +++ b/ports/miniz/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO richgel999/miniz - REF 2.0.8 - SHA512 84b480df8bff63422d8c36cef3741f9b9f3dce13babf4de6cb4d575209978ad849357cc72bcf31ee8b6c5da6853ed2e5eddbbe16fecd689afd7028e834abf7e9 + REF a4264837ae37384b1d7a205a6732db322f0f3769 + SHA512 88f0e03cccfe66c796db7594b93c667bd52cd7f4d13803181e9d86b4aa26f214fd2907a45a752da603d3e87f8d53c40bfc0956b279c0d49016f7b943aeb9cd33 HEAD_REF master PATCHES CMakeLists-targets.patch diff --git a/ports/mosquitto/CONTROL b/ports/mosquitto/CONTROL index 0ecf25b21..1a72c19fc 100644 --- a/ports/mosquitto/CONTROL +++ b/ports/mosquitto/CONTROL @@ -1,5 +1,5 @@ Source: mosquitto -Version: 1.5.0-3 +Version: 1.6.2-2 Build-Depends: c-ares, libwebsockets, openssl, pthreads Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino. diff --git a/ports/mosquitto/archive-dest.patch b/ports/mosquitto/archive-dest.patch new file mode 100644 index 000000000..11a9ccce4 --- /dev/null +++ b/ports/mosquitto/archive-dest.patch @@ -0,0 +1,13 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 221c230..1bd4e96 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -89,7 +89,7 @@ set_target_properties(libmosquitto PROPERTIES + SOVERSION 1 + ) + +-install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + + if (WITH_STATIC_LIBRARIES) + add_library(libmosquitto_static STATIC ${C_SRC}) diff --git a/ports/mosquitto/output_folders-cmake.patch b/ports/mosquitto/output_folders-cmake.patch deleted file mode 100644 index 5b1c60eb6..000000000 --- a/ports/mosquitto/output_folders-cmake.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e1d631e..e95d7fb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,10 +16,10 @@ set (VERSION 1.5.0) - add_definitions (-DCMAKE -DVERSION=\"${VERSION}\") - - if (WIN32) -- set (BINDIR .) -- set (SBINDIR .) -+ set (BINDIR bin) -+ set (SBINDIR bin) - set (SYSCONFDIR .) -- set (LIBDIR .) -+ set (LIBDIR lib) - set (INCLUDEDIR include) - set (DATAROOTDIR share) - set (MANDIR man) -@@ -90,7 +90,7 @@ endif (${DOCUMENTATION} STREQUAL ON) - # Install config file - # ======================================== - --install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}") -+#install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}") - - - # ======================================== -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 272b60a..c180067 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -104,7 +104,7 @@ set_target_properties(libmosquitto PROPERTIES - SOVERSION 1 - ) - --install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}") -+install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}" ARCHIVE DESTINATION "${LIBDIR}") - - if (${WITH_STATIC_LIBRARIES} STREQUAL ON) - add_library(libmosquitto_static STATIC ${C_SRC}) -diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt -index 5e4f08e..a8cc6be 100644 ---- a/lib/cpp/CMakeLists.txt -+++ b/lib/cpp/CMakeLists.txt -@@ -13,7 +13,7 @@ set_target_properties(mosquittopp PROPERTIES - VERSION ${VERSION} - SOVERSION 1 - ) --install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}") -+install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}" ARCHIVE DESTINATION "${LIBDIR}") - - if (${WITH_STATIC_LIBRARIES} STREQUAL ON) - add_library(mosquittopp_static STATIC - diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index 92a8988d4..f3b2f9715 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -5,12 +5,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/mosquitto - REF v1.5 - SHA512 f6a5c8e71d642ef931176fe428fb79353933facc2db226d9e55b87d4ff9bd6610a1bd05d71159e30c8afb1fda542d233630ae164770e652baa7ea51117211489 + REF f825d4bb5e9f4fc5dc62ad09f895c87800d0f579 + SHA512 cd94236d5673f7e5a992d1e866afe2ccb496dfb7cc24e53808caed603bc8e899ca12857a16eac58ac7ab7235a849b6e2528c55e0debf651ef76dcebef75e7df9 HEAD_REF master PATCHES + archive-dest.patch win64-cmake.patch - output_folders-cmake.patch ) vcpkg_configure_cmake( @@ -38,6 +38,7 @@ file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) file(REMOVE ${EXE}) file(REMOVE ${DEBUG_EXE}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mosquitto RENAME copyright) diff --git a/ports/mosquitto/win64-cmake.patch b/ports/mosquitto/win64-cmake.patch index 360bf006b..9105c403f 100644 --- a/ports/mosquitto/win64-cmake.patch +++ b/ports/mosquitto/win64-cmake.patch @@ -1,22 +1,9 @@ -diff --git a/config.h b/config.h -index 906fad4..d5b2a72 100644 ---- a/config.h -+++ b/config.h -@@ -15,7 +15,7 @@ - # define EPROTO ECONNABORTED - #endif - --#ifdef WIN32 -+#ifdef WIN32 || WIN64 - # ifndef strcasecmp - # define strcasecmp strcmpi - # endif -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index d537e77..272b60a 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -6,12 +6,7 @@ option(WITH_THREADING "Include client library threading support?" ON) - if (${WITH_THREADING} STREQUAL ON) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e58d072..e582a25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,12 +54,7 @@ option(WITH_THREADING "Include client library threading support?" ON) + if (WITH_THREADING) add_definitions("-DWITH_THREADING") if (WIN32) - if (CMAKE_CL_64) @@ -29,21 +16,30 @@ index d537e77..272b60a 100644 else (WIN32) find_library(LIBPTHREAD pthread) if (LIBPTHREAD) +diff --git a/config.h b/config.h +index b7a7616..bceb92a 100644 +--- a/config.h ++++ b/config.h +@@ -27,7 +27,7 @@ + # define EPROTO ECONNABORTED + #endif + +-#ifdef WIN32 ++#if defined(WIN32) || defined(WIN64) + # ifndef strcasecmp + # define strcasecmp strcmpi + # endif diff --git a/lib/net_mosq.h b/lib/net_mosq.h -index b5d8549..be60659 100644 +index b843ebe..8c077eb 100644 --- a/lib/net_mosq.h +++ b/lib/net_mosq.h -@@ -20,7 +20,12 @@ +@@ -20,6 +20,9 @@ Contributors: #include #else #include +#if defined(_MSC_VER) && _MSC_VER > 1900 +#undef ssize_t - typedef int ssize_t; -+#else -+typedef int ssize_t; +#endif + typedef SSIZE_T ssize_t; #endif - #include "mosquitto_internal.h" - diff --git a/ports/nmslib/CONTROL b/ports/nmslib/CONTROL index 7b65617c3..111bcc858 100644 --- a/ports/nmslib/CONTROL +++ b/ports/nmslib/CONTROL @@ -1,5 +1,5 @@ Source: nmslib -Version: 1.7.2-1 +Version: 1.7.3.6 Description: Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces. # # ## Extras are currently unsupported for Windows, waiting for fixes. diff --git a/ports/nmslib/fix-headers.patch b/ports/nmslib/fix-headers.patch index 92a8d6c36..ee6db36df 100644 --- a/ports/nmslib/fix-headers.patch +++ b/ports/nmslib/fix-headers.patch @@ -1,5 +1,5 @@ diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc -index 30a7c8a..5ca07c5 100644 +index f5c7fca..4780746 100644 --- a/similarity_search/src/method/hnsw.cc +++ b/similarity_search/src/method/hnsw.cc @@ -27,7 +27,7 @@ @@ -38,7 +38,7 @@ index b6473bd..6dcb00f 100644 #include "portable_simd.h" #include "space.h" diff --git a/similarity_search/src/method/small_world_rand.cc b/similarity_search/src/method/small_world_rand.cc -index 59e13f7..0f3e0b9 100644 +index e8280cb..6bdb0f7 100644 --- a/similarity_search/src/method/small_world_rand.cc +++ b/similarity_search/src/method/small_world_rand.cc @@ -16,7 +16,7 @@ @@ -48,10 +48,10 @@ index 59e13f7..0f3e0b9 100644 -#include +#include - #include "portable_simd.h" - #include "space.h" + #if defined(_WIN32) || defined(WIN32) + #include diff --git a/similarity_search/src/method/vptree.cc b/similarity_search/src/method/vptree.cc -index d0262ad..0e5befc 100644 +index 04f481e..c71eed5 100644 --- a/similarity_search/src/method/vptree.cc +++ b/similarity_search/src/method/vptree.cc @@ -20,7 +20,7 @@ @@ -60,9 +60,9 @@ index d0262ad..0e5befc 100644 // This is only for _mm_prefetch -#include +#include - - #include "portable_simd.h" - #include "space.h" + #if defined(_WIN32) || defined(WIN32) + #include + #endif diff --git a/similarity_search/test/test_overlap.cc b/similarity_search/test/test_overlap.cc index 326b26b..413d66d 100644 --- a/similarity_search/test/test_overlap.cc diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake index 49a194ba1..ffea74d75 100644 --- a/ports/nmslib/portfile.cmake +++ b/ports/nmslib/portfile.cmake @@ -4,9 +4,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO searchivarius/nmslib - REF v1.7.2 - SHA512 2f910f752bfb1146aa8d1765fd5faf64d718a92ab7edf9d8ac0a2d9c4359d42b07b3cd553e2aff93da8b009add52ab9cce6b841f5175f57163f73f643ff62c19 + REPO nmslib/nmslib + REF 1eda05dccd5ed34df50a243dfc64c5e9187388f8 + SHA512 e4518c8dd84867bd0ac5dbc5d3b57d8053d1f73588fc0cf1d7c91cc4819f22dc7888d6be587691ebc1fd12b67de16de63b5e0a24847b6f7b49b57d1e6b457ebd HEAD_REF master ) diff --git a/ports/ogre/001-cmake-install-dir.patch b/ports/ogre/001-cmake-install-dir.patch index 548f946f7..d0df419eb 100644 --- a/ports/ogre/001-cmake-install-dir.patch +++ b/ports/ogre/001-cmake-install-dir.patch @@ -1,3 +1,5 @@ +diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt +index a7a3796..2e21403 100644 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt @@ -13,10 +13,12 @@ @@ -17,9 +19,11 @@ endif() set(INST_FILES Utils/FindPkgMacros.cmake) +diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake +index 783755e..79f7514 100644 --- a/CMake/InstallResources.cmake +++ b/CMake/InstallResources.cmake -@@ -242,10 +242,12 @@ +@@ -208,10 +208,12 @@ endif () # Create the CMake package files include(CMakePackageConfigHelpers) @@ -34,5 +38,5 @@ + set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") + endif() endif() - configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${OGRE_BINARY_DIR}/cmake/OGREConfig.cmake + configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake INSTALL_DESTINATION ${OGRE_CMAKE_DIR} diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index d7543d10b..828f2165e 100644 --- a/ports/ogre/CONTROL +++ b/ports/ogre/CONTROL @@ -1,5 +1,5 @@ Source: ogre -Version: 1.11.3-4 +Version: 1.12.0 Build-Depends: freeimage, freetype, zlib, zziplib Description: 3D Object-Oriented Graphics Rendering Engine diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 74cb8a1c0..1b9087aca 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre - REF v1.11.3 - SHA512 af52821022ab6148e64fdf183b1aa4607b101c7d0edc20d2ccc909f50eed218d7a283fa3b58260fd41cd3f324ecafad8c5137c66e05786580b043240551b2c42 + REF c14f8847f743f4dc1b3abc947b1725c87d8b10ce + SHA512 a2fd7ffd653c1578bc860b58cf4c899f27cc967f75e2254dc3e372044f118d5951e42b35bfc711aa8996e1885f372d3cfa5a768b8674e0b3d844811990eb87fc HEAD_REF master PATCHES 001-cmake-install-dir.patch diff --git a/ports/openvpn3/CMakeLists.txt b/ports/openvpn3/CMakeLists.txt index fcbe85794..70ec99858 100644 --- a/ports/openvpn3/CMakeLists.txt +++ b/ports/openvpn3/CMakeLists.txt @@ -8,6 +8,10 @@ find_library(MBEDX509_LIB mbedx509) include_directories(. ${ASIO_HPP}) +if(WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") +endif() + add_definitions(-DNOMINMAX -DUSE_ASIO -DUSE_MBEDTLS) add_library(ovpncli client/ovpncli.cpp) diff --git a/ports/openvpn3/CONTROL b/ports/openvpn3/CONTROL index 09264a192..3b8899f18 100644 --- a/ports/openvpn3/CONTROL +++ b/ports/openvpn3/CONTROL @@ -1,4 +1,4 @@ Source: openvpn3 -Version: 2018-03-21 +Version: 2018-03-21-1 Build-Depends: asio, tap-windows6 (windows), mbedtls Description: a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch. diff --git a/ports/openvr/CONTROL b/ports/openvr/CONTROL index dbbe6f4c9..dfaf95c1e 100644 --- a/ports/openvr/CONTROL +++ b/ports/openvr/CONTROL @@ -1,3 +1,3 @@ Source: openvr -Version: 1.1.3b +Version: 1.4.18 Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting. diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake index 2bc15f368..ca2902f50 100644 --- a/ports/openvr/portfile.cmake +++ b/ports/openvr/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/openvr - REF v1.1.3b - SHA512 03d9f61e8a2fee6bed02e087b20ccdc281a06dcbb151afe07a072b8758d56d7f4bed7a5dd8eccd43166c8fac6536930c0e4e81a8deaa081e635fd99a304fc565 + REF 02bc73b9bcfe9cc2d2802bd5fdc91f724de8ef10 + SHA512 5b0b954b09570dcf72f0340d6bcc0a5ba9e754babf33aaee35c9d45ce08f5256643692705b014b8c94b098b554e7882a837cf6a2c25e946e6bc69ba3b9db0ede HEAD_REF master ) diff --git a/ports/pdcurses/CONTROL b/ports/pdcurses/CONTROL index 29cbff29b..75bce7928 100644 --- a/ports/pdcurses/CONTROL +++ b/ports/pdcurses/CONTROL @@ -1,3 +1,3 @@ Source: pdcurses -Version: 3.6 +Version: 3.8 Description: Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model. diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 8581b5583..72c54e403 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -9,8 +9,8 @@ find_program(NMAKE nmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wmcbrine/PDCurses - REF 3.6 - SHA512 1ed34e7eb791c9e00aae60878339e79f6b3af086c45d88d2b59d9b2b4020481ff5a5c21e078e59ae24f2de3b4d412f0240f21a50eb743f7e172c832a7e17ed5e + REF 2467ab2b6c07163d0171b80ad6c252c29da28173 + SHA512 4d729a4e0ffa1b5d1fd35ed73329d08886e1e565936a008cd7b45f8e5fbaabcb86c65377fd1e33acef6271f828cd4158e8a56ed15cd664b2a8c8e1d66cf8c00a HEAD_REF master ) @@ -73,7 +73,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() file( - COPY ${SOURCE_PATH}/curses.h ${SOURCE_PATH}/panel.h ${SOURCE_PATH}/term.h + COPY ${SOURCE_PATH}/curses.h ${SOURCE_PATH}/panel.h DESTINATION ${CURRENT_PACKAGES_DIR}/include ) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdcurses RENAME copyright) diff --git a/ports/robin-map/CONTROL b/ports/robin-map/CONTROL index f24dc8337..c11d67999 100644 --- a/ports/robin-map/CONTROL +++ b/ports/robin-map/CONTROL @@ -1,3 +1,3 @@ Source: robin-map -Version: 0.2.0 +Version: 0.6.1 Description: A C++ implementation of a fast hash map and hash set using robin hood hashing diff --git a/ports/robin-map/portfile.cmake b/ports/robin-map/portfile.cmake index 6436f6194..73cd9c7d8 100644 --- a/ports/robin-map/portfile.cmake +++ b/ports/robin-map/portfile.cmake @@ -3,12 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/robin-map - REF v0.2.0 - SHA512 6d16c612a0d646fd08857f2f6ee2909fb607ff05fa9c7733a2b618d662f63bba2f99677b75a09870a1582b7b37f255c4ff1f9171c897c3cfa73dd8879de1ec18 + REF 3285ed7615b72020bd68ba6d30f9ec0c0c526098 + SHA512 3850a0ea06f62ba177a1746a92a3f9c999f6398d4d786dbc63dd276569e77e3d9c15e83c0cb74a1314e3c2b5ff73225675d914cf4ab3f052353b237ab9219bc8 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/tsl DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/include/tsl DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL ${SOURCE_PATH}/LICENSE diff --git a/ports/snowhouse/CONTROL b/ports/snowhouse/CONTROL index b376f4639..ebd1a6192 100644 --- a/ports/snowhouse/CONTROL +++ b/ports/snowhouse/CONTROL @@ -1,3 +1,3 @@ Source: snowhouse -Version: 3.0.1 +Version: 3.1.0 Description: An assertion library for C++ diff --git a/ports/snowhouse/portfile.cmake b/ports/snowhouse/portfile.cmake index 229a6e5d5..de5fd57e5 100644 --- a/ports/snowhouse/portfile.cmake +++ b/ports/snowhouse/portfile.cmake @@ -3,12 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO banditcpp/snowhouse - REF v3.0.1 - SHA512 b20a703e79a2821bdc43b2a235ed7634499f877f9e96bd0d39eb563ce5c94d4577449cc15dc850176a1b44eb55cf3425885cb4d46a92444a7aa3001ce5d0a3eb + REF 5a612c248524a3b1bdd388bc0ef5a9ea0d2fa684 + SHA512 fd737b0f433093246883975ec70a407a62547e768f538e0540ac0634db1578f0ea46979b7055ae428f146499a0df3b1d6292b8d38c22d346476211757a271d21 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/snowhouse DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h) +file(COPY ${SOURCE_PATH}/include/snowhouse DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h) file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/snowhouse) file(RENAME ${CURRENT_PACKAGES_DIR}/share/snowhouse/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/snowhouse/copyright) \ No newline at end of file diff --git a/ports/sol2/CONTROL b/ports/sol2/CONTROL index eaf829c81..5d702333c 100644 --- a/ports/sol2/CONTROL +++ b/ports/sol2/CONTROL @@ -1,4 +1,4 @@ Source: sol2 -Version: 2.20.6 +Version: 3.0.2 Description: Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great Build-Depends: lua (windows) \ No newline at end of file diff --git a/ports/sol2/portfile.cmake b/ports/sol2/portfile.cmake index 86e653ac6..ee89b9f54 100644 --- a/ports/sol2/portfile.cmake +++ b/ports/sol2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ThePhD/sol2 - REF v2.20.6 - SHA512 293df11ca2e375e60dfa7fd890b3e06aa58c0fd2f45a5a032515a2251b21e9501a2578bada446dd49b35933b69e52db8dfe8498c011e0fde7ecc0655f63ed4ed + REF 5a4d7dca7f77e65aed15c0fb8f8acf1570677335 + SHA512 5fc88a000d7a8379c3c8d8ee2dc3371514c4a58dcc3340b700565278ec69b7be0f108d599e3fe3b3ca347ef7c5b25ac01d83b1a988ac0189c8517b6ae66e96d6 HEAD_REF develop ) diff --git a/ports/sqlite-modern-cpp/CONTROL b/ports/sqlite-modern-cpp/CONTROL index fde7c2eb1..c3e3b38be 100644 --- a/ports/sqlite-modern-cpp/CONTROL +++ b/ports/sqlite-modern-cpp/CONTROL @@ -1,4 +1,4 @@ Source: sqlite-modern-cpp -Version: 3.2-e2248fa +Version: 3.2-936cd0c8 Build-Depends: sqlite3 Description: The C++14 wrapper around sqlite library diff --git a/ports/sqlite-modern-cpp/portfile.cmake b/ports/sqlite-modern-cpp/portfile.cmake index d51dc0bd2..35b364dde 100644 --- a/ports/sqlite-modern-cpp/portfile.cmake +++ b/ports/sqlite-modern-cpp/portfile.cmake @@ -3,9 +3,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO aminroosta/sqlite_modern_cpp - REF e2248fae15c9e1a240f54d29a148e501f4ea2347 - SHA512 89f0ff234e5600ff5f51cb75934fa71d86b51f4e06f1cf4b7cffc0498985120877f8d58bbdbe02fc3cae212acc071a74cd5a3e44fdaf95c3aeaf79338f43fe9d + REPO SqliteModernCpp/sqlite_modern_cpp + REF 936cd0c86aacac87a3dab32906397944ae5f6c3d + SHA512 8ce1b7593fe77dcab297ab4cae0158b43d55b33c1823b2dc5bf22e5545d9781d675ba5ac82b81782f502b34d2335eee2c26167726746a61a0ad566b657d2faf0 HEAD_REF master ) diff --git a/ports/sqlitecpp/0001-Find-external-sqlite3.patch b/ports/sqlitecpp/0001-Find-external-sqlite3.patch index f9473ff53..a59df97ae 100644 --- a/ports/sqlitecpp/0001-Find-external-sqlite3.patch +++ b/ports/sqlitecpp/0001-Find-external-sqlite3.patch @@ -1,26 +1,14 @@ -From 495f0f8bf2caf158ffed78e479d68359f51289a2 Mon Sep 17 00:00:00 2001 -From: Stanislav Ershov -Date: Sat, 6 Jan 2018 11:26:55 +0300 -Subject: [PATCH] Find external sqlite3 - ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4a3e492..f7e22a5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -193,7 +193,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME}) - ## Build provided copy of SQLite3 C library ## - - # TODO NOCOMMIT --#find_package(sqlite3) -+find_package(sqlite3 CONFIG) -+target_link_libraries(SQLiteCpp PRIVATE sqlite3) - #if(sqlite3_VERSION VERSION_LESS "3.19") - # set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") - #endif() --- -2.15.0.windows.1 - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 00e058c..489b884 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -199,7 +199,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME}) + ## Build provided copy of SQLite3 C library ## + + # TODO +-#find_package(sqlite3) ++find_package(sqlite3 CONFIG) ++target_link_libraries(SQLiteCpp PRIVATE sqlite3) + #if(sqlite3_VERSION VERSION_LESS "3.19") + # set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") + #endif() diff --git a/ports/sqlitecpp/CONTROL b/ports/sqlitecpp/CONTROL index 3374074d1..ecb0f16e5 100644 --- a/ports/sqlitecpp/CONTROL +++ b/ports/sqlitecpp/CONTROL @@ -1,4 +1,4 @@ Source: sqlitecpp -Version: 2.2-2 +Version: 2.3.0 Build-Depends: sqlite3 Description: SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper. diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index 6876bdf8c..b57573d73 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -4,9 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "SRombauts/SQLiteCpp" - REF "2.2.0" + REF 09dd10886c560ab5af41cfe694567f34c88cd101 HEAD_REF master - SHA512 769857c50cc24596cbd7c6f057ca1e158a3bfecf00d7865d6ef0b90a2ff8ecb9ccb9e1d0e660bb9df8ecd50075a94a9bc9e3a71b96f2ef1c30780c6da9446cf0) + SHA512 d0a440e2e96fca9aac7fe73d46bb6508825a82547dca1e9c93d8c3ca46878fa137e7a2a7a865bcfa641d0236e26307a3342d55fc83578552a37eec7565642d91 +) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/strict-variant/CONTROL b/ports/strict-variant/CONTROL index cc8af9ef0..598dd376c 100644 --- a/ports/strict-variant/CONTROL +++ b/ports/strict-variant/CONTROL @@ -1,3 +1,3 @@ Source: strict-variant -Version: v0.5 +Version: 0.5 Description: Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves. diff --git a/ports/strict-variant/portfile.cmake b/ports/strict-variant/portfile.cmake index ef0b34361..98108b9b1 100644 --- a/ports/strict-variant/portfile.cmake +++ b/ports/strict-variant/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cbeck88/strict-variant - REF 5ab330edcb5e3eea67fbedf8ac89648e5bc1e9a1 - SHA512 c80e5cd7cff389174447f5825af57ddea079956b2a4cb89337479e02289e89df19713ff031e914bdff2c823e8d2518311a1118701ae4e173f6557c770e553cd0 + REF 6378755e3c612cd870c2720232db1e5423dbbe73 + SHA512 45432caab51d42b86839f5ed194e79630ee5cbedd6e41eaadc10d28788ceb8c4629c0432ce888a5729266585e03cf4e6206c8ec66d1b1bc3d7d60220b3909f1d HEAD_REF master ) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 50bc78830..70e21589a 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 2019_U6 +Version: 2019_U7 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 024dc67a6..119916757 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -6,9 +6,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO 01org/tbb - REF 2019_U6 - SHA512 6513d30a498f507cb3e9a06746e430a8bc829de0d204b15d7a79f79c5e7565e59bb0b459c8ca4946293ecb25e2ce11d25cfc7f311e91c7e67342eceb31000d07 + REPO intel/tbb + REF 4233fef583b4f8cbf9f781311717600feaaa0694 + SHA512 6eb239f16e0ecacb825264869aafad7fb39aa1b1f8a3c03c92344c4255d1c1a34ca0a47a366c471fd2da808f3be14262c7e2305294677f2f490c1a48f6f76ec3 HEAD_REF tbb_2019 ) diff --git a/ports/tinyobjloader/CONTROL b/ports/tinyobjloader/CONTROL index 8ec7ef7a7..f80f52f96 100644 --- a/ports/tinyobjloader/CONTROL +++ b/ports/tinyobjloader/CONTROL @@ -1,3 +1,3 @@ Source: tinyobjloader -Version: 1.4.1-1 +Version: 1.0.7 Description: Tiny but powerful single file wavefront obj loader diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake index ee6d64dc7..b33a2dd74 100644 --- a/ports/tinyobjloader/portfile.cmake +++ b/ports/tinyobjloader/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO syoyo/tinyobjloader - REF v1.4.1 - SHA512 5b18fed89435a95fb3fc89829ea6904b4cc4508b0907642b39194e3e3c55678ddc1c07687e4b7ea171f270f7188ca593ed53b828c022667e54a889c36c60373e + REF v1.0.7 + SHA512 e88554ead20354da443489e1b6576b328e92b2e6665071df9b6473b38c34c036dbffb6655330e970c01ccf7f99bbd4f9f5418ce48a14239576ec5e0513256637 HEAD_REF master ) diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL index 1f16764c1..4eb0a976b 100644 --- a/ports/urdfdom-headers/CONTROL +++ b/ports/urdfdom-headers/CONTROL @@ -1,3 +1,3 @@ Source: urdfdom-headers -Version: 1.0.3 +Version: 1.0.4 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 404498b1c..8670716f3 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.3 - SHA512 44b1ca9724a9ccd5d2ad51f61d36de19b9a893955ad5c3ecfa2356f6468a0ac140b8cd6fa2aa18c163b0fa8ba87e834358369d2470cd3dee474408113a30b7a0 + REF 00c1c9c231e46b2300d04073ad696521758fa45c + SHA512 8622cfad074454ae34be3e77c37b201adeb0e348df251e1c2fd57f35ae24817bbd2880a9c465056976eb8815fda041ba2fbd70ccb7cac6efc5ed3d7a082e80ef HEAD_REF master ) diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL index 605f15071..c028ad14e 100644 --- a/ports/uvatlas/CONTROL +++ b/ports/uvatlas/CONTROL @@ -1,3 +1,3 @@ Source: uvatlas -Version: sept2016-1 +Version: apr2019 Description: UVAtlas isochart texture atlas \ No newline at end of file diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index e1a1a189f..df0d322b3 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF sept2016 - SHA512 326af26c151620cd5082daf3913cf3fbe7bca7d1aaf5cc44cacff54319ffe79b728c24519187c3f9393a846430d0fb9493ffe9473f87d220f5c9ae7dab73f69f + REF 8309d95904d3a8f3559d73e07f3a0472f161c28b + SHA512 e0031812824f179dffdec487b2e70fc80748a722c4bccf67a7e0bd865700b6e61e1f14160557a1a797a84a9e7cc559f5e66bd8cabd5da4728ee479e4247d9aa2 HEAD_REF master ) @@ -48,5 +48,5 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) # Handle copyright -file(COPY ${SOURCE_PATH}/MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/MIT.txt ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/LICENSE ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright) diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL index f4a10f007..6484356ba 100644 --- a/ports/wangle/CONTROL +++ b/ports/wangle/CONTROL @@ -1,4 +1,4 @@ Source: wangle -Version: 2019.05.13.00 +Version: 2019.05.20.00 Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way. diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 443cdbce9..44dc8f9f3 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2019.05.13.00 - SHA512 17cc164634d3bec5059abed8f28a8d5e76b6bf3475ee848c0fc0e88c59ce82d1257555a86c638484d81795b2e8f582a8559e13a195c38bdd88ae73e3a5684ffc + REF 19300a75c27759339c44cf06ecedf7ab00703e8b + SHA512 cc9a5a956862e9d4321df7c0394fbb877c5f0b0f8eae1da6aad88239a2cc0b4cd694bd25e0f70f3da8a24c34f4f035bcfb53919fd99634219e0816c78477cee2 HEAD_REF master PATCHES build.patch diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL index 3deb2ca48..c85f193c3 100644 --- a/ports/xeus/CONTROL +++ b/ports/xeus/CONTROL @@ -1,4 +1,4 @@ Source: xeus -Version: 0.19.1-1 +Version: 0.19.2 Description: C++ implementation of the Jupyter kernel protocol Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake index ac1dcff01..f040af0c7 100644 --- a/ports/xeus/portfile.cmake +++ b/ports/xeus/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO QuantStack/xeus - REF 0.19.1 - SHA512 1f42cf3b5007fef957c259eee58bdc5d6b812dd32ca316823e33837d3802df0675f778a9c8f2fb97e9ff982c584229d3733e5894684e75498cc244e9c29df209 + REF 4bc3d2017fcf35ee6e69babf9be1e463483cd11c + SHA512 6f68f564a3dfaab5fdfbf9778602c75c883d761e8dd00a4b19f3f57c16e87b8252d40479abdd8eedb350799479e3213f16010176da286e5c3e6c9b9e76e6793d HEAD_REF master ) diff --git a/ports/xmsh/portfile.cmake b/ports/xmsh/portfile.cmake index 51897e6bd..285205b61 100644 --- a/ports/xmsh/portfile.cmake +++ b/ports/xmsh/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO nagzira/xmsh + REPO libxmsh/xmsh REF v0.4.1 SHA512 7bd9fe9e565b33722fec37a7e3d9bd8b7b132692add5d26e31954367fb284b49a26a21532ddcb0e425af7f8208e755f21f2d8de81b33ed2a1149724f4ccd2c38 HEAD_REF master