CVS commit: pkgsrc/audio/musicpd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 27 09:42:45 UTC 2022

Modified Files:
        pkgsrc/audio/musicpd: Makefile distinfo options.mk
Added Files:
        pkgsrc/audio/musicpd/patches: patch-src_decoder_plugins_FfmpegIo.cxx

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

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.273 -r1.274 pkgsrc/audio/musicpd/Makefile
cvs rdiff -u -r1.139 -r1.140 pkgsrc/audio/musicpd/distinfo
cvs rdiff -u -r1.43 -r1.44 pkgsrc/audio/musicpd/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/musicpd/patches/patch-src_decoder_plugins_FfmpegIo.cxx

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

Modified files:

Index: pkgsrc/audio/musicpd/Makefile
diff -u pkgsrc/audio/musicpd/Makefile:1.273 pkgsrc/audio/musicpd/Makefile:1.274
--- pkgsrc/audio/musicpd/Makefile:1.273 Tue Jul 26 07:38:42 2022
+++ pkgsrc/audio/musicpd/Makefile       Wed Jul 27 09:42:45 2022
@@ -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

Index: pkgsrc/audio/musicpd/distinfo
diff -u pkgsrc/audio/musicpd/distinfo:1.139 pkgsrc/audio/musicpd/distinfo:1.140
--- pkgsrc/audio/musicpd/distinfo:1.139 Tue Jul 12 21:20:40 2022
+++ pkgsrc/audio/musicpd/distinfo       Wed Jul 27 09:42:45 2022
@@ -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

Index: pkgsrc/audio/musicpd/options.mk
diff -u pkgsrc/audio/musicpd/options.mk:1.43 pkgsrc/audio/musicpd/options.mk:1.44
--- pkgsrc/audio/musicpd/options.mk:1.43        Tue Jul 26 07:38:42 2022
+++ pkgsrc/audio/musicpd/options.mk     Wed Jul 27 09:42:45 2022
@@ -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 @@ MESON_ARGS+= -Dfaad=disabled
 .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

Added files:

Index: pkgsrc/audio/musicpd/patches/patch-src_decoder_plugins_FfmpegIo.cxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_decoder_plugins_FfmpegIo.cxx:1.1
--- /dev/null   Wed Jul 27 09:42:45 2022
+++ pkgsrc/audio/musicpd/patches/patch-src_decoder_plugins_FfmpegIo.cxx Wed Jul 27 09:42:45 2022
@@ -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) {