diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL deleted file mode 100644 index bf891581f7..0000000000 --- a/ports/chakracore/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: chakracore -Version: 1.11.22 -Homepage: https://github.com/Microsoft/ChakraCore -Description: Core part of the Chakra Javascript engine diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 436a3c66c9..991e3a3de1 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,8 +1,4 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "UWP is not currently supported.") -endif() - -include(vcpkg_common_functions) +vcpkg_fail_port_install(ON_TARGET osx linux uwp ON_CRT_LINKAGE static ON_LIBRARY_LINKAGE static) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json new file mode 100644 index 0000000000..5c6426d7d5 --- /dev/null +++ b/ports/chakracore/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "chakracore", + "version-string": "1.11.22", + "port-version": 1, + "description": "Core part of the Chakra Javascript engine", + "homepage": "https://github.com/Microsoft/ChakraCore", + "supports": "windows & !uwp & !static" +} diff --git a/ports/libopenmpt/CMakeLists.txt b/ports/libopenmpt/CMakeLists.txt index 5e9b20799a..e1aa118e4f 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 be431f49e5..0000000000 --- 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 0000000000..cece6f8392 --- /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 ++ + #if MPT_OS_WINDOWS + #if defined(MODPLUG_TRACKER) || !defined(NO_DMO) + #include diff --git a/ports/libopenmpt/portfile.cmake b/ports/libopenmpt/portfile.cmake index c43f64a996..c446c8f83b 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 0000000000..18c3bf100a --- /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" + ] +} diff --git a/ports/portaudio/CONTROL b/ports/portaudio/CONTROL deleted file mode 100644 index ac11b52233..0000000000 --- a/ports/portaudio/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: portaudio -Version: 2020-02-02 -Port-Version: 1 -Homepage: https://app.assembla.com/spaces/portaudio/wiki -Description: PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O. diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake index 7d9c95d843..35e2122128 100644 --- a/ports/portaudio/portfile.cmake +++ b/ports/portaudio/portfile.cmake @@ -1,3 +1,4 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://git.assembla.com/portaudio.git @@ -23,6 +24,7 @@ vcpkg_configure_cmake( -DPA_LIBNAME_ADD_SUFFIX=OFF -DPA_BUILD_SHARED=${PA_BUILD_SHARED} -DPA_BUILD_STATIC=${PA_BUILD_STATIC} + -DPA_DLL_LINK_WITH_STATIC_RUNTIME=OFF OPTIONS_DEBUG -DPA_ENABLE_DEBUG_OUTPUT:BOOL=ON ) diff --git a/ports/portaudio/vcpkg.json b/ports/portaudio/vcpkg.json new file mode 100644 index 0000000000..1dce28b1b6 --- /dev/null +++ b/ports/portaudio/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "portaudio", + "version-string": "2020-02-02", + "port-version": 2, + "description": "PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.", + "homepage": "https://app.assembla.com/spaces/portaudio/wiki", + "supports": "!uwp" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index cd1296b59e..190ed852cd 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -166,12 +166,6 @@ cfitsio:arm-uwp=fail cfitsio:x64-uwp=fail cgicc:arm-uwp=fail cgicc:x64-uwp=fail -chakracore:arm64-windows=fail -chakracore:arm-uwp=fail -chakracore:x64-linux=fail -chakracore:x64-osx=fail -chakracore:x64-uwp=fail -chakracore:x64-windows-static=fail # DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy) charls:arm64-windows=skip charls:arm-uwp=skip @@ -452,8 +446,6 @@ g3log:x64-uwp=fail gainput:arm-uwp=fail gainput:x64-linux=fail gainput:x64-uwp=fail -gamma:x64-linux=fail -gamma:x64-osx=fail gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail @@ -1320,13 +1312,6 @@ pmdk:x86-windows=fail pngwriter:arm-uwp=fail pngwriter:x64-uwp=fail portable-snippets:arm-uwp=fail -# Portaudio was broken by Ninja 1.9.0 https://github.com/ninja-build/ninja/pull/1406 -portaudio:arm-uwp=fail -portaudio:arm64-windows=fail -portaudio:x64-uwp=fail -portaudio:x64-windows-static=fail -portaudio:x64-windows=fail -portaudio:x86-windows=fail pqp:arm-uwp=fail pqp:x64-uwp=fail proj4:arm64-windows=fail @@ -1709,8 +1694,6 @@ unrar:x64-uwp=fail unrar:x64-windows-static=fail urdfdom:x64-windows-static=fail usd:x86-windows=fail -usrsctp:arm-uwp=fail -usrsctp:x64-uwp=fail uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail uvatlas:arm64-windows=fail