diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-01-15 13:29:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-15 13:29:17 -0800 |
| commit | 8470773407b1bad7e37e1f0ece4f48dec91f3a92 (patch) | |
| tree | 5e7e877aae884f9d28e278b09b0772c98b6e6566 | |
| parent | e86780d75ffb4476f58c725d40e2456eb503b766 (diff) | |
| parent | 4b0b4c8c4f307cf4592b205d5a30f13a87d29aa8 (diff) | |
| download | vcpkg-8470773407b1bad7e37e1f0ece4f48dec91f3a92.tar.gz vcpkg-8470773407b1bad7e37e1f0ece4f48dec91f3a92.zip | |
Merge pull request #5156 from Dagizmo/master
[x265] update to version 2.9
| -rw-r--r-- | ports/x265/CONTROL | 2 | ||||
| -rw-r--r-- | ports/x265/disable-install-pdb.patch | 25 | ||||
| -rw-r--r-- | ports/x265/portfile.cmake | 4 |
3 files changed, 20 insertions, 11 deletions
diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index 87e1867bd..537556763 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,3 +1,3 @@ Source: x265 -Version: 2.7-1 +Version: 2.9-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 4601f2728..1b58d287c 100644 --- a/ports/x265/disable-install-pdb.patch +++ b/ports/x265/disable-install-pdb.patch @@ -1,13 +1,22 @@ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index e6d49c6..2409caa 100644
+index 33b6523..06e3193 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
-@@ -546,7 +546,7 @@ if(ENABLE_HDR10_PLUS)
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
- endif()
+@@ -556,13 +556,13 @@ endif()
install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
--if(WIN32)
-+if(WIN32 AND 0)
+ if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
if(MSVC_IDE)
- install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
- install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
+- install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
+- install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
++ #install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
++ #install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
+ install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)
+ install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY)
+ else()
+- install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
+- install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
++ #install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
++ #install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
+ install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)
+ install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY)
+ endif()
diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 0ab99b7d2..090a2db22 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.7 - SHA512 fd2f43830bbe4fa0ac98ac6d8e3689d0a8a5142da9d67c0dd16fbbde40500c52a370c5c5a30e93195c2e998660a51abab76b09baed87378c9e366cf2f694f2b9 + REF 2.9 + SHA512 5bd9732b6af67e7f7c5b1e71d26acbd98fb98e9e81c6052cda2e1e9254e3eaaa28914805d3f8cd2535dd042022047e54f8ae49ea02269160b609d191a7d99e94 HEAD_REF master ) |