summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2022-07-25 00:45:05 +0000
committertnn <tnn@pkgsrc.org>2022-07-25 00:45:05 +0000
commit2fdc062f87d80f39f02fb6f48466572473782529 (patch)
tree975f84ed55ee462c94a60b5fbf9338e00512b58d /multimedia
parent70f971d7c24271b9276a9d0788c4afa9d4a304f8 (diff)
downloadpkgsrc-2fdc062f87d80f39f02fb6f48466572473782529.tar.gz
mplayer: fix build with ffmpeg5-5.1
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mplayer-share/distinfo3
-rw-r--r--multimedia/mplayer-share/patches/patch-av__helpers.c22
2 files changed, 24 insertions, 1 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 4f47375580e..2038078695a 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.102 2022/04/24 15:00:42 nia Exp $
+$NetBSD: distinfo,v 1.103 2022/07/25 00:45:05 tnn Exp $
BLAKE2s (mplayer/MPlayer-1.5.tar.xz) = 1a86b823bcc82e07cf43551151449dd1cbdd768d8281ebe32cea6ced91d029c5
SHA512 (mplayer/MPlayer-1.5.tar.xz) = 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74
@@ -6,6 +6,7 @@ Size (mplayer/MPlayer-1.5.tar.xz) = 15379972 bytes
SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
+SHA1 (patch-av__helpers.c) = c7821a3c4fb4cddc581ed1ee364c735c9680eb05
SHA1 (patch-configure) = 70eee721bfb49e811d1b3c9376bdada5438f6b17
SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
SHA1 (patch-libao2_ao__alsa.c) = da568da8b9290f1ed49ecedec7dc9141408698b1
diff --git a/multimedia/mplayer-share/patches/patch-av__helpers.c b/multimedia/mplayer-share/patches/patch-av__helpers.c
new file mode 100644
index 00000000000..47684c46f3f
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-av__helpers.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-av__helpers.c,v 1.1 2022/07/25 00:45:05 tnn Exp $
+
+Fix build with FFmpeg 5.1.
+struct AVCodec.decode was removed in:
+https://github.com/FFmpeg/FFmpeg/commit/20f972701806be20a77f808db332d9489343bb78
+
+--- av_helpers.c.orig 2021-05-01 17:45:31.000000000 +0000
++++ av_helpers.c
+@@ -51,11 +51,9 @@ static void mp_msp_av_log_callback(void
+ AVCodecContext *s= ptr;
+ if(s->codec){
+ if(s->codec->type == AVMEDIA_TYPE_AUDIO){
+- if(s->codec->decode)
+- type= MSGT_DECAUDIO;
++ type= MSGT_DECAUDIO;
+ }else if(s->codec->type == AVMEDIA_TYPE_VIDEO){
+- if(s->codec->decode)
+- type= MSGT_DECVIDEO;
++ type= MSGT_DECVIDEO;
+ }
+ //FIXME subtitles, encoders (what msgt for them? there is no appropriate ...)
+ }