diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-01-27 06:55:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 14:55:06 -0800 |
| commit | 9caf3d87d57601d2e0857f309ec9e88754a68080 (patch) | |
| tree | b5dc09324e3ccf9d12755b54ce673943cc34268d /ports | |
| parent | 60d7d91c7105a2ba821a450ea4ba336dfbf14719 (diff) | |
| download | vcpkg-9caf3d87d57601d2e0857f309ec9e88754a68080.tar.gz vcpkg-9caf3d87d57601d2e0857f309ec9e88754a68080.zip | |
[x264] Fix build failed on uwp (#15769)
* [x264] Fix build failed on uwp
* Update port_versions
* [x264] Fix build failed on uwp
* Update port_versions
* Update baseline
* Add supports
* Update versions/x-/x264.json
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/x264/CONTROL | 6 | ||||
| -rw-r--r-- | ports/x264/portfile.cmake | 11 | ||||
| -rw-r--r-- | ports/x264/vcpkg.json | 14 |
3 files changed, 21 insertions, 10 deletions
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL deleted file mode 100644 index 73d74549a..000000000 --- a/ports/x264/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: x264 -Version: 157-303c484ec828ed0 -Port-Version: 14 -Homepage: https://github.com/mirror/x264 -Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format -Build-Depends: pthread (linux&osx) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 32bc1c020..abd2f1d55 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -1,6 +1,6 @@ set(X264_VERSION 157) -vcpkg_fail_port_install(ON_TARGET "OSX") +vcpkg_fail_port_install(ON_ARCH "arm") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -14,7 +14,7 @@ vcpkg_from_github( vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") +vcpkg_add_to_path(${NASM_EXE_PATH}) if(VCPKG_TARGET_IS_WINDOWS) _vcpkg_determine_autotools_host_cpu(BUILD_ARCH) @@ -51,7 +51,10 @@ vcpkg_configure_make( ) vcpkg_install_make() -vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) + +if(NOT VCPKG_TARGET_IS_UWP) + vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -81,7 +84,7 @@ elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") ) endif() -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES -lpthread -lm -ldl) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json new file mode 100644 index 000000000..128d8ccf4 --- /dev/null +++ b/ports/x264/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "x264", + "version-string": "157-303c484ec828ed0", + "port-version": 15, + "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", + "homepage": "https://github.com/mirror/x264", + "supports": "!arm", + "dependencies": [ + { + "name": "pthread", + "platform": "linux & osx" + } + ] +} |