diff options
| author | kiwixz <kiwixz@outlook.com> | 2019-02-22 01:05:19 +0000 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-02-21 17:05:19 -0800 |
| commit | 9446cc6729a9afbdcfe010bf0408ab703eee31a9 (patch) | |
| tree | 5252ad6f618b3caf09bc48b77f370e6c1733cc14 /ports | |
| parent | 9aad2e8f3342a09bb1c70f552431a129895bd063 (diff) | |
| download | vcpkg-9446cc6729a9afbdcfe010bf0408ab703eee31a9.tar.gz vcpkg-9446cc6729a9afbdcfe010bf0408ab703eee31a9.zip | |
[x265] upgrade to 3.0, enable assembly (upgrade nasm to 2.14) (#5389)
* [acquire nasm] upgrade to 2.14
* [x265] upgrade to 3.0, enable assembly
* [x265] Enable assembly only on Windows
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/x265/CONTROL | 2 | ||||
| -rw-r--r-- | ports/x265/disable-install-pdb.patch | 2 | ||||
| -rw-r--r-- | ports/x265/portfile.cmake | 19 |
3 files changed, 17 insertions, 6 deletions
diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index f2185d2f0..ae598d613 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,3 +1,3 @@ Source: x265 -Version: 2.9-2 +Version: 3.0-1 Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream. diff --git a/ports/x265/disable-install-pdb.patch b/ports/x265/disable-install-pdb.patch index 1b58d287c..4d57d764b 100644 --- a/ports/x265/disable-install-pdb.patch +++ b/ports/x265/disable-install-pdb.patch @@ -2,7 +2,7 @@ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 33b6523..06e3193 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
-@@ -556,13 +556,13 @@ endif()
+@@ -559,13 +559,13 @@ endif()
install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
if(MSVC_IDE)
diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 87f11c4f4..6b207baf3 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO multicoreware/x265 - REF 2.9 - SHA512 5bd9732b6af67e7f7c5b1e71d26acbd98fb98e9e81c6052cda2e1e9254e3eaaa28914805d3f8cd2535dd042022047e54f8ae49ea02269160b609d191a7d99e94 + REF 3.0 + SHA512 698fd31bf30c65896717225de69714523bcbd3d835474f777bf32c3a6d6dbbf941a09db076e13e76917a5ca014c89fca924fcb0ea3d15bc09748b6fc834a4ba2 HEAD_REF master ) @@ -13,13 +13,24 @@ vcpkg_apply_patches( PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-install-pdb.patch ) +set(ENABLE_ASSEMBLY OFF) +if (WIN32) + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) + set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") + set(ENABLE_ASSEMBLY ON) +endif () + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/source PREFER_NINJA - OPTIONS -DENABLE_SHARED=${ENABLE_SHARED} - OPTIONS_DEBUG -DENABLE_CLI=OFF + OPTIONS + -DENABLE_ASSEMBLY=${ENABLE_ASSEMBLY} + -DENABLE_SHARED=${ENABLE_SHARED} + OPTIONS_DEBUG + -DENABLE_CLI=OFF ) vcpkg_install_cmake() |