microsoft · BillyONeal · May 19, 2020 · Apr 10, 2020 · Apr 10, 2020 · Apr 13, 2020
diff --git a/ports/cpuid/CONTROL b/ports/cpuid/CONTROL
@@ -1,5 +1,5 @@
 Source: cpuid
-Version: 0.4.1
+Version: 0.4.1-1
 Homepage: https://github.com/anrieff/libcpuid
 Description: Provides CPU identification for the x86 (and x86_64)
 Supports: x86 | x64
diff --git a/ports/cpuid/fix-install-headers.patch b/ports/cpuid/fix-install-headers.patch
@@ -0,0 +1,13 @@
+diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt
+index 96533ac..d71953f 100644
+--- a/libcpuid/CMakeLists.txt
++++ b/libcpuid/CMakeLists.txt
+@@ -75,7 +75,7 @@ install(TARGETS cpuid
+         LIBRARY DESTINATION "lib"
+         ARCHIVE DESTINATION "lib"
+         RUNTIME DESTINATION "bin"
+-        INCLUDES DESTINATION "include")
++        PUBLIC_HEADER DESTINATION "include")
+
+ install(FILES "${project_config}" "${version_config}"
+         DESTINATION "${config_install_dir}"
diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake
@@ -2,11 +2,12 @@ vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64")
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO anrieff/libcpuid
-        REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0
-        SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d
-        HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO anrieff/libcpuid
+    REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0
+    SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d
+    HEAD_REF master
+    PATCHES fix-install-headers.patch
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/dmlc/CONTROL b/ports/dmlc/CONTROL
@@ -1,5 +1,5 @@
 Source: dmlc
-Version: 2019-08-12-1
+Version: 2019-08-12-2
 Homepage: https://github.com/dmlc/dmlc-core
 Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.
 Default-Features: openmp

diff --git a/ports/dmlc/portfile.cmake b/ports/dmlc/portfile.cmake
@@ -1,10 +1,6 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} currently doesn't supports UWP.")
-endif()
+vcpkg_fail_port_install(ON_TARGET "UWP")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -40,5 +36,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dmlc)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/gts/portfile.cmake b/ports/gts/portfile.cmake
@@ -13,7 +13,6 @@ vcpkg_from_github(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
 )
 
 vcpkg_install_cmake()

diff --git a/ports/libnice/CONTROL b/ports/libnice/CONTROL
@@ -1,5 +1,5 @@
 Source: libnice
-Version: 0.1.15-2
+Version: 0.1.15-3
 Homepage: https://nice.freedesktop.org
 Description: Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).
 Build-Depends: glib, openssl
diff --git a/ports/libnice/portfile.cmake b/ports/libnice/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_download_distfile(
     ARCHIVE
     URLS "https://nice.freedesktop.org/releases/libnice-0.1.15.tar.gz"
@@ -24,7 +22,7 @@ vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()
 
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libnice)
-file(COPY ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/libnice)
-file(COPY ${SOURCE_PATH}/COPYING.MPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/libnice)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libnice/COPYING ${CURRENT_PACKAGES_DIR}/share/libnice/copyright)
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${SOURCE_PATH}/COPYING.MPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
@@ -1,5 +1,5 @@
 Source: magnum
-Version: 2019.10-1
+Version: 2019.10-2
 Build-Depends: corrade[utility]
 Description: C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/
@@ -137,14 +137,6 @@ Feature: windowlesseglapplication
 Description: WindowlessEglApplication library
 Build-Depends: magnum[gl]
 
-Feature: eglcontext
-Description: EglContext library
-Build-Depends: magnum[gl]
-
 Feature: windowlessglxapplication
 Description: WindowlessGlxApplication library
 Build-Depends: magnum[gl]
-
-Feature: glxcontext
-Description: GlxContext library
-Build-Depends: magnum[gl]
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
@@ -28,27 +28,49 @@ else()
     set(BUILD_PLUGINS_STATIC 0)
 endif()
 
