[chakracore,gamma,libopenmpt,portaudio,usrsctp] Fix baseline for 2020-10-14 (#14054)

* [portaudio] Remove from baseline, fix CRT linkage and mark UWP as unsupported.

portaudio was fixed by https://github.com/microsoft/vcpkg/commit/654adc64b36607aff14f614387eb904d64faec2b

* [chakracore] Remove passing case from baseline and add Supports.

PASSING, REMOVE FROM FAIL LIST: chakracore:arm64-windows (.\scripts\ci.baseline.txt)

* [gamma] Remove from baseline.

PASSING, REMOVE FROM FAIL LIST: gamma:x64-linux (.\scripts\ci.baseline.txt)

This was blocked by portaudio before.

* [usrsctp] Remove baseline

PASSING, REMOVE FROM FAIL LIST: usrsctp:arm-uwp (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: usrsctp:x64-uwp (.\scripts\ci.baseline.txt)

Probably fixed by https://github.com/microsoft/vcpkg/commit/16b68c2f35771c250b354248f11015f9def2a89b

* [libopenmpt] Fix build on recent msvc by backporting deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d

https://github.com/OpenMPT/openmpt/commit/deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d

* [chakracore] Also needs dynamic universe.

5 files changed, 32 insertions, 13 deletions

diff --git a/ports/libopenmpt/CMakeLists.txt b/ports/libopenmpt/CMakeLists.txt
index 5e9b20799..e1aa118e4 100644
--- a/ports/libopenmpt/CMakeLists.txt
+++ b/ports/libopenmpt/CMakeLists.txt
@@ -3,7 +3,7 @@ project(libopenmpt)
 
 if(MSVC)
   add_compile_options(
-    /W3 /wd4005 /wd4267 /wd4244 /wd4996 /wd410 /wd4018
+    /W3 /wd4005 /wd4267 /wd4244 /wd4996 /wd4100 /wd4018
     -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
     -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS
   )
@@ -27,8 +27,6 @@ find_library(FLAC_LIBRARY NAMES FLAC flac)
 find_path(PORTAUDIO_INCLUDE_DIR NAMES portaudio.h)
 find_library(PORTAUDIO_LIBRARY NAMES portaudio)
 
-
-
 set(
   lib_headers
   libopenmpt/libopenmpt.h
@@ -45,7 +43,6 @@ set(
   libopenmpt/libopenmpt_version.h
 )
 
-
 include_directories(
   .
   build/svn_version
@@ -267,8 +264,6 @@ target_link_libraries(
   Winmm
   ZLIB::ZLIB
 )
-
-
 install(
   TARGETS libopenmpt
   RUNTIME DESTINATION bin
@@ -276,7 +271,6 @@ install(
   ARCHIVE DESTINATION lib
 )
 
-
 if(NOT DISABLE_INSTALL_HEADERS)
   install(FILES ${lib_headers} DESTINATION include/libopenmpt)
 endif()
diff --git a/ports/libopenmpt/CONTROL b/ports/libopenmpt/CONTROL
deleted file mode 100644
index be431f49e..000000000
--- a/ports/libopenmpt/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: libopenmpt
-Version: 2017-01-28-cf2390140
-Homepage: https://github.com/OpenMPT/openmpt
-Description: a library to render tracker music
-Build-Depends: zlib, mpg123, libogg, libvorbis, portaudio, libflac
-Supports: !uwp
\ No newline at end of file
diff --git a/ports/libopenmpt/deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch b/ports/libopenmpt/deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch
new file mode 100644
index 000000000..cece6f839
--- /dev/null
+++ b/ports/libopenmpt/deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch
@@ -0,0 +1,13 @@
+diff --git a/common/mptUUID.h b/common/mptUUID.h

+index a683fdcab..be7d4cb61 100644

+--- a/common/mptUUID.h

++++ b/common/mptUUID.h

+@@ -13,6 +13,8 @@

+ 

+ #include "Endianness.h"

+ 

++#include <stdexcept>

++

+ #if MPT_OS_WINDOWS

+ #if defined(MODPLUG_TRACKER) || !defined(NO_DMO)

+ #include <guiddef.h>

diff --git a/ports/libopenmpt/portfile.cmake b/ports/libopenmpt/portfile.cmake
index c43f64a99..c446c8f83 100644
--- a/ports/libopenmpt/portfile.cmake
+++ b/ports/libopenmpt/portfile.cmake
@@ -8,6 +8,8 @@ vcpkg_from_github(
   REF  cf2390140c37a53ecf7d5fe73412982d346efba4
   SHA512  6401bac7a899eaacebb601591f982fabde6351f1c0dc0c2d24f1f303b78592e7883a84463bdf3cf0fd029eb38d7b7085fdfadafea2931b307b43d0b601db863e
   HEAD_REF master
+  PATCHES
+    deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/libopenmpt/vcpkg.json b/ports/libopenmpt/vcpkg.json
new file mode 100644
index 000000000..18c3bf100
--- /dev/null
+++ b/ports/libopenmpt/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "libopenmpt",
+  "version-string": "2017-01-28-cf2390140",
+  "port-version": 1,
+  "description": "a library to render tracker music",
+  "homepage": "https://github.com/OpenMPT/openmpt",
+  "supports": "!uwp",
+  "dependencies": [
+    "libflac",
+    "libogg",
+    "libvorbis",
+    "mpg123",
+    "portaudio",
+    "zlib"
+  ]
+}