diff options
| -rw-r--r-- | ports/x264/CONTROL | 6 | ||||
| -rw-r--r-- | ports/x264/portfile.cmake | 11 | ||||
| -rw-r--r-- | ports/x264/vcpkg.json | 14 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/x-/x264.json | 5 |
6 files changed, 27 insertions, 15 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" + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ea21ced9a..11db8efbd 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1657,10 +1657,6 @@ wpilib:arm64-windows=fail wpilib:x64-osx=fail wxchartdir:x64-osx=fail wxwidgets:x64-linux=fail -x264:arm64-windows=fail -x264:arm-uwp=fail -x264:x64-uwp=fail -x264:x64-osx=fail x265:arm64-windows=fail x265:arm-uwp=fail x265:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 5144e658f..9bcb80927 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6178,7 +6178,7 @@ }, "x264": { "baseline": "157-303c484ec828ed0", - "port-version": 14 + "port-version": 15 }, "x265": { "baseline": "3.4", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index e71a19f16..d129da3b5 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e766671c5f64574235784ce45b1668daf4cb9b44", + "version-string": "157-303c484ec828ed0", + "port-version": 15 + }, + { "git-tree": "5e7b1b08a47363a45799c196a1a8442e9b02f882", "version-string": "157-303c484ec828ed0", "port-version": 14 |