diff mbox series

[meta-multimedia,12/20] libmatroska: upgrade 1.7.1 -> 1.7.2

Message ID 20260801131138.3299410-12-ankur.tyagi85@gmail.com
State New
Headers show
Series [meta-oe,1/20] imagemagick: upgrade 7.1.28 -> 7.1.29 | expand

Commit Message

Ankur Tyagi Aug. 1, 2026, 1:11 p.m. UTC 
From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Dropped patch that is merged in the upstream version.
Also included tag in the SRC_URI.

https://github.com/Matroska-Org/libmatroska/blob/release-1.7.2/NEWS.md

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../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 mbox series

Patch

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 <alperyasinak1@gmail.com>
-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 <min> value.  Or, use the <min>...<max> syntax
-|   to tell CMake that the project requires at least <min> but has been updated
-|   to work with policies introduced by <max> 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 <alperyasinak1@gmail.com>
----
- 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..ed7a7af97d 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;tag=release-${PV}"
 
-SRCREV = "f5315fddda2d434e47035c038549a808d8b8eac7"
+SRCREV = "280281a8aeb69881f70ee3d6ff26aa6d964365a3"
 
 
 inherit pkgconfig cmake