Received: by mail.netbsd.org (Postfix, from userid 605) id 96D8A84EE1; Mon, 25 Jul 2022 00:46:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 120C884ED5 for ; Mon, 25 Jul 2022 00:45:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id KSUAD4LW1DJe for ; Mon, 25 Jul 2022 00:45:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7A67584DB2 for ; Mon, 25 Jul 2022 00:45:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 73CF3FB1A; Mon, 25 Jul 2022 00:45:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1658709905200290" MIME-Version: 1.0 Date: Mon, 25 Jul 2022 00:45:05 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/multimedia/mplayer-share To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220725004505.73CF3FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1658709905200290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Jul 25 00:45:05 UTC 2022 Modified Files: pkgsrc/multimedia/mplayer-share: distinfo Added Files: pkgsrc/multimedia/mplayer-share/patches: patch-av__helpers.c Log Message: mplayer: fix build with ffmpeg5-5.1 To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 pkgsrc/multimedia/mplayer-share/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/multimedia/mplayer-share/patches/patch-av__helpers.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1658709905200290 Content-Disposition: inline Content-Length: 2505 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/mplayer-share/distinfo diff -u pkgsrc/multimedia/mplayer-share/distinfo:1.102 pkgsrc/multimedia/mplayer-share/distinfo:1.103 --- pkgsrc/multimedia/mplayer-share/distinfo:1.102 Sun Apr 24 15:00:42 2022 +++ pkgsrc/multimedia/mplayer-share/distinfo Mon Jul 25 00:45:05 2022 @@ -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) = 1537 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 Added files: Index: pkgsrc/multimedia/mplayer-share/patches/patch-av__helpers.c diff -u /dev/null pkgsrc/multimedia/mplayer-share/patches/patch-av__helpers.c:1.1 --- /dev/null Mon Jul 25 00:45:05 2022 +++ pkgsrc/multimedia/mplayer-share/patches/patch-av__helpers.c Mon Jul 25 00:45:05 2022 @@ -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 ...) + } --_----------=_1658709905200290--