CVS commit: pkgsrc/multimedia

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Apr 10 13:06:50 UTC 2021

Modified Files:
        pkgsrc/multimedia/mplayer: Makefile
        pkgsrc/multimedia/mplayer-share: distinfo
Added Files:
        pkgsrc/multimedia/mplayer-share/patches: patch-libmpcodecs_ad__spdif.c

Log Message:
mplayer: Fix build with multimedia/ffmpeg4-4.4

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 pkgsrc/multimedia/mplayer/Makefile
cvs rdiff -u -r1.98 -r1.99 pkgsrc/multimedia/mplayer-share/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/mplayer-share/patches/patch-libmpcodecs_ad__spdif.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mplayer/Makefile
diff -u pkgsrc/multimedia/mplayer/Makefile:1.106 pkgsrc/multimedia/mplayer/Makefile:1.107
--- pkgsrc/multimedia/mplayer/Makefile:1.106    Sat Jun 22 22:46:45 2019
+++ pkgsrc/multimedia/mplayer/Makefile  Sat Apr 10 13:06:50 2021
@@ -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
 

Index: pkgsrc/multimedia/mplayer-share/distinfo
diff -u pkgsrc/multimedia/mplayer-share/distinfo:1.98 pkgsrc/multimedia/mplayer-share/distinfo:1.99
--- pkgsrc/multimedia/mplayer-share/distinfo:1.98       Tue Jun  4 13:39:38 2019
+++ pkgsrc/multimedia/mplayer-share/distinfo    Sat Apr 10 13:06:50 2021
@@ -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) = 1bba1d39be27c31
 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

Added files:

Index: pkgsrc/multimedia/mplayer-share/patches/patch-libmpcodecs_ad__spdif.c
diff -u /dev/null pkgsrc/multimedia/mplayer-share/patches/patch-libmpcodecs_ad__spdif.c:1.1
--- /dev/null   Sat Apr 10 13:06:50 2021
+++ pkgsrc/multimedia/mplayer-share/patches/patch-libmpcodecs_ad__spdif.c       Sat Apr 10 13:06:50 2021
@@ -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);
+ }