diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-08-22 00:25:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 09:25:48 -0700 |
| commit | bb55caabbaae49a9315578b70432a5d0406b1ba1 (patch) | |
| tree | 8d3ea990fde641933d5cac6b101cdc838ec798bc | |
| parent | f6948aeb686c015d7b582aa4d76702a2f92602b1 (diff) | |
| download | vcpkg-bb55caabbaae49a9315578b70432a5d0406b1ba1.tar.gz vcpkg-bb55caabbaae49a9315578b70432a5d0406b1ba1.zip | |
[x265] Update source and version (#13048)
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
| -rw-r--r-- | ports/x265/CONTROL | 5 | ||||
| -rw-r--r-- | ports/x265/portfile.cmake | 26 |
2 files changed, 10 insertions, 21 deletions
diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index 1a1ebae22..e9d704c74 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,5 +1,4 @@ Source: x265 -Version: 3.2 -Port-Version: 5 -Homepage: https://bitbucket.org/multicoreware/x265 +Version: 3.4 +Homepage: https://github.com/videolan/x265 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/portfile.cmake b/ports/x265/portfile.cmake index 6343383f2..3b3ecbba6 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -1,17 +1,15 @@ -include(vcpkg_common_functions) - -vcpkg_from_bitbucket( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO multicoreware/x265 - REF 3.2 - SHA512 e98e26a9d3c2eb7f147ba052d9d8009e1c47e54905375b29e813f33ffddf8b7fac55ea455ae6d28ed1ade2d90f887c7cafe374873cd48b6c5e2560ddd21ccb84 + REPO videolan/x265 + REF 07295ba7ab551bb9c1580fdaee3200f1b45711b7 #v3.4 + SHA512 21a4ef8733a9011eec8b336106c835fbe04689e3a1b820acb11205e35d2baba8c786d9d8cf5f395e78277f921857e4eb8622cf2ef3597bce952d374f7fe9ec29 HEAD_REF master PATCHES disable-install-pdb.patch ) set(ENABLE_ASSEMBLY OFF) -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if (VCPKG_TARGET_IS_WINDOWS) vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") @@ -36,26 +34,19 @@ vcpkg_copy_pdbs() # remove duplicated include files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/x265) - -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265 ${CURRENT_PACKAGES_DIR}/tools/x265/x265) -elseif(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265.exe ${CURRENT_PACKAGES_DIR}/tools/x265/x265.exe) -endif() +vcpkg_copy_tools(TOOL_NAMES x265 AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/x265) - if(WIN32 AND (NOT MINGW)) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") endif() endif() + if(UNIX) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES numa) else() @@ -63,5 +54,4 @@ else() endif() # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/x265) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/x265/COPYING ${CURRENT_PACKAGES_DIR}/share/x265/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |