diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-18 04:43:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 13:43:44 -0700 |
| commit | 121f3d502a8e3f88958b069a6f9c06dc6243a418 (patch) | |
| tree | 5554fdf763983b04119cacbe0c5c795c42c5d1fe | |
| parent | f18e0b4387571ccf2ee1e0a16509289876ff72b7 (diff) | |
| download | vcpkg-121f3d502a8e3f88958b069a6f9c06dc6243a418.tar.gz vcpkg-121f3d502a8e3f88958b069a6f9c06dc6243a418.zip | |
[libvpx] Support arm64-windows (#11963)
| -rw-r--r-- | ports/libvpx/CONTROL | 4 | ||||
| -rw-r--r-- | ports/libvpx/portfile.cmake | 15 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index 0ff504cd4..bc79a7e66 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,5 +1,5 @@ Source: libvpx
-Version: 1.8.1-5
+Version: 1.8.1-6
Homepage: https://github.com/webmproject/libvpx
Description: The reference software implementation for the video coding formats VP8 and VP9.
-Supports: !(uwp|arm|arm64)
+Supports: !(uwp&arm)
\ No newline at end of file diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index fd22c0eeb..ec487d5c2 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(LIBVPX_VERSION 1.8.1) @@ -19,7 +17,7 @@ vcpkg_extract_source_archive_ex( vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(PERL) -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils) @@ -44,6 +42,9 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(LIBVPX_TARGET_ARCH "x86_64-win64") set(LIBVPX_ARCH_DIR "x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(LIBVPX_TARGET_ARCH "arm64-win64") + set(LIBVPX_ARCH_DIR "ARM64") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) set(LIBVPX_TARGET_ARCH "armv7-win32") set(LIBVPX_ARCH_DIR "ARM") @@ -97,7 +98,9 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore endif() endif() - if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm) set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") else() set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") @@ -217,7 +220,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") else() set(LIBVPX_CONFIG_DEBUG OFF) endif() + configure_file(${CMAKE_CURRENT_LIST_DIR}/unofficial-libvpx-config.cmake.in ${CURRENT_PACKAGES_DIR}/share/unofficial-libvpx/unofficial-libvpx-config.cmake @ONLY) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libvpx) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libvpx/LICENSE ${CURRENT_PACKAGES_DIR}/share/libvpx/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2d2b2ea3d..b5375ab20 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -968,8 +968,6 @@ libuv:arm-uwp=fail libuv:x64-uwp=fail
libvmdk:arm-uwp=fail
libvmdk:x64-uwp=fail
-libvpx:arm-uwp=fail
-libvpx:arm64-windows=fail
libwandio:x86-windows=fail
libwandio:x64-windows=fail
libwandio:x64-windows-static=fail
|