aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2020-09-03 10:59:31 -0700
committerGitHub <noreply@github.com>2020-09-03 10:59:31 -0700
commite7dc93f2026c171073bc30e3f8235c9caba419bc (patch)
tree9943e73066cca5b1bacd9aeff91b94eaa97732ee
parent619b29470031781e0c787eff32dbc7d8568bdbe6 (diff)
downloadvcpkg-e7dc93f2026c171073bc30e3f8235c9caba419bc.tar.gz
vcpkg-e7dc93f2026c171073bc30e3f8235c9caba419bc.zip
[many ports] Add supports (#12857)
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
-rw-r--r--ports/alembic/CONTROL2
-rw-r--r--ports/alembic/portfile.cmake2
-rw-r--r--ports/atkmm/CONTROL4
-rw-r--r--ports/atkmm/portfile.cmake37
-rw-r--r--ports/avisynthplus/portfile.cmake4
-rw-r--r--ports/avisynthplus/vcpkg.json3
-rw-r--r--ports/speex/CONTROL3
-rw-r--r--ports/speex/portfile.cmake4
-rw-r--r--scripts/ci.baseline.txt7
-rw-r--r--scripts/vcpkg_get_tags.cmake1
10 files changed, 27 insertions, 40 deletions
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL
index 9c2b40ff6..e58acda67 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 & !static
diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake
index 58ad015db..6c9a2b57d 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 caf3abb43..8192383d8 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 f8e9df294..9795881ec 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 d18d548a0..467e8dd91 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_LIBRARY_LINKAGE "static" 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 c8a8d77b0..b6796ad53 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 & !static"
}
diff --git a/ports/speex/CONTROL b/ports/speex/CONTROL
index 1a6b9d149..0185b9b07 100644
--- a/ports/speex/CONTROL
+++ b/ports/speex/CONTROL
@@ -1,5 +1,6 @@
Source: speex
Version: 1.2.0
-Port-Version: 6
+Port-Version: 7
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 f1deabc79..a8431db76 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
@@ -28,4 +28,4 @@ endif()
vcpkg_fixup_pkgconfig()
-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)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 611c612b9..edae43608 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
@@ -1650,8 +1645,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
diff --git a/scripts/vcpkg_get_tags.cmake b/scripts/vcpkg_get_tags.cmake
index 35e89149b..bec5d9331 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