9 files changed, 30 insertions, 108 deletions
diff --git a/ports/dlfcn-win32/CONTROL b/ports/dlfcn-win32/CONTROL
index 198cdbeb7..2d73fc36c 100644
--- a/ports/dlfcn-win32/CONTROL
+++ b/ports/dlfcn-win32/CONTROL
@@ -1,3 +1,3 @@
 Source: dlfcn-win32
-Version: 1.1.0
+Version: 1.1.1
 Description: dlfcn-win32 is an implementation of dlfcn for Windows.
diff --git a/ports/dlfcn-win32/portfile.cmake b/ports/dlfcn-win32/portfile.cmake
index 498d31894..77fd87b12 100644
--- a/ports/dlfcn-win32/portfile.cmake
+++ b/ports/dlfcn-win32/portfile.cmake
@@ -11,11 +11,12 @@
 #
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/dlfcn-win32-1.1.0)
+set(SOURCE_VERSION 1.1.1)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/dlfcn-win32-${SOURCE_VERSION})
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/dlfcn-win32/dlfcn-win32/archive/v1.1.0.zip"
-    FILENAME "dlfcn-win32-v1.1.0.zip"
-    SHA512 7ce1d62a3ea927f8ab56c335e975172c5eb0f465b8ba92f1cf1548638ad431214a644da18e1f733e8b9631cb89c277f06ca4d08f87726d5c04c8aa21dee1510f
+    URLS "https://github.com/dlfcn-win32/dlfcn-win32/archive/v${SOURCE_VERSION}.zip"
+    FILENAME "dlfcn-win32-v${SOURCE_VERSION}.zip"
+    SHA512 581043784d8c1b1b43c88c0da302f79d70e1d33e95977a355d849b8f8c45194b55fdc28e36a3f3ed192eca8fee6b00cb8bf1d1d1fc08b94d53be6f73bea6e09a
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/double-conversion/mscv_vers.patch b/ports/double-conversion/mscv_vers.patch
deleted file mode 100644
index 911ccee84..000000000
--- a/ports/double-conversion/mscv_vers.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/msvc/double-conversion.vcxproj
-+++ b/msvc/double-conversion.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -22,31 +22,32 @@
-     <ProjectGuid>{6863544A-0CE8-4CA9-A132-74116FD9D9BB}</ProjectGuid>
-     <Keyword>Win32Proj</Keyword>
-     <RootNamespace>doubleconversion</RootNamespace>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
-     <UseDebugLibraries>true</UseDebugLibraries>
--    <PlatformToolset>v120</PlatformToolset>
-+    <PlatformToolset>v140</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
-     <UseDebugLibraries>true</UseDebugLibraries>
--    <PlatformToolset>v120</PlatformToolset>
-+    <PlatformToolset>v140</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
-     <UseDebugLibraries>false</UseDebugLibraries>
--    <PlatformToolset>v120</PlatformToolset>
-+    <PlatformToolset>v140</PlatformToolset>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
-     <UseDebugLibraries>false</UseDebugLibraries>
--    <PlatformToolset>v120</PlatformToolset>
-+    <PlatformToolset>v140</PlatformToolset>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
diff --git a/ports/lzo/CONTROL b/ports/lzo/CONTROL
index afc3540d2..a3b69bd7e 100644
--- a/ports/lzo/CONTROL
+++ b/ports/lzo/CONTROL
@@ -1,3 +1,3 @@
 Source: lzo
-Version: 2.09
+Version: 2.10
 Description: Lossless data compression library
