diff mbox series

[meta-oe,4/7] mpv: upgrade 0.40.0 -> 0.41.0

Message ID 20251223061043.659-4-liuyd.fnst@fujitsu.com
State New
Headers show
Series [meta-oe,1/7] flatpak: upgrade 1.17.0 -> 1.17.2 | expand

Commit Message

Liu Yiding Dec. 23, 2025, 6:10 a.m. UTC 
1.Changelog:
  https://github.com/mpv-player/mpv/releases/tag/v0.41.0

2.Drop 0001-mpv-fix-build-with-ffmpeg-8.0.patch as it was merged in 0.41.0.

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
---
 .../0001-mpv-fix-build-with-ffmpeg-8.0.patch  | 41 -------------------
 .../mplayer/{mpv_0.40.0.bb => mpv_0.41.0.bb}  |  5 +--
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/0001-mpv-fix-build-with-ffmpeg-8.0.patch
 rename meta-oe/recipes-multimedia/mplayer/{mpv_0.40.0.bb => mpv_0.41.0.bb} (95%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/0001-mpv-fix-build-with-ffmpeg-8.0.patch b/meta-oe/recipes-multimedia/mplayer/mpv/0001-mpv-fix-build-with-ffmpeg-8.0.patch
deleted file mode 100644
index ea705a4c73..0000000000
--- a/meta-oe/recipes-multimedia/mplayer/mpv/0001-mpv-fix-build-with-ffmpeg-8.0.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-From dd80e5841894f854e2d994601016151531521d9a Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 16 Sep 2025 09:37:48 +0200
-Subject: [PATCH] mpv: fix build with ffmpeg 8.0
-
-quick fix, only compile tested
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-
-Upstream-Status: Pending
----
- demux/demux_mkv.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
-index 135edcc23d..cc7ce3e98f 100644
---- a/demux/demux_mkv.c
-+++ b/demux/demux_mkv.c
-@@ -2200,16 +2200,16 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track)
-             // [0x30..0x37] are component tags utilized for
-             // non-mobile captioning service ("profile A").
-             if (component_tag >= 0x30 && component_tag <= 0x37)
--                lav->profile = FF_PROFILE_ARIB_PROFILE_A;
-+                lav->profile = AV_PROFILE_ARIB_PROFILE_A;
-             break;
-         case 0x0012:
-             // component tag 0x87 signifies a mobile/partial reception
-             // (1seg) captioning service ("profile C").
-             if (component_tag == 0x87)
--                lav->profile = FF_PROFILE_ARIB_PROFILE_C;
-+                lav->profile = AV_PROFILE_ARIB_PROFILE_C;
-             break;
-         }
--        if (lav->profile == FF_PROFILE_UNKNOWN)
-+        if (lav->profile == AV_PROFILE_UNKNOWN)
-             MP_WARN(demuxer, "ARIB caption profile %02x / %04x not supported.\n",
-                     component_tag, data_component_id);
-     }
--- 
-2.50.1
-
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.41.0.bb
similarity index 95%
rename from meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb
rename to meta-oe/recipes-multimedia/mplayer/mpv_0.41.0.bb
index 117395b371..ccb66adb7a 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.41.0.bb
@@ -16,9 +16,8 @@  DEPENDS = " \
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=570a9b3749dd0463a1778803b12a6dce"
 
-SRCREV = "e48ac7ce08462f5e33af6ef9deeac6fa87eef01e"
-SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/${@oe.utils.trim_version('${PV}', 2)};protocol=https"
-SRC_URI += "file://0001-mpv-fix-build-with-ffmpeg-8.0.patch"
+SRCREV = "41f6a645068483470267271e1d09966ca3b9f413"
+SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/${@oe.utils.trim_version('${PV}', 2)};protocol=https;tag=v${PV}"
 
 inherit meson pkgconfig mime-xdg