aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>2020-11-19 05:09:26 +0800
committerGitHub <noreply@github.com>2020-11-18 13:09:26 -0800
commitf08e44a3011117df157ee4eac9e8bd63737d2c8c (patch)
tree40a35d5130f904a59c87ea5eb7559e3e61e2d7eb
parent97a2954d072b8b492c93d5cab7be80524f20d65c (diff)
downloadvcpkg-f08e44a3011117df157ee4eac9e8bd63737d2c8c.tar.gz
vcpkg-f08e44a3011117df157ee4eac9e8bd63737d2c8c.zip
[libde265] Updated to v1.0.8 (#14497)
* [lua] update to 5.4.1 * [libde265] update to 1.0.8 * Handling lua file conflicts * Updated libde265 to v1.0.8 * Updated libde265 to v1.0.8 * Updated libde265 to v1.0.8 * Updated libde265 to v1.0.8 * [libde265] update to 1.0.8
-rw-r--r--ports/libde265/CONTROL2
-rw-r--r--ports/libde265/fix-libde265-headers.patch21
-rw-r--r--ports/libde265/portfile.cmake7
3 files changed, 27 insertions, 3 deletions
diff --git a/ports/libde265/CONTROL b/ports/libde265/CONTROL
index 09ab2f231..898e0fe12 100644
--- a/ports/libde265/CONTROL
+++ b/ports/libde265/CONTROL
@@ -1,5 +1,5 @@
Source: libde265
-Version: 1.0.5
+Version: 1.0.8
Homepage: https://www.libde265.org/
Description: Open h.265 video codec implementation.
Supports: !(arm|uwp)
diff --git a/ports/libde265/fix-libde265-headers.patch b/ports/libde265/fix-libde265-headers.patch
new file mode 100644
index 000000000..fac2e35a8
--- /dev/null
+++ b/ports/libde265/fix-libde265-headers.patch
@@ -0,0 +1,21 @@
+diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt
+index 749c7fb..45e7419 100644
+--- a/libde265/CMakeLists.txt
++++ b/libde265/CMakeLists.txt
+@@ -43,7 +43,7 @@ set (libde265_headers
+ bitstream.h
+ cabac.h
+ configparam.h
+- de265-version.h
++ ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h
+ contextmodel.h
+ de265.h
+ deblock.h
+@@ -119,7 +119,6 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
+ )
+
+ install(FILES ${libde265_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+
+ install(EXPORT ${PROJECT_NAME}Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+
diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake
index 70cfe2e30..40ae383c5 100644
--- a/ports/libde265/portfile.cmake
+++ b/ports/libde265/portfile.cmake
@@ -3,9 +3,11 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO strukturag/libde265
- REF v1.0.5
- SHA512 3ff7310fc4621cac0ef1cb9bbc4df61724f8943d57f5263a3663a77f4d90d84716b2a708ee9fec306e909dc8b5e7fe645a641b6a6db795a89a01799be910831e
+ REF 8aed7472df0af25b811828fa14f2f169dc34d35a # v1.0.8
+ SHA512 e2da1436e5b0d8a3841087e879fbbff5a92de4ebb69d097959972ec8c9407305bc2a17020cb46139fbacc84f91ff8cfb4d9547308074ba213e002ee36bb2e006
HEAD_REF master
+ PATCHES
+ fix-libde265-headers.patch
)
vcpkg_configure_cmake(
@@ -15,6 +17,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libde265/)
+vcpkg_copy_tools(TOOL_NAMES dec265 enc265 AUTO_CLEAN)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")