diff options
author | ryoon <ryoon@pkgsrc.org> | 2021-04-10 13:06:50 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2021-04-10 13:06:50 +0000 |
commit | 2354459d99276cab478e6bff309d88c906bb99f4 (patch) | |
tree | 36b2a43ef116ad41c7657084a8798fb7357dc92f | |
parent | 6721ab42d2f49a65c57d83b60ae579cd52907772 (diff) | |
download | pkgsrc-2354459d99276cab478e6bff309d88c906bb99f4.tar.gz |
mplayer: Fix build with multimedia/ffmpeg4-4.4
Bump PKGREVISION.
-rw-r--r-- | multimedia/mplayer-share/distinfo | 3 | ||||
-rw-r--r-- | multimedia/mplayer-share/patches/patch-libmpcodecs_ad__spdif.c | 24 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile | 4 |
3 files changed, 28 insertions, 3 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 2c34f6dce6f..d9ab69d42b9 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.98 2019/06/04 13:39:38 nia Exp $ +$NetBSD: distinfo,v 1.99 2021/04/10 13:06:50 ryoon Exp $ SHA1 (mplayer/MPlayer-1.4.tar.xz) = 0954a7141de7c945d90db234e39a78c27cf73f78 RMD160 (mplayer/MPlayer-1.4.tar.xz) = 7f94e3e3f127491f70a93a8699a1192c0771e20b @@ -11,6 +11,7 @@ SHA1 (patch-configure) = 1bba1d39be27c31f2345c8303f252404538c192f SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c SHA1 (patch-libao2_ao__alsa.c) = da568da8b9290f1ed49ecedec7dc9141408698b1 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 +SHA1 (patch-libmpcodecs_ad__spdif.c) = e44131414a599efc5bc0b96ed19b5ad46cb0d381 SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825 SHA1 (patch-libvo_vo__vdpau.c) = df3de0e079f7047228065bf36390aa3ad01b7f97 diff --git a/multimedia/mplayer-share/patches/patch-libmpcodecs_ad__spdif.c b/multimedia/mplayer-share/patches/patch-libmpcodecs_ad__spdif.c new file mode 100644 index 00000000000..75dc8a7bd3b --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-libmpcodecs_ad__spdif.c @@ -0,0 +1,24 @@ +$NetBSD: patch-libmpcodecs_ad__spdif.c,v 1.1 2021/04/10 13:06:50 ryoon Exp $ + +* Fix build with ffmpeg4-4.4. + From upstream revision 38198. + +--- libmpcodecs/ad_spdif.c.orig 2016-03-06 13:00:49.000000000 +0000 ++++ libmpcodecs/ad_spdif.c +@@ -298,14 +298,8 @@ static void uninit(sh_audio_t *sh) + if (spdif_ctx->header_written) + av_write_trailer(lavf_ctx); + av_freep(&lavf_ctx->pb); +- if (lavf_ctx->streams) { +- av_freep(&lavf_ctx->streams[0]->codec); +- av_freep(&lavf_ctx->streams[0]->info); +- av_freep(&lavf_ctx->streams[0]); +- } +- av_freep(&lavf_ctx->streams); +- av_freep(&lavf_ctx->priv_data); ++ avformat_free_context(lavf_ctx); ++ lavf_ctx = NULL; + } +- av_freep(&lavf_ctx); + av_freep(&spdif_ctx); + } diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 8a04a590672..1b03284af59 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.106 2019/06/22 22:46:45 tsutsui Exp $ +# $NetBSD: Makefile,v 1.107 2021/04/10 13:06:50 ryoon Exp $ PKGNAME= mplayer-${MPLAYER_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Fast, cross-platform movie player |