From 997e47c59063306bf3174c6099d59206f00fd512 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Tue, 16 Sep 2025 09:44:18 +0200 Subject: [PATCH] mpv: fix build with ffmpeg 8.0 Signed-off-by: Khem Raj --- .../0001-mpv-fix-build-with-ffmpeg-8.0.patch | 41 +++++++++++++++++++ .../recipes-multimedia/mplayer/mpv_0.40.0.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/0001-mpv-fix-build-with-ffmpeg-8.0.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 new file mode 100644 index 0000000000..ea705a4c73 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv/0001-mpv-fix-build-with-ffmpeg-8.0.patch @@ -0,0 +1,41 @@ +From dd80e5841894f854e2d994601016151531521d9a Mon Sep 17 00:00:00 2001 +From: Markus Volk +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 + +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.40.0.bb index 3223dd69d7..117395b371 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb @@ -18,6 +18,7 @@ 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" inherit meson pkgconfig mime-xdg