[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

3 files changed, 16 insertions, 30 deletions

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}")