3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 01:10:55 +08:00
Code Issues Projects Releases Wiki Activity

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

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

portaudio was fixed by 654adc64b3

* [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 16b68c2f35

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

deaf2e3837

* [chakracore] Also needs dynamic universe.
This commit is contained in:
Billy O'Neal 2020-10-14 17:38:40 -07:00 committed by GitHub
parent 23f5251f90
commit bfe983d721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/chakracore/CONTROL
View File

@ -1,4 +0,0 @@
Source: chakracore
Version: 1.11.22
Homepage: https://github.com/Microsoft/ChakraCore
Description: Core part of the Chakra Javascript engine

6
ports/chakracore/portfile.cmake
View File

@ -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)

8
ports/chakracore/vcpkg.json Normal file
View File

@ -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"
}

8
ports/libopenmpt/CMakeLists.txt
View File

@ -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()

6
ports/libopenmpt/CONTROL
View File

@ -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

13
ports/libopenmpt/deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch Normal file
View File

@ -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>

2
ports/libopenmpt/portfile.cmake
View File

@ -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})

16
ports/libopenmpt/vcpkg.json Normal file
View File

@ -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"
]
}

5
ports/portaudio/CONTROL
View File

@ -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.

2
ports/portaudio/portfile.cmake
View File

@ -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
)

8
ports/portaudio/vcpkg.json Normal file
View File

@ -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"
}

17
scripts/ci.baseline.txt
View File

@ -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