Merge from master

7 files changed, 35 insertions, 12 deletions

diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt
index 67f0ba10f..40763e8cd 100644
--- a/ports/glib/CMakeLists.txt
+++ b/ports/glib/CMakeLists.txt
@@ -60,7 +60,7 @@ macro(extract_vcproj_sources VC_PROJECT OUT_VAR)
 endmacro()
 
 # main module
-extract_vcproj_sources(build/win32/vs14/glib.vcxproj GLIB_SOURCES)
+extract_vcproj_sources(win32/vs14/glib.vcxproj GLIB_SOURCES)
 list(APPEND GLIB_SOURCES glib/libcharset/localcharset.c) # modified internal version with prefixed symbols
 add_library(glib ${GLIB_SOURCES})
 target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE ${GLIB_EXPORT_MACRO} GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR)
@@ -77,7 +77,7 @@ target_include_directories(gthread PRIVATE ${LIBINTL_INCLUDE_DIR})
 list(APPEND GLIB_TARGETS gthread)
 
 # gobject
-extract_vcproj_sources(build/win32/vs14/gobject.vcxproj GOBJECT_SOURCES)
+extract_vcproj_sources(win32/vs14/gobject.vcxproj GOBJECT_SOURCES)
 add_library(gobject ${GOBJECT_SOURCES})
 target_compile_definitions(gobject PRIVATE GOBJECT_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GObject")
 target_link_libraries(gobject gthread glib ${FFI_LIBRARY})
@@ -92,7 +92,7 @@ target_include_directories(gmodule PRIVATE ${LIBINTL_INCLUDE_DIR})
 list(APPEND GLIB_TARGETS gmodule)
 
 # gio
-extract_vcproj_sources(build/win32/vs14/gio.vcxproj GIO_SOURCES)
+extract_vcproj_sources(win32/vs14/gio.vcxproj GIO_SOURCES)
 add_library(gio ${GIO_SOURCES})
 target_compile_definitions(gio PRIVATE GIO_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GIO")
 target_link_libraries(gio glib gmodule gobject ws2_32 shlwapi dnsapi iphlpapi ${ZLIB_LIBRARIES})
diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL
index f34cb6c6b..99f98362c 100644
--- a/ports/glib/CONTROL
+++ b/ports/glib/CONTROL
@@ -1,4 +1,4 @@
 Source: glib
-Version: 2.50.3
+Version: 2.52.1
 Description: Portable, general-purpose utility library.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv
diff --git a/ports/glib/cmake/install_headers.cmake b/ports/glib/cmake/install_headers.cmake
index e94a12e49..0cfc207a4 100644
--- a/ports/glib/cmake/install_headers.cmake
+++ b/ports/glib/cmake/install_headers.cmake
@@ -76,6 +76,7 @@ install(FILES glib/gtypes.h DESTINATION include/glib)
 install(FILES glib/gunicode.h DESTINATION include/glib)
 install(FILES glib/gurifuncs.h DESTINATION include/glib)
 install(FILES glib/gutils.h DESTINATION include/glib)
+install(FILES glib/guuid.h DESTINATION include/glib)
 install(FILES glib/gvarianttype.h DESTINATION include/glib)
 install(FILES glib/gvariant.h DESTINATION include/glib)
 install(FILES glib/gversion.h DESTINATION include/glib)
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
index a3de1f33f..51f8b0b30 100644
--- a/ports/glib/portfile.cmake
+++ b/ports/glib/portfile.cmake
@@ -10,12 +10,12 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 
 include(vcpkg_common_functions)
-set(GLIB_VERSION 2.50.3)
+set(GLIB_VERSION 2.52.1)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glib-${GLIB_VERSION})
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.50/glib-${GLIB_VERSION}.tar.xz"
+    URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.52/glib-${GLIB_VERSION}.tar.xz"
     FILENAME "glib-${GLIB_VERSION}.tar.xz"
-    SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af)
+    SHA512 6f0475b4ee1078867671a79b1751674926ba1caa872cec3896e2830c61c3cde67972afa9f2d606a2b6705e9846222462b003c6e966a9b63982f3fc3fb58c4d37)
 
 vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake
index 1ff9b658b..cac518cb2 100644
--- a/ports/mpg123/portfile.cmake
+++ b/ports/mpg123/portfile.cmake
@@ -72,6 +72,8 @@ file(INSTALL
 )
 file(INSTALL
     ${SOURCE_PATH}/ports/MSVC++/mpg123.h
+    ${SOURCE_PATH}/src/libmpg123/fmt123.h
+    ${SOURCE_PATH}/src/libmpg123/mpg123.h.in
     DESTINATION ${CURRENT_PACKAGES_DIR}/include
 )
 
diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL
index 822c50387..81a76c325 100644
--- a/ports/xerces-c/CONTROL
+++ b/ports/xerces-c/CONTROL
@@ -1,3 +1,3 @@
 Source: xerces-c
-Version: 3.1.4
+Version: 3.1.4-3
 Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.
diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake
index 5543f80ed..1208c9787 100644
--- a/ports/xerces-c/portfile.cmake
+++ b/ports/xerces-c/portfile.cmake
@@ -7,6 +7,15 @@
 #
 
 include(vcpkg_common_functions)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    message(STATUS "Static libraries not supported; building dynamic instead")
+    set(VCPKG_LIBRARY_LINKAGE "dynamic")
+endif()
+if (VCPKG_CRT_LINKAGE STREQUAL "static")
+    message(STATUS "Static linking against the CRT not supported; building dynamic instead")
+    set(VCPKG_CRT_LINKAGE "dynamic")
+endif()
+
 
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/xerces-c-3.1.4)
 
@@ -17,20 +26,29 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
-if (TRIPLET_SYSTEM_ARCH MATCHES "x86")
-     set(BUILD_ARCH "Win32")
+if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+    set(BUILD_ARCH "Win32")
+    set(OUTPUT_DIR "Win32")
+elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
+    set(BUILD_ARCH "x64")
+    set(OUTPUT_DIR "Win64")
 else()
-     set(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
 endif()
 
-
 vcpkg_build_msbuild(
     #PROJECT_PATH ${SOURCE_PATH}/projects/Win32/VC14/xerces-all/xerces-all.sln
     PROJECT_PATH ${SOURCE_PATH}/projects/Win32/VC14/xerces-all/xercesLib/xercesLib.vcxproj
     PLATFORM ${BUILD_ARCH})
 
+file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Debug/xerces-c_3_1D.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Debug/xerces-c_3D.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Release/xerces-c_3_1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Release/xerces-c_3.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 
 file(COPY ${SOURCE_PATH}/src/xercesc DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.hpp)
+# Certain headers under xercesc/util include .c files, so we need these copied over as well
+file(COPY ${SOURCE_PATH}/src/xercesc DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.c)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xercesc/NLS)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xercesc/util/MsgLoaders/ICU/resources)
@@ -38,3 +56,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xercesc/util/MsgLoaders/ICU/
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/xerces-c)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/xerces-c/LICENSE ${CURRENT_PACKAGES_DIR}/share/xerces-c/copyright)
+
+vcpkg_copy_pdbs()
\ No newline at end of file