From 74ef26d0ecc2c0962415cc0def7d65e17902bb5f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 29 Jul 2026 07:08:42 +0000 Subject: [PATCH] libmatroska: upgrade 1.7.1 -> 1.7.2 Upstream changes (NEWS.md): * Disallow infinite sizes on all Master elements except Segment+Cluster and restrict KaxSeekId to 4 bytes, per RFC 9559. * KaxBlock releases read buffers on EndOfStream error; catch some internal allocation failures. * Deprecate KaxTrackMinCache/KaxTrackMaxCache and KaxTrackOverlay (per RFC 9559); add missing MatroskaChapProcessCodecID enum and MATROSKA_CHAPTERSKIPTYPE_INTERMISSION. * Fix MATROSKA_VIDEO_FIELDORDER_{TOP,BOTTOM}FIELDSWAPPED values. * [API break] remove MatroskaChapterTranslateCodec / MatroskaTrackTranslateCodec. * Fix includes not implicit in modern compilers; add a DEV_MODE CMake option and a build-configuration summary. Drop 0001-allow-build-with-cmake-4.patch: 1.7.2 already sets cmake_minimum_required(VERSION 3.5). LICENSE.LGPL is unchanged. Signed-off-by: Khem Raj --- .../0001-allow-build-with-cmake-4.patch | 40 ------------------- ...matroska_1.7.1.bb => libmatroska_1.7.2.bb} | 5 +-- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-allow-build-with-cmake-4.patch rename meta-multimedia/recipes-mkv/libmatroska/{libmatroska_1.7.1.bb => libmatroska_1.7.2.bb} (79%) diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-allow-build-with-cmake-4.patch b/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-allow-build-with-cmake-4.patch deleted file mode 100644 index ba4ccadd20..0000000000 --- a/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-allow-build-with-cmake-4.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 193661ce9dcc956bf609065df6cbd753a3cbd8e0 Mon Sep 17 00:00:00 2001 -From: Alper Ak -Date: Fri, 11 Jul 2025 16:18:41 +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/libmatroska/commit/dc80e194e93e6f0e25c8ad3e015d83aca2a99e10] - -Signed-off-by: Alper Ak ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8fed3ca..63ac23d 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(matroska VERSION 1.7.1) - --- -2.43.0 - diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.2.bb similarity index 79% rename from meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb rename to meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.2.bb index 164783a34f..a368c90d19 100644 --- a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb +++ b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.2.bb @@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libebml" -SRC_URI = "git://github.com/Matroska-Org/libmatroska.git;branch=v1.x;protocol=https \ - file://0001-allow-build-with-cmake-4.patch" +SRC_URI = "git://github.com/Matroska-Org/libmatroska.git;branch=v1.x;protocol=https" -SRCREV = "f5315fddda2d434e47035c038549a808d8b8eac7" +SRCREV = "280281a8aeb69881f70ee3d6ff26aa6d964365a3" inherit pkgconfig cmake