guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 3db1cc759cee6f0f4b0ef2f94d82410b8c17aec7
Author: Rutherther <[email protected]>
AuthorDate: Fri Sep 26 10:36:08 2025 +0200
gnu: mpv: Patch removed constants from ffmpeg 8.0.
MPV 0.40.0 didn't remove deprecated constants. Those
constants were removed in ffmpeg 8.0. Mpv is not planning
on releasing a patch release any time soon.
* gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/video.scm (mpv)<source>[patches]: Apply it.
Change-Id: Id48bf513e6c80b59ae2bb167e7e98e41d5efad6f
Signed-off-by: John Kehayias <[email protected]>
---
gnu/local.mk | 1 +
.../patches/mpv-0.40.0-fix-ffmpeg-8.0.patch | 40 ++++++++++++++++++++++
gnu/packages/video.scm | 5 ++-
3 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index eaacbfedd3..3414c53a20 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1875,6 +1875,7 @@ dist_patch_DATA =
\
%D%/packages/patches/mpc123-initialize-ao.patch \
%D%/packages/patches/mpg321-CVE-2019-14247.patch \
%D%/packages/patches/mpg321-gcc-10.patch \
+ %D%/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch \
%D%/packages/patches/modglue-fix-build.patch \
%D%/packages/patches/modem-manager-fix-test-wrapper.patch \
%D%/packages/patches/module-init-tools-moduledir.patch \
diff --git a/gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch
b/gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch
new file mode 100644
index 0000000000..847bba9570
--- /dev/null
+++ b/gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch
@@ -0,0 +1,40 @@
+Patch obtained from
https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9
+See https://github.com/mpv-player/mpv/issues/16176 for discussion. Next version
+of mpv will have this fixed, but upstream is not planning to release a patch
+release.
+
+From 26b29fba02a2782f68e2906f837d21201fc6f1b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
+Date: Fri, 28 Mar 2025 19:12:01 +0100
+Subject: [PATCH] demux_mkv: fix compilation after deprecated definitions
+ removal
+
+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 135edcc23d82b..cc7ce3e98f4f6 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);
+ }
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 2fdc6e85ae..67eb305b75 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2673,7 +2673,10 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
"0w0qk61ll0mddbkiwavqfx048sacyvp6fwglms58ypw869rh7iy7"))))
+ (base32 "0w0qk61ll0mddbkiwavqfx048sacyvp6fwglms58ypw869rh7iy7"))
+ (patches
+ (search-patches
+ "mpv-0.40.0-fix-ffmpeg-8.0.patch"))))
(build-system meson-build-system)
(arguments
(list
