diff --git a/ports/libde265/fix-interface-include.patch b/ports/libde265/fix-interface-include.patch new file mode 100644 index 0000000000..1e252c5040 --- /dev/null +++ b/ports/libde265/fix-interface-include.patch @@ -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 $ PUBLIC $) + + write_basic_package_version_file(libde265ConfigVersion.cmake COMPATIBILITY ExactVersion) + diff --git a/ports/libde265/fix-libde265-headers.patch b/ports/libde265/fix-libde265-headers.patch deleted file mode 100644 index fac2e35a86..0000000000 --- a/ports/libde265/fix-libde265-headers.patch +++ /dev/null @@ -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}") - diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 87418395ba..38ab301905 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -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") diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index f0882e2027..940bd7d347 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index dd0b82fec4..a99b30b238 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index c7bb6e8527..a20109b7e0 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c0c0eec97e9b7d9a46d6f1f5fb22c5b07aa5550", + "version": "1.0.11", + "port-version": 0 + }, { "git-tree": "bba9b6bf501c046f81f7335d1efff23ed0845ed4", "version": "1.0.8",