From 05110823e6a8ef6b7a4bb767629cdf8e477fb392 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 11 Aug 2020 03:22:10 -0700 Subject: [PATCH 1/5] [many ports] Add supports --- ports/alembic/CONTROL | 2 ++ ports/alembic/portfile.cmake | 2 ++ ports/atkmm/CONTROL | 4 +++- ports/atkmm/portfile.cmake | 37 +++++++++---------------------- ports/avisynthplus/portfile.cmake | 4 ++-- ports/avisynthplus/vcpkg.json | 3 ++- ports/speex/CONTROL | 4 +++- ports/speex/portfile.cmake | 4 ++-- 8 files changed, 27 insertions(+), 33 deletions(-) diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index 9c2b40ff63460b..8adc9b03121cd3 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,5 +1,7 @@ Source: alembic Version: 1.7.13 +Port-Version: 1 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. Homepage: https://alembic.io/ +Supports: windows & !arm & !uwp \ No newline at end of file diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 58ad015dba5085..6c9a2b57d32a5d 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux") + vcpkg_buildpath_length_warning(37) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL index caf3abb43f09c0..8192383d888094 100644 --- a/ports/atkmm/CONTROL +++ b/ports/atkmm/CONTROL @@ -1,5 +1,7 @@ Source: atkmm -Version: 2.24.2-2 +Version: 2.24.2 +Port-Version: 3 Homepage: https://www.gtkmm.org Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm. Build-Depends: glib, gettext, atk, glibmm +Supports: !(linux | osx) diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake index f8e9df2943cd2f..9795881ece1a6e 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -1,4 +1,4 @@ -include(vcpkg_common_functions) +vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) @@ -32,34 +32,19 @@ vcpkg_build_msbuild( # Handle headers file(COPY ${SOURCE_PATH}/MSVC_Net2013/atkmm/atkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(COPY ${SOURCE_PATH}/atk/atkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file( - COPY - ${SOURCE_PATH}/atk/atkmm +file(COPY ${SOURCE_PATH}/atk/atkmm DESTINATION ${CURRENT_PACKAGES_DIR}/include - FILES_MATCHING PATTERN *.h -) + FILES_MATCHING PATTERN *.h) # Handle libraries -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib -) +file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) +file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) vcpkg_copy_pdbs() diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake index d18d548a060cec..8876920ab73d79 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "arm" "arm64") +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) @@ -20,4 +20,4 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/distrib/gpl.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/avisynthplus RENAME copyright) +file(INSTALL ${SOURCE_PATH}/distrib/gpl.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json index c8a8d77b0de7ed..89e362eab0b4a7 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -1,7 +1,8 @@ { "name": "avisynthplus", "version-string": "3.6.0", + "port-version": 1, "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", "homepage": "http://avs-plus.net/", - "supports": "!(uwp | arm | static)" + "supports": "windows & !arm & !uwp" } diff --git a/ports/speex/CONTROL b/ports/speex/CONTROL index 3291927c2888ba..47c04ef732d9e3 100644 --- a/ports/speex/CONTROL +++ b/ports/speex/CONTROL @@ -1,4 +1,6 @@ Source: speex -Version: 1.2.0-4 +Version: 1.2.0 +Port-Version: 5 Homepage: https://github.com/xiph/speex Description: Speex is an Open Source/Free Software patent-free audio compression format designed for speech. +Supports: !(linux | osx) \ No newline at end of file diff --git a/ports/speex/portfile.cmake b/ports/speex/portfile.cmake index 271c2bc8873c5f..1dc45ceeddb662 100644 --- a/ports/speex/portfile.cmake +++ b/ports/speex/portfile.cmake @@ -1,4 +1,4 @@ -include(vcpkg_common_functions) +vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -24,4 +24,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(WRITE "${CURRENT_PACKAGES_DIR}/include/speex/speex.h" "${_contents}") endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/speex RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From e64297ec1c0ebc3835fedad0335d19fb79592cca Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 11 Aug 2020 03:27:25 -0700 Subject: [PATCH 2/5] update supports --- ports/avisynthplus/portfile.cmake | 2 +- ports/avisynthplus/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake index 8876920ab73d79..467e8dd9174519 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux") +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_LIBRARY_LINKAGE "static" ON_TARGET "UWP" "OSX" "Linux") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json index 89e362eab0b4a7..b6796ad53c1384 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -4,5 +4,5 @@ "port-version": 1, "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", "homepage": "http://avs-plus.net/", - "supports": "windows & !arm & !uwp" + "supports": "windows & !arm & !uwp & !static" } From 20155262f8aae2825a550cf25a36123b90924cf9 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 11 Aug 2020 03:30:52 -0700 Subject: [PATCH 3/5] Remove the ports from ci.baseline file --- scripts/ci.baseline.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a6cc7c886ffb13..b08666ba74b1dc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -48,8 +48,6 @@ akali:arm-uwp=fail akali:arm64-windows=fail alac:arm-uwp=fail alac:x64-uwp=fail -alembic:x64-osx=fail -alembic:x64-windows-static=fail aliyun-oss-c-sdk:x64-linux=fail aliyun-oss-c-sdk:x64-osx=fail ampl-mp:arm64-windows=fail @@ -78,13 +76,10 @@ asyncplusplus:arm-uwp=fail asyncplusplus:x64-uwp=fail atk:x64-osx=fail atk:arm64-windows=fail -atkmm:x64-linux=fail atlmfc:x64-linux=fail atlmfc:x64-osx=fail aubio:x64-linux=fail aubio:x64-osx=fail -avisynthplus:x64-linux=fail -avisynthplus:x64-windows-static=fail avro-c:arm-uwp=fail avro-c:x64-osx=fail avro-c:x64-uwp=fail @@ -1631,8 +1626,6 @@ spdk-isal:x64-uwp=fail spdk-isal:x64-windows=fail spdk-isal:x64-windows-static=fail spdk-isal:x86-windows=fail -speex:x64-linux=fail -speex:x64-osx=fail speexdsp:x64-linux=fail speexdsp:x64-osx=fail spirv-tools:arm-uwp=fail From bdc3c1b18ec7996deffb77280621a28455430e46 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 14 Aug 2020 16:32:15 +0800 Subject: [PATCH 4/5] Update CONTROL --- ports/alembic/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index 8adc9b03121cd3..e58acda672ab63 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -4,4 +4,4 @@ Port-Version: 1 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. Homepage: https://alembic.io/ -Supports: windows & !arm & !uwp \ No newline at end of file +Supports: windows & !arm & !uwp & !static From fad7ebb95a31926082b0200cc5d82cf05ae79c7e Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 2 Sep 2020 13:14:27 -0700 Subject: [PATCH 5/5] Add VCPKG_LIBRARY_LINKAGE to vcpkg_get_tags.cmake. Thanks @strega-nil! --- scripts/vcpkg_get_tags.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/vcpkg_get_tags.cmake b/scripts/vcpkg_get_tags.cmake index 35e89149ba6cf0..bec5d933120786 100644 --- a/scripts/vcpkg_get_tags.cmake +++ b/scripts/vcpkg_get_tags.cmake @@ -11,6 +11,7 @@ VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET} VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH} VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE} +VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f") # Just to enforce the user didn't set it in the triplet file