Control: tag -1 upstream patch On Tue Oct 7, 2025 at 9:16 AM CEST, Julian Wollrath wrote: > This has been fixed upstream with > https://github.com/mpv-player/mpv/commit/26b29fba02
I've created a patch which adds that commit to the Debian package and can confirm that it builds with both ffmpeg 7.1 as with 8.0 I submitted a MR for it here: https://salsa.debian.org/multimedia-team/mpv/-/merge_requests/6 And for completeness added the patch to this mail. Cheers, Diederik
From 6fec0cd41fa59662cfca3935cd0ebc96adbc1585 Mon Sep 17 00:00:00 2001 From: Diederik de Haas <[email protected]> Date: Sat, 25 Oct 2025 16:01:02 +0200 Subject: [PATCH] d/p: Add patch to fix compilation issue with ffmpeg 8.0 Ffmpeg upstream deprecated the use of FF_PROFILE_* defines in commit 8238bc0b5e3d ("avcodec/defs: Add AV_PROFILE_* defines, deprecate FF_PROFILE_* defines") That commit has been present since ffmpeg release 6.1. In ffmpeg 8.0 the FF_PROFILE_* defines have been removed in commit 822432769868 ("avcodec: remove deprecated FF_API_FF_PROFILE_LEVEL") That causes a compilation failure in mpv. So import mpv's upstream commit which adjusts for that. Closes: #1115038 Link: https://github.com/mpv-player/mpv/commit/26b29fba02a2 Link: https://bugs.debian.org/1115038 Signed-off-by: Diederik de Haas <[email protected]> --- ...mpilation-after-deprecated-definitio.patch | 37 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 debian/patches/0001-demux_mkv-fix-compilation-after-deprecated-definitio.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001-demux_mkv-fix-compilation-after-deprecated-definitio.patch b/debian/patches/0001-demux_mkv-fix-compilation-after-deprecated-definitio.patch new file mode 100644 index 00000000..daa24d23 --- /dev/null +++ b/debian/patches/0001-demux_mkv-fix-compilation-after-deprecated-definitio.patch @@ -0,0 +1,37 @@ +From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]> +Date: Fri, 28 Mar 2025 19:12:01 +0100 +Subject: demux_mkv: fix compilation after deprecated definitions removal +Origin: https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9 + +See: https://github.com/FFmpeg/FFmpeg/commit/822432769868da325ba03774df1084aa78b9a5a0 +--- + 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.51.0 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..88cf4368 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-demux_mkv-fix-compilation-after-deprecated-definitio.patch -- 2.51.0
signature.asc
Description: PGP signature
