mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[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
This commit is contained in:
parent
9aad2e8f33
commit
9446cc6729
@ -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.
|
||||
|
@ -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)
|
||||
|
@ -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()
|
||||
|
@ -58,15 +58,12 @@ function(vcpkg_find_acquire_program VAR)
|
||||
set(HASH a6e685ea24376f50db5f06c5b46075f1d3be25168fa1f27fa9b02e2ac017826cee62a2b43562f9b6c989337a231ba914416c110075457764de2d11f99d5e0f26)
|
||||
elseif(VAR MATCHES "NASM")
|
||||
set(PROGNAME nasm)
|
||||
set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.12.02)
|
||||
set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.14)
|
||||
set(BREW_PACKAGE_NAME "nasm")
|
||||
set(APT_PACKAGE_NAME "nasm")
|
||||
set(URL
|
||||
"http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip"
|
||||
"http://mirrors.kodi.tv/build-deps/win32/nasm-2.12.02-win32.zip"
|
||||
)
|
||||
set(ARCHIVE "nasm-2.12.02-win32.zip")
|
||||
set(HASH df7aaba094e17832688c88993997612a2e2c96cc3dc14ca3e8347b44c7762115f5a7fc6d7f20be402553aaa4c9e43ddfcf6228f581cfe89289bae550de151b36)
|
||||
set(URL "http://www.nasm.us/pub/nasm/releasebuilds/2.14/win32/nasm-2.14-win32.zip")
|
||||
set(ARCHIVE "nasm-2.14-win32.zip")
|
||||
set(HASH 64481b0346b83de8c9568f04a54f68e0f4c71724afa0b414f12e4080951d8c49e489bfc32117f9a489e3e49477b1cadc583c672311316d27c543af304c4b7f2a)
|
||||
elseif(VAR MATCHES "YASM")
|
||||
set(PROGNAME yasm)
|
||||
set(SUBDIR 1.3.0.6)
|
||||
|
Loading…
x
Reference in New Issue
Block a user