[pkgsrc/trunk]: pkgsrc/audio/musicpd musicpd: switch back to ffmpeg5, using a...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a066c42c95c
branches:  trunk
changeset: 382380:0a066c42c95c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jul 27 09:42:45 2022 +0000

description:
musicpd: switch back to ffmpeg5, using an upstream patch.

Bump PKGREVISION

diffstat:

 audio/musicpd/Makefile                                       |   4 +-
 audio/musicpd/distinfo                                       |   3 +-
 audio/musicpd/options.mk                                     |   7 +--
 audio/musicpd/patches/patch-src_decoder_plugins_FfmpegIo.cxx |  22 ++++++++++++
 4 files changed, 28 insertions(+), 8 deletions(-)

diffs (76 lines):

diff -r bde52d8414b0 -r 0a066c42c95c audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Wed Jul 27 08:42:39 2022 +0000
+++ b/audio/musicpd/Makefile    Wed Jul 27 09:42:45 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.273 2022/07/26 07:38:42 wiz Exp $
+# $NetBSD: Makefile,v 1.274 2022/07/27 09:42:45 wiz Exp $
 
 DISTNAME=      mpd-0.23.8
 PKGNAME=       ${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    audio
 MASTER_SITES=  https://www.musicpd.org/download/mpd/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz
diff -r bde52d8414b0 -r 0a066c42c95c audio/musicpd/distinfo
--- a/audio/musicpd/distinfo    Wed Jul 27 08:42:39 2022 +0000
+++ b/audio/musicpd/distinfo    Wed Jul 27 09:42:45 2022 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.139 2022/07/12 21:20:40 triaxx Exp $
+$NetBSD: distinfo,v 1.140 2022/07/27 09:42:45 wiz Exp $
 
 BLAKE2s (mpd-0.23.8.tar.xz) = f7573d127356d7e8a2042086abdd4b65eedd9eea85b80505a26277a7a892a898
 SHA512 (mpd-0.23.8.tar.xz) = 62f7571de29a329b8ef1fc6f7c338125e70895e06fca134eb9ade19635498ec13da00511870bfadabc5a9ccb090c44543d3101361ffe109e4fadce66435b37ab
 Size (mpd-0.23.8.tar.xz) = 773280 bytes
 SHA1 (patch-doc_mpd.conf.5.rst) = ee22092564075cdf7917e4e66687f6ab98b5817c
+SHA1 (patch-src_decoder_plugins_FfmpegIo.cxx) = 01a0dede40448c1b145f2465531fd063550bd360
 SHA1 (patch-src_decoder_plugins_meson.build) = 8033d6e19da05f472f14f3562a5dfc2f410da98b
 SHA1 (patch-src_net_IPv6Address.hxx) = f89b838ad5e946c5db8d95a6dd560e02bdccae29
 SHA1 (patch-src_util_WStringAPI.hxx) = 92f39096770943c26d8aaae8a7581d4daca2d233
diff -r bde52d8414b0 -r 0a066c42c95c audio/musicpd/options.mk
--- a/audio/musicpd/options.mk  Wed Jul 27 08:42:39 2022 +0000
+++ b/audio/musicpd/options.mk  Wed Jul 27 09:42:45 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.43 2022/07/26 07:38:42 wiz Exp $
+# $NetBSD: options.mk,v 1.44 2022/07/27 09:42:45 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.musicpd
 
@@ -83,10 +83,7 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mffmpeg)
-# needs 5.1 support
-# https://github.com/MusicPlayerDaemon/MPD/issues/1582
-#.  include "../../multimedia/ffmpeg5/buildlink3.mk"
-.  include "../../multimedia/ffmpeg4/buildlink3.mk"
+.  include "../../multimedia/ffmpeg5/buildlink3.mk"
 .else
 MESON_ARGS+=   -Dffmpeg=disabled
 .endif
diff -r bde52d8414b0 -r 0a066c42c95c audio/musicpd/patches/patch-src_decoder_plugins_FfmpegIo.cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/musicpd/patches/patch-src_decoder_plugins_FfmpegIo.cxx      Wed Jul 27 09:42:45 2022 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_decoder_plugins_FfmpegIo.cxx,v 1.1 2022/07/27 09:42:45 wiz Exp $
+
+Fix build with ffmpeg 5.1.
+https://github.com/MusicPlayerDaemon/MPD/commit/59792cb0b801854ee41be72d33db9542735df754
+
+--- src/decoder/plugins/FfmpegIo.cxx.orig      2022-07-08 23:05:38.000000000 +0000
++++ src/decoder/plugins/FfmpegIo.cxx
+@@ -21,10 +21,13 @@
+ #define __STDC_CONSTANT_MACROS
+ 
+ #include "FfmpegIo.hxx"
+-#include "libavutil/mem.h"
+ #include "../DecoderAPI.hxx"
+ #include "input/InputStream.hxx"
+ 
++extern "C" {
++#include "libavutil/mem.h"
++}
++
+ AvioStream::~AvioStream()
+ {
+       if (io != nullptr) {