[vcpkg] [cudnn] [msmpi] [openmpi] Update VMSS (#11365)

Co-authored-by: @JackBoosY 
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
Co-authored-by: Voskrese <10104740+Voskrese@users.noreply.github.com>

7 files changed, 51 insertions, 97 deletions

diff --git a/ports/msmpi/CONTROL b/ports/msmpi/CONTROL
index baa44b8fe..9640f564b 100644
--- a/ports/msmpi/CONTROL
+++ b/ports/msmpi/CONTROL
@@ -1,4 +1,5 @@
 Source: msmpi
-Version: 10.0-2
+Version: 10.1
+Homepage: https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi
 Description: Microsoft MPI
-Supports: windows
\ No newline at end of file
+Supports: windows
diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake
index 10482cb0a..58c3661c7 100644
--- a/ports/msmpi/portfile.cmake
+++ b/ports/msmpi/portfile.cmake
@@ -1,23 +1,21 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP")
 
-if(VCPKG_CMAKE_SYSTEM_NAME)
-    message(FATAL_ERROR "This port is only for building msmpi on Windows Desktop")
-endif()
-
-set(MSMPI_VERSION "10.0.12498")
+set(MSMPI_VERSION "10.1.12498")
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION})
 
 vcpkg_download_distfile(SDK_ARCHIVE
-    URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisdk.msi"
+    URLS "https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisdk.msi"
     FILENAME "msmpisdk-${MSMPI_VERSION}.msi"
-    SHA512 36a31b2516f45fbc26167b31d2d6419f1928aef1591033f0430d36570159205e1a3134557a4ac0462f2d879add1fc6fee87a6997032e4438b528cd42a8bbe6b1
+    SHA512 330fad53c1979dfae786abed228d82c82207f0d61148e2efc1f37c8931838b806eb50554e7f006a56962f748a21f7017c540bd70444b7a93a72c313a64e9254c
 )
 
+
+#to enable CI, you should modify the following URL also in ${VCPKG_ROOT}/scripts/azure-pipelines/windows/provision-image.ps1
 macro(download_msmpi_redistributable_package)
     vcpkg_download_distfile(REDIST_ARCHIVE
-        URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisetup.exe"
+        URLS "https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisetup.exe"
         FILENAME "msmpisetup-${MSMPI_VERSION}.exe"
-        SHA512 c272dc842eb1e693f25eb580e1caf0c1fdb385611a12c20cdc6a40cf592ccbdba434a1c16edb63eef14b1a2ac6e678ac1cd561ec5fd003a5d17191a0fad281ae
+        SHA512 1ee463e7dfc3e55a7ac048fdfde13fef09a5eea4b74d8fd7c22a7aad667a025b467ce939e5de308e25bbc186c3fe66e0e24ac03a3741656fc7558f2af2fa132a
     )
 endmacro()
 
diff --git a/ports/openmpi/CONTROL b/ports/openmpi/CONTROL
index 86af5ffd5..4da1df53e 100644
--- a/ports/openmpi/CONTROL
+++ b/ports/openmpi/CONTROL
@@ -1,5 +1,5 @@
 Source: openmpi
-Version: 4.0.1
+Version: 4.0.3
 Homepage: https://www.open-mpi.org/
 Description: The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.
-Supports: !(windows|uwp)
\ No newline at end of file
+Supports: !(windows|uwp)
diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake
index 9f69f9f9b..6dbb01127 100644
--- a/ports/openmpi/portfile.cmake
+++ b/ports/openmpi/portfile.cmake
@@ -1,100 +1,37 @@
-include(vcpkg_common_functions)
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
-  message(FATAL_ERROR "This port is only for openmpi on Unix-like systems")
-endif()
+vcpkg_fail_port_install(ON_TARGET "Windows" "UWP")
 
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
-set(OpenMPI_FULL_VERSION "4.0.1")
+set(OpenMPI_FULL_VERSION "4.0.3")
 set(OpenMPI_SHORT_VERSION "4.0")
 
 vcpkg_download_distfile(ARCHIVE
   URLS "https://download.open-mpi.org/release/open-mpi/v${OpenMPI_SHORT_VERSION}/openmpi-${OpenMPI_FULL_VERSION}.tar.gz"
   FILENAME "openmpi-${OpenMPI_FULL_VERSION}.tar.gz"
-  SHA512 760716974cb6b25ad820184622e1ee7926bc6fda87db6b574f76792bc1ca99522e52195866c14b7cb2df5a4981efdaf9f71d2c5533cc0e8e45c2c4b3b74cbacc
+  SHA512 23a9dfb7f4a63589b82f4e073a825550d3bc7e6b34770898325323ef4a28ed90b47576acaae6be427eb2007b37a88e18c1ea44d929b8ca083fe576ef1111fef6
 )
 
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    list(APPEND BUILD_TYPES "release")
-endif()
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    list(APPEND BUILD_TYPES "debug")
-endif()
-
-set(SOURCE_PATH_DEBUG   ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-debug/openmpi-${OpenMPI_FULL_VERSION})
-set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-release/openmpi-${OpenMPI_FULL_VERSION})
-set(OUT_PATH_DEBUG      ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-debug)
-set(OUT_PATH_RELEASE    ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-release)
-file(REMOVE_RECURSE     ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-debug/)
-file(REMOVE_RECURSE     ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-release/)
-file(MAKE_DIRECTORY     ${OUT_PATH_DEBUG})
-file(MAKE_DIRECTORY     ${OUT_PATH_RELEASE})
-
-foreach(BUILD_TYPE IN LISTS BUILD_TYPES)
-    vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
-    #vcpkg_apply_patches(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/openmpi-${OpenMPI_FULL_VERSION} PATCHES patch.file)
-endforeach()
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_PATH ${PERL} DIRECTORY)
 vcpkg_add_to_path(${PERL_PATH})
 
