[libde265] update to v1.0.11 (#31413)

* update to 1.0.11

* fix usage issue

* fix patch

* remove useless patch
This commit is contained in:
Mengna Li 2023-05-14 00:33:38 +08:00 committed by GitHub
parent ed8fb07a8b
commit 43150d9aa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 32 deletions

View File

@ -0,0 +1,13 @@
diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt
index d0d6762..06e1660 100644
--- a/libde265/CMakeLists.txt
+++ b/libde265/CMakeLists.txt
@@ -114,7 +114,7 @@ endif()
add_library(de265 ${libde265_sources} ${ENCODER_OBJECTS} ${X86_OBJECTS})
target_link_libraries(de265 PRIVATE Threads::Threads)
-target_include_directories(de265 PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(de265 PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}> PUBLIC $<INSTALL_INTERFACE:include>)
write_basic_package_version_file(libde265ConfigVersion.cmake COMPATIBILITY ExactVersion)

View File

@ -1,21 +0,0 @@
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}")

View File

@ -1,13 +1,11 @@
# Used for .pc file
set(VERSION "1.0.8")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO strukturag/libde265
REF 8aed7472df0af25b811828fa14f2f169dc34d35a # v1.0.8
SHA512 e2da1436e5b0d8a3841087e879fbbff5a92de4ebb69d097959972ec8c9407305bc2a17020cb46139fbacc84f91ff8cfb4d9547308074ba213e002ee36bb2e006
REF "v${VERSION}"
SHA512 aa744c521fb15e68940956f70997ab969094aee1c129d404ee9a52f318248353bb8d53250b575b4040402645e44701086b78143f1e1122b61a925e9b6cd07566
HEAD_REF master
PATCHES
fix-libde265-headers.patch
fix-interface-include.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -24,7 +22,7 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libde265)
vcpkg_copy_tools(TOOL_NAMES dec265 enc265 AUTO_CLEAN)
vcpkg_copy_tools(TOOL_NAMES dec265 AUTO_CLEAN)
set(prefix "")
set(exec_prefix [[${prefix}]])
@ -51,4 +49,4 @@ else()
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

View File

@ -1,7 +1,6 @@
{
"name": "libde265",
"version": "1.0.8",
"port-version": 7,
"version": "1.0.11",
"description": "Open h.265 video codec implementation.",
"homepage": "https://www.libde265.org/",
"license": "LGPL-3.0-only",

View File

@ -3921,8 +3921,8 @@
"port-version": 1
},
"libde265": {
"baseline": "1.0.8",
"port-version": 7
"baseline": "1.0.11",
"port-version": 0
},
"libdeflate": {
"baseline": "1.17",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3c0c0eec97e9b7d9a46d6f1f5fb22c5b07aa5550",
"version": "1.0.11",
"port-version": 0
},
{
"git-tree": "bba9b6bf501c046f81f7335d1efff23ed0845ed4",
"version": "1.0.8",