diff --git a/ports/lzo/do-not-declare-setargv.patch b/ports/lzo/do-not-declare-setargv.patch
deleted file mode 100644
index 48ae31514..000000000
--- a/ports/lzo/do-not-declare-setargv.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/lzo_supp.h b/src/lzo_supp.h
-index 87307f9..f94a6b0 100644
---- a/src/lzo_supp.h
-+++ b/src/lzo_supp.h
-@@ -3643,9 +3643,9 @@ LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); }
- #endif
- #if (LZO_OS_WIN32 || LZO_OS_WIN64)
- #if (LZO_CC_INTELC || LZO_CC_MSC)
--LZO_EXTERN_C int __lzo_cdecl __setargv(void);
--LZO_EXTERN_C int __lzo_cdecl _setargv(void);
--LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); }
-+// LZO_EXTERN_C int __lzo_cdecl __setargv(void);
-+// LZO_EXTERN_C int __lzo_cdecl _setargv(void);
-+// LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); }
- #endif
- #endif
- #if (LZO_OS_EMX)
diff --git a/ports/lzo/portfile.cmake b/ports/lzo/portfile.cmake
index 6df36269c..e9575f5ce 100644
--- a/ports/lzo/portfile.cmake
+++ b/ports/lzo/portfile.cmake
@@ -12,19 +12,14 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 endif()
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lzo-2.09)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lzo-2.10)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz"
-    FILENAME "lzo-2.09.tar.gz"
-    SHA512 7c64e5e7d2050d75ac8c59d613f6f7230b74746b1d207666755b07450053c8b73980f12f8a1ec59d2af0bada02beec126aaacb675b8088b5fe65e97ff7e6bfc7
+    URLS "http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz"
+    FILENAME "lzo-2.10.tar.gz"
+    SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/do-not-declare-setargv.patch"
-)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
@@ -40,5 +35,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
-file(COPY ${CURRENT_BUILDTREES_DIR}/src/lzo-2.09/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/lzo)
+file(COPY ${CURRENT_BUILDTREES_DIR}/src/lzo-2.10/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/lzo)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/lzo/COPYING ${CURRENT_PACKAGES_DIR}/share/lzo/copyright)
diff --git a/ports/taglib/CONTROL b/ports/taglib/CONTROL
index ca7992b84..dbf00d6a2 100644
--- a/ports/taglib/CONTROL
+++ b/ports/taglib/CONTROL
@@ -1,4 +1,4 @@
 Source: taglib
-Version: 1.11.1-1
+Version: 1.11.1-2
 Description: TagLib Audio Meta-Data Library
 Build-Depends: zlib
 \ No newline at end of file
diff --git a/ports/taglib/ignore_c4996_error.patch b/ports/taglib/ignore_c4996_error.patch
deleted file mode 100644
index 1990b4730..000000000
--- a/ports/taglib/ignore_c4996_error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a59efc9..8ac3266 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -64,6 +64,11 @@ if(MSVC AND ENABLE_STATIC_RUNTIME)
-   endforeach(flag_var)
- endif()
- 
-+# disable error on usage of vsprintf() for UWP builds
-+if(MSVC)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
-+endif()
-+
- # Read version information from file taglib/toolkit/taglib.h into variables
- # TAGLIB_LIB_MAJOR_VERSION, TAGLIB_LIB_MINOR_VERSION, TAGLIB_LIB_PATCH_VERSION.
- foreach(version_part MAJOR MINOR PATCH)
diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake
index 12ff923c5..edc11c5b1 100644
--- a/ports/taglib/portfile.cmake
+++ b/ports/taglib/portfile.cmake
@@ -1,24 +1,29 @@
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/taglib-1.11.1)
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://taglib.org/releases/taglib-1.11.1.tar.gz"
-    FILENAME "taglib-1.11.1.tar.gz"
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO taglib/taglib
+    REF v1.11.1
     SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-#patches for UWP
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/ignore_c4996_error.patch
-        ${CMAKE_CURRENT_LIST_DIR}/replace_non-uwp_functions.patch
-        ${CMAKE_CURRENT_LIST_DIR}/dont-assume-latin-1.patch
-)
+if(NOT VCPKG_USE_HEAD_VERSION) # these have been fixed upstream after 1.11.1
+	# patches for UWP
+	vcpkg_apply_patches(
+		SOURCE_PATH ${SOURCE_PATH}
+		PATCHES
+			${CMAKE_CURRENT_LIST_DIR}/replace_non-uwp_functions.patch
+			${CMAKE_CURRENT_LIST_DIR}/dont-assume-latin-1.patch
+	)
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+	OPTIONS
+		-DHAVE_VSNPRINTF=1		#  taglib/ConfigureChecks.cmake doesn't properly detect MSVC vsnprintf() on UWP
 )
 
 vcpkg_install_cmake()