-set(BASH bash)
+vcpkg_configure_make(
+        SOURCE_PATH ${SOURCE_PATH}
+        OPTIONS
+            --with-hwloc=internal
+            --with-libevent=internal
+        OPTIONS_DEBUG
+            --enable-debug
+)
 
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-  message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-  vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "${SOURCE_PATH_DEBUG}/configure --prefix=${OUT_PATH_DEBUG} --enable-debug"
-    WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}"
-    LOGNAME "config-${TARGET_TRIPLET}-dbg"
-  )
-  message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-  vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "make -j ${VCPKG_CONCURRENCY}"
-    NO_PARALLEL_COMMAND ${BASH} --noprofile --norc -c "make"
-    WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}"
-    LOGNAME "make-build-${TARGET_TRIPLET}-dbg"
-  )
-  message(STATUS "Installing ${TARGET_TRIPLET}-dbg")
-  vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "make install"
-    WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}"
-    LOGNAME "make-install-${TARGET_TRIPLET}-dbg"
-  )
-  file(COPY ${OUT_PATH_DEBUG}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
-  message(STATUS "Installing ${TARGET_TRIPLET}-dbg done")
-endif()
+vcpkg_install_make()
 
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-  message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
-  vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "${SOURCE_PATH_RELEASE}/configure --prefix=${OUT_PATH_RELEASE}"
-    WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}"
-    LOGNAME "config-${TARGET_TRIPLET}-rel"
-  )
-  message(STATUS "Building ${TARGET_TRIPLET}-rel")
-  vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "make -j ${VCPKG_CONCURRENCY}"
-    NO_PARALLEL_COMMAND ${BASH} --noprofile --norc -c "make"
-    WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}"
-    LOGNAME "make-build-${TARGET_TRIPLET}-rel"
-  )
-  message(STATUS "Installing ${TARGET_TRIPLET}-rel")
-  vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "make install"
-    WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}"
-    LOGNAME "make-install-${TARGET_TRIPLET}-rel"
-  )
-  file(COPY ${OUT_PATH_RELEASE}/lib DESTINATION ${CURRENT_PACKAGES_DIR})
-  file(COPY ${OUT_PATH_RELEASE}/include DESTINATION ${CURRENT_PACKAGES_DIR})
-  file(COPY ${OUT_PATH_RELEASE}/share DESTINATION ${CURRENT_PACKAGES_DIR})
-  file(COPY ${OUT_PATH_RELEASE}/bin DESTINATION ${CURRENT_PACKAGES_DIR})
-  message(STATUS "Installing ${TARGET_TRIPLET}-rel done")
-endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-  file(INSTALL ${SOURCE_PATH_DEBUG}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmpi RENAME copyright)
-else()
-  file(INSTALL ${SOURCE_PATH_RELEASE}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmpi RENAME copyright)
-endif()
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/sdl2/CONTROL b/ports/sdl2/CONTROL
index e20991fb6..f9bdadb69 100644
--- a/ports/sdl2/CONTROL
+++ b/ports/sdl2/CONTROL
@@ -1,5 +1,5 @@
 Source: sdl2
-Version: 2.0.12
+Version: 2.0.12-1
 Homepage: https://www.libsdl.org/download-2.0.php
 Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.
 
diff --git a/ports/sdl2/fix-EventToken-header-reference.patch b/ports/sdl2/fix-EventToken-header-reference.patch
new file mode 100644
index 000000000..5e34dc2f2
--- /dev/null
+++ b/ports/sdl2/fix-EventToken-header-reference.patch
@@ -0,0 +1,17 @@
+
+diff -r 398b67c0a7d3 -r 7c2f418f701b src/video/winrt/SDL_winrtgamebar.cpp
+--- a/src/video/winrt/SDL_winrtgamebar.cpp	Wed Jun 10 09:36:10 2020 -0700
++++ b/src/video/winrt/SDL_winrtgamebar.cpp	Wed Jun 10 09:38:43 2020 -0700
+@@ -25,7 +25,7 @@
+ /* Windows includes */
+ #include <roapi.h>
+ #include <windows.foundation.h>
+-#include <EventToken.h>
++#include <windows.system.h>
+ 
+ 
+ /* SDL includes */
+
+
+
+
diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake
index 4bed5c0a6..366ad1e3a 100644
--- a/ports/sdl2/portfile.cmake
+++ b/ports/sdl2/portfile.cmake
@@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex(
         disable-hidapi-for-uwp.patch
         fix-space-in-path.patch
         disable-wcslcpy-and-wcslcat-for-windows.patch
+        fix-EventToken-header-reference.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC)