From bf9ebecd0372d572fe25b60911ad864663052e74 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 29 Jul 2026 07:00:46 +0000 Subject: [PATCH] libebml: upgrade 1.4.5 -> 1.4.7 Upstream changes (ChangeLog): * 1.4.6: mark EbmlHead as not-infinite per RFC 8794; fix leak on upper element found inside the last element; EbmlString::ReadFully and EbmlUnicodeString use std::string / automatic memory management; IOCallback avoids reading more than 2^32 at once; fix includes not implicit in modern compilers; download utfcpp automatically; add a DEV_MODE CMake option and a build-configuration summary. * 1.4.7: fix cmake rules for building with utf8cpp 4.x (upstream #344). libebml now uses utf8cpp (utfcpp) for Unicode string handling rather than a bundled copy: CMakeLists does find_package(utf8cpp) and otherwise FetchContent-downloads it. Add DEPENDS = "utfcpp" (OE-core provides utfcpp 4.1.1) so the system copy is used and the offline build resolves utf8cpp::utf8cpp. Drop 0001-allow-build-with-cmake-4.patch: it backported the cmake_minimum_required(VERSION 3.5) bump that is now in 1.4.7 upstream. Update the LICENSE.LGPL checksum for an upstream reformatting of the license file (content still LGPL-2.1-only). Signed-off-by: Khem Raj --- .../0001-allow-build-with-cmake-4.patch | 40 ------------------- .../{libebml_1.4.5.bb => libebml_1.4.7.bb} | 9 +++-- 2 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 meta-multimedia/recipes-mkv/libebml/libebml/0001-allow-build-with-cmake-4.patch rename meta-multimedia/recipes-mkv/libebml/{libebml_1.4.5.bb => libebml_1.4.7.bb} (57%) diff --git a/meta-multimedia/recipes-mkv/libebml/libebml/0001-allow-build-with-cmake-4.patch b/meta-multimedia/recipes-mkv/libebml/libebml/0001-allow-build-with-cmake-4.patch deleted file mode 100644 index f62d412ac4..0000000000 --- a/meta-multimedia/recipes-mkv/libebml/libebml/0001-allow-build-with-cmake-4.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b54451a2cc63672284c7768ecf5562214826ea50 Mon Sep 17 00:00:00 2001 -From: Alper Ak -Date: Tue, 8 Jul 2025 17:15:08 +0300 -Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ - compatibility - -Fix: - -| CMake Error at CMakeLists.txt:1 (cmake_minimum_required): -| Compatibility with CMake < 3.5 has been removed from CMake. -| -| Update the VERSION argument value. Or, use the ... syntax -| to tell CMake that the project requires at least but has been updated -| to work with policies introduced by or earlier. -| -| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. -| -| -| -- Configuring incomplete, errors occurred! - -Upstream-Status: Backport [https://github.com/Matroska-Org/libebml/commit/cc63f6b3ed2007a3ef04206a26f9ad5a657331bd] - -Signed-off-by: Alper Ak ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b168a38..a8b789f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1.2) -+cmake_minimum_required(VERSION 3.5) - - project(ebml VERSION 1.4.5) - --- -2.43.0 - diff --git a/meta-multimedia/recipes-mkv/libebml/libebml_1.4.5.bb b/meta-multimedia/recipes-mkv/libebml/libebml_1.4.7.bb similarity index 57% rename from meta-multimedia/recipes-mkv/libebml/libebml_1.4.5.bb rename to meta-multimedia/recipes-mkv/libebml/libebml_1.4.7.bb index 1bc56b788b..a6948e091d 100644 --- a/meta-multimedia/recipes-mkv/libebml/libebml_1.4.5.bb +++ b/meta-multimedia/recipes-mkv/libebml/libebml_1.4.7.bb @@ -1,12 +1,13 @@ SUMMARY = "C++ library to parse EBML files" HOMEPAGE = "https://github.com/Matroska-Org/libebml" LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=3254c7b4d4712a396bd036bfb211a908" -SRC_URI = "git://github.com/Matroska-Org/libebml.git;branch=v1.x;protocol=https \ - file://0001-allow-build-with-cmake-4.patch" +SRC_URI = "git://github.com/Matroska-Org/libebml.git;branch=v1.x;protocol=https" -SRCREV = "1878e784321673561039a6a37076b2736f4dc98f" +SRCREV = "3e72a85de45cbb385d225a0a60eb3c9114743dd8" + +DEPENDS = "utfcpp" inherit pkgconfig cmake dos2unix