[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

5 files changed, 40 insertions, 84 deletions

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 <unistd.h>
  #else
  #include <winsock2.h>
 +#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"
-