-# Handle features
-set(_COMPONENT_FLAGS "")
-foreach(_feature IN LISTS ALL_FEATURES)
-    # Uppercase the feature name and replace "-" with "_"
-    string(TOUPPER "${_feature}" _FEATURE)
-    string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
-
-    # Turn "-DWITH_*=" ON or OFF depending on whether the feature
-    # is in the list.
-    if(_feature IN_LIST FEATURES)
-        list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON")
-    else()
-        list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF")
-    endif()
-endforeach()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    al-info                     WITH_AL_INFO
+    anyimageimporter            WITH_ANYIMAGEIMPORTER
+    anyaudioimporter            WITH_ANYAUDIOIMPORTER
+    anyimageconverter           WITH_ANYIMAGECONVERTER
+    anysceneimporter            WITH_ANYSCENEIMPORTER
+    audio                       WITH_AUDIO
+    debugtools                  WITH_DEBUGTOOLS
+    distancefieldconverter      WITH_DISTANCEFIELDCONVERTER
+    fontconverter               WITH_FONTCONVERTER
+    gl                          WITH_GL
+    gl-info                     WITH_GL_INFO
+    glfwapplication             WITH_GLFWAPPLICATION
+    imageconverter              WITH_IMAGECONVERTER
+    magnumfont                  WITH_MAGNUMFONT
+    magnumfontconverter         WITH_MAGNUMFONTCONVERTER
+    meshtools                   WITH_MESHTOOLS
+    objimporter                 WITH_OBJIMPORTER
+    tgaimageconverter           WITH_TGAIMAGECONVERTER
+    opengltester                WITH_OPENGLTESTER
+    primitives                  WITH_PRIMITIVES
+    sdl2application             WITH_SDL2APPLICATION
+    scenegraph                  WITH_SCENEGRAPH
+    shaders                     WITH_SHADERS
+    text                        WITH_TEXT
+    texturetools                WITH_TEXTURETOOLS
+    tgaimporter                 WITH_TGAIMPORTER
+    trade                       WITH_TRADE
+    wavaudioimporter            WITH_WAVAUDIOIMPORTER
+    windowlesswglapplication    WITH_WINDOWLESSWGLAPPLICATION
+    eglcontext                  WITH_EGLCONTEXT
+    cglcontext                  WITH_CGLCONTEXT
+    glxcontext                  WITH_GLXCONTEXT
+    wglcontext                  WITH_WGLCONTEXT
+    windowlesseglapplication    WITH_WINDOWLESSEGLAPPLICATION
+    windowlessglxapplication    WITH_WINDOWLESSGLXAPPLICATION
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
-        ${_COMPONENT_FLAGS}
+        ${FEATURE_OPTIONS}
         -DBUILD_STATIC=${BUILD_STATIC}
         -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
         -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
@@ -57,6 +79,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_copy_pdbs()
+
 # Drop a copy of tools
 if(NOT VCPKG_CMAKE_SYSTEM_NAME)
     set(EXE_SUFFIX .exe)
