alicelinux

commit 31465268a952e2d24704172eeb9936356ce330b2
parent 230761bcce0dc4d3a4916c929c2c7d3649f196f1
Author: emmett1 <emmett1.2miligrams@protonmail.com>
Date:   Sat, 27 Sep 2025 11:21:53 +0800

mpv: added patch fix build with ffmpeg8

Diffstat:
M
repos/extra/mpv/.checksum
 | 
1
+
M
repos/extra/mpv/abuild
 | 
4
++--
A
repos/extra/mpv/ffmpeg8.patch
 | 
37
+++++++++++++++++++++++++++++++++++++

3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/repos/extra/mpv/.checksum b/repos/extra/mpv/.checksum
@@ -1 +1,2 @@
+01c43327c42143e0c8645f66e78023fea95bfdb1c49d6522c45c7ce20dcef184  ffmpeg8.patch
 c698a9e6acc7df68a88a422aa50ce6716a9fd94b8b99c854bb3dd3594d59a6c2  mpv-0.40.0.tar.gz
diff --git a/repos/extra/mpv/abuild b/repos/extra/mpv/abuild
@@ -1,9 +1,9 @@
 name=mpv
 version=0.40.0
 release=1
-source="https://github.com/${name}-player/${name}/archive/v${version}/${name}-${version}.tar.gz"
+source="https://github.com/${name}-player/${name}/archive/v${version}/${name}-${version}.tar.gz
+	ffmpeg8.patch"
 build_opt="-Dwayland=enabled"
-[ -f $SPM_PKGDB/libx11 ] && build_opt="$build_opt -Dx11=enabled"
 
 postbuild() {
 	rm -r \
diff --git a/repos/extra/mpv/ffmpeg8.patch b/repos/extra/mpv/ffmpeg8.patch
@@ -0,0 +1,37 @@
+Patch-Source: https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9
+---
+From 26b29fba02a2782f68e2906f837d21201fc6f1b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
+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);
+     }