Skip to content

Commit

Permalink
[many ports] Add supports (#12857)
Browse files Browse the repository at this point in the history
Co-authored-by: Billy Robert O'Neal <[email protected]>
  • Loading branch information
PhoebeHui and BillyONeal authored Sep 3, 2020
1 parent 619b294 commit e7dc93f
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 40 deletions.
2 changes: 2 additions & 0 deletions ports/alembic/CONTROL
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions ports/alembic/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 3 additions & 1 deletion ports/atkmm/CONTROL
Original file line number Diff line number Diff line change
@@ -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)
37 changes: 11 additions & 26 deletions ports/atkmm/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(vcpkg_common_functions)
vcpkg_fail_port_install(ON_TARGET "OSX" "Linux")

vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

Expand Down Expand Up @@ -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()

Expand Down
4 changes: 2 additions & 2 deletions ports/avisynthplus/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -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)
3 changes: 2 additions & 1 deletion ports/avisynthplus/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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"
}
3 changes: 2 additions & 1 deletion ports/speex/CONTROL
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions ports/speex/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(vcpkg_common_functions)
vcpkg_fail_port_install(ON_TARGET "OSX" "Linux")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
Expand Down Expand Up @@ -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)
7 changes: 0 additions & 7 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions scripts/vcpkg_get_tags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e7dc93f

Please sign in to comment.