@@ -105,8 +129,4 @@ else()
    file(COPY ${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d)
 endif()
 
-# Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/magnum)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/magnum/COPYING ${CURRENT_PACKAGES_DIR}/share/magnum/copyright)
-
-vcpkg_copy_pdbs()
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/metrohash/CMakeLists.txt b/ports/metrohash/CMakeLists.txt
@@ -31,7 +31,8 @@ install(TARGETS metrohash
         EXPORT "${TARGETS_EXPORT_NAME}"
         LIBRARY DESTINATION "lib"
         ARCHIVE DESTINATION "lib"
-        INCLUDES DESTINATION "include")
+        PUBLIC_HEADER DESTINATION "include")
+
 install(
         FILES "${project_config}"
         DESTINATION "${config_install_dir}"

diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL
@@ -1,5 +1,5 @@
 Source: mlpack
-Version: 3.2.2-1
+Version: 3.2.2-2
 Homepage: https://github.com/mlpack/mlpack
 Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.
 Build-Depends: openblas (!osx), clapack (!osx), boost, armadillo, ensmallen

diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake
@@ -33,8 +33,6 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
 if("tools" IN_LIST FEATURES)
     file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
     file(GLOB MLPACK_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
@@ -45,3 +43,5 @@ if("tools" IN_LIST FEATURES)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/murmurhash/CMakeLists.txt b/ports/murmurhash/CMakeLists.txt
@@ -42,7 +42,7 @@ install(TARGETS murmurhash
         EXPORT "${TARGETS_EXPORT_NAME}"
         LIBRARY DESTINATION "lib"
         ARCHIVE DESTINATION "lib"
-        INCLUDES DESTINATION "include")
+        PUBLIC_HEADER DESTINATION "include")
 
 install(FILES "${project_config}" "${version_config}"
         DESTINATION "${config_install_dir}"

diff --git a/ports/murmurhash/CONTROL b/ports/murmurhash/CONTROL
@@ -1,4 +1,4 @@
 Source: murmurhash
-Version: 2016-01-09-2
+Version: 2016-01-09-3
 Homepage: https://github.com/aappleby/smhasher
 Description: MurmurHash a family of hash functions.
diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL
@@ -1,4 +1,4 @@
 Source: nanodbc
-Version: 2.12.4-5
+Version: 2.12.4-7
 Homepage: https://github.com/lexicalunit/nanodbc
 Description: A small C++ wrapper for the native C ODBC API.
diff --git a/ports/opencc/CONTROL b/ports/opencc/CONTROL
@@ -1,5 +1,5 @@
 Source: opencc
-Version: 2020-04-26-1
+Version: 2020-04-26-2
 Description: A project for conversion between Traditional and Simplified Chinese
 Homepage: https://github.com/BYVoid/OpenCC
 Supports: !(arm|arm64|uwp)

diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake
@@ -47,4 +47,4 @@ endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake
@@ -134,4 +134,4 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/podofo/CONTROL b/ports/podofo/CONTROL
@@ -1,5 +1,5 @@
 Source: podofo
-Version: 0.9.6-7
+Version: 0.9.6-8
 Homepage: https://sourceforge.net/projects/podofo/
 Description: PoDoFo is a library to work with the PDF file format
 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl, freetype

diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 set(PODOFO_VERSION 0.9.6)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/podofo/files/podofo/${PODOFO_VERSION}/podofo-${PODOFO_VERSION}.tar.gz/download"
@@ -56,5 +54,4 @@ vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/podofo)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/podofo/COPYING ${CURRENT_PACKAGES_DIR}/share/podofo/copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/replxx/CONTROL b/ports/replxx/CONTROL
@@ -1,5 +1,5 @@
 Source: replxx
-Version: 0.0.2
+Version: 0.0.2-1
 Homepage: https://github.com/AmokHuginnsson/replxx
 Description: A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.
 Supports: !uwp

diff --git a/ports/replxx/portfile.cmake b/ports/replxx/portfile.cmake
@@ -11,12 +11,14 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
         PREFER_NINJA
+        DISABLE_PARALLEL_CONFIGURE
 )
 
 vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/replxxConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/stormlib/CMakeLists.txt b/ports/stormlib/CMakeLists.txt
@@ -274,6 +274,7 @@ install(TARGETS stormlib EXPORT stormlibConfig
 		RUNTIME DESTINATION bin
 		ARCHIVE DESTINATION lib
 		LIBRARY DESTINATION lib
+        PUBLIC_HEADER DESTINATION include
 )
 
 install(EXPORT stormlibConfig NAMESPACE stormlib:: DESTINATION share/stormlib)
diff --git a/ports/stormlib/CONTROL b/ports/stormlib/CONTROL
@@ -1,4 +1,4 @@
 Source: stormlib
-Version: 2019-05-10
+Version: 2019-05-10-1
 Build-Depends: zlib, bzip2
 Description: StormLib is a library for opening and manipulating Blizzard MPQ files
diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh
@@ -43,6 +43,9 @@ sudo apt update
 sudo add-apt-repository universe
 sudo apt install -y powershell
 
+# Install odbc
+sudo apt install -y unixodbc-dev
+
 # Write SMB credentials
 sudo mkdir /etc/smbcredentials
 smbCredentialFile=/etc/smbcredentials/$StorageAccountName.cred
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,4 +47,4 @@ endif()

		file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)

		file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
		file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)