summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Yiding <liuyd.fnst@fujitsu.com>2025-12-23 14:10:39 +0800
committerKhem Raj <raj.khem@gmail.com>2025-12-23 12:22:41 -0800
commitf33ce214b6276ed47c1bbc6587a199cf05bf5fe8 (patch)
tree81db869efb18e7ee1ab178c79bd265f37345aed3
parentaff45d811c97986a7a17c173aa8fa66f3fa28292 (diff)
downloadmeta-openembedded-f33ce214b6276ed47c1bbc6587a199cf05bf5fe8.tar.gz
mpv: upgrade 0.40.0 -> 0.41.0
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> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mpv/0001-mpv-fix-build-with-ffmpeg-8.0.patch41
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mpv_0.41.0.bb (renamed from meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb)5
2 files changed, 2 insertions, 44 deletions
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 @@
1From dd80e5841894f854e2d994601016151531521d9a Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Tue, 16 Sep 2025 09:37:48 +0200
4Subject: [PATCH] mpv: fix build with ffmpeg 8.0
5
6quick fix, only compile tested
7
8Signed-off-by: Markus Volk <f_l_k@t-online.de>
9
10Upstream-Status: Pending
11---
12 demux/demux_mkv.c | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
16index 135edcc23d..cc7ce3e98f 100644
17--- a/demux/demux_mkv.c
18+++ b/demux/demux_mkv.c
19@@ -2200,16 +2200,16 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track)
20 // [0x30..0x37] are component tags utilized for
21 // non-mobile captioning service ("profile A").
22 if (component_tag >= 0x30 && component_tag <= 0x37)
23- lav->profile = FF_PROFILE_ARIB_PROFILE_A;
24+ lav->profile = AV_PROFILE_ARIB_PROFILE_A;
25 break;
26 case 0x0012:
27 // component tag 0x87 signifies a mobile/partial reception
28 // (1seg) captioning service ("profile C").
29 if (component_tag == 0x87)
30- lav->profile = FF_PROFILE_ARIB_PROFILE_C;
31+ lav->profile = AV_PROFILE_ARIB_PROFILE_C;
32 break;
33 }
34- if (lav->profile == FF_PROFILE_UNKNOWN)
35+ if (lav->profile == AV_PROFILE_UNKNOWN)
36 MP_WARN(demuxer, "ARIB caption profile %02x / %04x not supported.\n",
37 component_tag, data_component_id);
38 }
39--
402.50.1
41
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb b/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 = " \
16LICENSE = "GPL-2.0-or-later" 16LICENSE = "GPL-2.0-or-later"
17LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=570a9b3749dd0463a1778803b12a6dce" 17LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=570a9b3749dd0463a1778803b12a6dce"
18 18
19SRCREV = "e48ac7ce08462f5e33af6ef9deeac6fa87eef01e" 19SRCREV = "41f6a645068483470267271e1d09966ca3b9f413"
20SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/${@oe.utils.trim_version('${PV}', 2)};protocol=https" 20SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/${@oe.utils.trim_version('${PV}', 2)};protocol=https;tag=v${PV}"
21SRC_URI += "file://0001-mpv-fix-build-with-ffmpeg-8.0.patch"
22 21
23inherit meson pkgconfig mime-xdg 22inherit meson pkgconfig mime-xdg
24 23