From f765e03d7d7fc24a80c724608c8fc72b49cbcf3d Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 29 May 2026 18:19:43 +0900 Subject: [PATCH] [libmediainfo] update to 26.5 (#51737) --- ports/libmediainfo/dependencies.diff | 116 +++++++++++++-------------- ports/libmediainfo/portfile.cmake | 2 +- ports/libmediainfo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmediainfo.json | 5 ++ 5 files changed, 66 insertions(+), 61 deletions(-) diff --git a/ports/libmediainfo/dependencies.diff b/ports/libmediainfo/dependencies.diff index 2bf3e74f6d..9870e713fa 100644 --- a/ports/libmediainfo/dependencies.diff +++ b/ports/libmediainfo/dependencies.diff @@ -1,69 +1,69 @@ diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt -index 700dce3..449a6dd 100644 +index 76612e2..089e1d0 100644 --- a/Project/CMake/CMakeLists.txt +++ b/Project/CMake/CMakeLists.txt -@@ -80,7 +80,7 @@ endif() - set(MediaInfoLib_SOURCES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../Source) - - # use bundled tinyxml only if no system --find_package(TinyXML) -+find_package(TinyXML NAMES TinyXML2 REQUIRED) - - # use system curl if is present - find_package(CURL) -@@ -389,8 +389,7 @@ target_compile_definitions(mediainfo PRIVATE FMT_UNICODE=0) - if(NOT CURL_FOUND) - target_compile_definitions(mediainfo PRIVATE MEDIAINFO_LIBCURL_NO) - else() -- include_directories(${CURL_INCLUDE_DIRS}) -- target_link_libraries(mediainfo ${CURL_LIBRARIES}) -+ target_link_libraries(mediainfo PRIVATE CURL::libcurl) - set(CURL_PC " libcurl") - set(CURL_LIB " -lcurl") - endif() -@@ -411,14 +410,14 @@ target_include_directories(mediainfo PRIVATE - if(NOT TinyXML_FOUND) - target_include_directories(mediainfo PRIVATE ${MediaInfoLib_SOURCES_PATH}/ThirdParty/tinyxml2/) - else() -- target_link_libraries(mediainfo "${TinyXML_LIBRARIES}") -+ target_link_libraries(mediainfo PRIVATE tinyxml2::tinyxml2) - endif() - - if(BUILD_ZENLIB) - target_include_directories(mediainfo PRIVATE ${ZLIB_INCLUDE_DIRS}) - endif() - --target_link_libraries(mediainfo ${ZenLib_LIBRARY} ${ZLIB_LIBRARIES}) -+target_link_libraries(mediainfo PUBLIC zen PRIVATE ZLIB::ZLIB) - - if(MSVC AND BUILD_SHARED_LIBS) - install(FILES $ DESTINATION ${BIN_INSTALL_DIR} OPTIONAL) +@@ -97,7 +97,7 @@ endif() + set(MediaInfoLib_SOURCES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../Source) + + # use bundled tinyxml only if no system +-find_package(TinyXML) ++find_package(TinyXML NAMES TinyXML2 REQUIRED) + + # use system curl if is present + find_package(CURL) +@@ -425,8 +425,7 @@ target_compile_definitions(mediainfo PRIVATE FMT_UNICODE=0) + if(NOT CURL_FOUND) + target_compile_definitions(mediainfo PRIVATE MEDIAINFO_LIBCURL_DLL_RUNTIME) + else() +- include_directories(${CURL_INCLUDE_DIRS}) +- target_link_libraries(mediainfo ${CURL_LIBRARIES}) ++ target_link_libraries(mediainfo PRIVATE CURL::libcurl) + set(CURL_PC " libcurl") + set(CURL_LIB " -lcurl") + endif() +@@ -447,14 +446,14 @@ target_include_directories(mediainfo PRIVATE + if(NOT TinyXML_FOUND) + target_include_directories(mediainfo PRIVATE ${MediaInfoLib_SOURCES_PATH}/ThirdParty/tinyxml2/) + else() +- target_link_libraries(mediainfo "${TinyXML_LIBRARIES}") ++ target_link_libraries(mediainfo PRIVATE tinyxml2::tinyxml2) + endif() + + if(BUILD_ZENLIB) + target_include_directories(mediainfo PRIVATE ${ZLIB_INCLUDE_DIRS}) + endif() + +-target_link_libraries(mediainfo ${ZenLib_LIBRARY} ${ZLIB_LIBRARIES}) ++target_link_libraries(mediainfo PUBLIC zen PRIVATE ZLIB::ZLIB) + + if(MSVC AND BUILD_SHARED_LIBS) + install(FILES $ DESTINATION ${BIN_INSTALL_DIR} OPTIONAL) diff --git a/Project/CMake/MediaInfoLibConfig.cmake.in b/Project/CMake/MediaInfoLibConfig.cmake.in -index 76fec5d..97d8286 100644 +index cf05a8b..18b1d05 100644 --- a/Project/CMake/MediaInfoLibConfig.cmake.in +++ b/Project/CMake/MediaInfoLibConfig.cmake.in @@ -1,3 +1,11 @@ -+include(CMakeFindDependencyMacro) -+find_dependency(tinyxml2 CONFIG) -+find_dependency(ZenLib CONFIG) -+find_dependency(ZLIB) -+if("@VCPKG_LOCK_FIND_PACKAGE_CURL@") -+ find_dependency(CURL) -+endif() -+ - # known at buildtime - set(MediaInfoLib_VERSION "@MediaInfoLib_VERSION@") - set(MediaInfoLib_VERSION_MAJOR @MediaInfoLib_MAJOR_VERSION@) ++include(CMakeFindDependencyMacro) ++find_dependency(tinyxml2 CONFIG) ++find_dependency(ZenLib CONFIG) ++find_dependency(ZLIB) ++if("@VCPKG_LOCK_FIND_PACKAGE_CURL@") ++ find_dependency(CURL) ++endif() ++ + # known at buildtime + set(MediaInfoLib_VERSION "@MediaInfoLib_VERSION@") + set(MediaInfoLib_VERSION_MAJOR @MediaInfoLib_MAJOR_VERSION@) diff --git a/Project/CMake/libmediainfo.pc.in b/Project/CMake/libmediainfo.pc.in -index 31e53fe..2382088 100644 +index e712582..06662ef 100644 --- a/Project/CMake/libmediainfo.pc.in +++ b/Project/CMake/libmediainfo.pc.in @@ -8,6 +8,6 @@ Name: libmediainfo - Version: @MediaInfoLib_VERSION@ - Description: MediaInfoLib - Requires: libzen --Requires.private:@CURL_PC@ --Libs: -L${libdir} -lmediainfo -lz -+Requires.private: @CURL_PC@ tinyxml2 zlib -+Libs: -L${libdir} -lmediainfo - Cflags: -I${includedir} + Version: @MediaInfoLib_VERSION@ + Description: MediaInfoLib + Requires: libzen +-Requires.private:@CURL_PC@ +-Libs: -L${libdir} -lmediainfo -lz ++Requires.private: @CURL_PC@ tinyxml2 zlib ++Libs: -L${libdir} -lmediainfo + Cflags: -I${includedir} diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake index e29b37a007..6d97900a6f 100644 --- a/ports/libmediainfo/portfile.cmake +++ b/ports/libmediainfo/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/MediaInfoLib REF "v${MEDIAINFO_VERSION}" - SHA512 fec7b3107b34b2d2235e85fb610e9f6d7f51065cc3c07eb2bd22df8a8b8476ced13ef050b0ecd5dadd7997a740b4402d97367ab06031e540ca09bece6165430d + SHA512 31ceaeb9495443c5e87013474d43b1a3f98a5c9d7b203ddc1fafefde623dfa8318a0569f8cd627251b8fb525540eb411f8cd018c1cae113290609c6b09b6b8c8 HEAD_REF master PATCHES dependencies.diff diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json index c87eb6995b..4df9935930 100644 --- a/ports/libmediainfo/vcpkg.json +++ b/ports/libmediainfo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmediainfo", - "version": "26.1", + "version": "26.5", "description": "Get most relevant technical and tag data from video and audio files", "homepage": "https://github.com/MediaArea/MediaInfoLib", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 444527c495..0bcb558ed8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5269,7 +5269,7 @@ "port-version": 0 }, "libmediainfo": { - "baseline": "26.1", + "baseline": "26.5", "port-version": 0 }, "libmem": { diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json index 39867aac6e..ae28f64c86 100644 --- a/versions/l-/libmediainfo.json +++ b/versions/l-/libmediainfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba769f1b300916bb3a0866edf3eb99afc36cce5f", + "version": "26.5", + "port-version": 0 + }, { "git-tree": "c90cb5fc6fc4a447ac78cfc28974e185ab76d624", "version": "26.1",