musicpd: update to 0.22.

ver 0.22 (2020/09/23)
* protocol
  - "findadd"/"searchadd"/"searchaddpl" support the "sort" and
    "window" parameters
  - add command "readpicture" to download embedded pictures
  - command "moveoutput" moves an output between partitions
  - command "delpartition" deletes a partition
  - show partition name in "status" response
* tags
  - new tags "Grouping" (for ID3 "TIT1"), "Work" and "Conductor"
* input
  - curl: support "charset" parameter in URI fragment
  - ffmpeg: allow partial reads
  - io_uring: new plugin for local files on Linux (using liburing)
  - smbclient: close unused SMB/CIFS connections
* database
  - upnp: drop support for libupnp versions older than 1.8
* playlist
  - cue: integrate contents in database
* decoder
  - ffmpeg: support RTSP
  - mad: remove option "gapless", always do gapless
  - sidplay: add option "default_genre"
  - sidplay: map SID name field to "Album" tag
  - sidplay: add support for new song length format with libsidplayfp 2.0
  - vorbis, opus: improve seeking accuracy
* playlist
  - flac: support reading CUE sheets from remote FLAC files
* filter
  - ffmpeg: new plugin based on FFmpeg's libavfilter library
  - hdcd: new plugin based on FFmpeg's "af_hdcd" for HDCD playback
  - volume: convert S16 to S24 to preserve quality and reduce dithering noise
  - dsd: add integer-only DSD to PCM converter
* output
  - jack: add option "auto_destination_ports"
  - jack: report error details
  - pulse: add option "media_role"
  - solaris: support S8 and S32
* lower the real-time priority from 50 to 40
* switch to C++17
  - GCC 8 or clang 5 (or newer) recommended

ver 0.21.26 (2020/09/21)
* database
  - inotify: obey ".mpdignore" files
* output
  - osx: fix crash bug
  - sles: support floating point samples
* archive
  - bzip2: fix crash on corrupt bzip2 file
  - bzip2: flush output at end of input file
  - iso9660: fix unaligned reads
  - iso9660: support seeking
  - zzip: fix crash on corrupt ZIP file
* decoder
  - ffmpeg: remove "rtsp://" from the list of supported protocols
  - ffmpeg: add "hls+http://" to the list of supported protocols
  - opus: support the gain value from the Opus header
  - sndfile: fix lost samples at end of file
* fix "single" mode bug after resuming playback
* the default log_level is "default", not "info"

4 files changed, 21 insertions, 19 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 8ab3b1de8bf..cfa747b590d 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.225 2020/08/18 17:57:38 leot Exp $
+# $NetBSD: Makefile,v 1.226 2020/10/02 09:47:09 wiz Exp $
 
-DISTNAME=	mpd-0.21.25
+DISTNAME=	mpd-0.22
 PKGNAME=	${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=	2
 CATEGORIES=	audio
-MASTER_SITES=	https://www.musicpd.org/download/mpd/0.21/
+MASTER_SITES=	https://www.musicpd.org/download/mpd/0.22/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,10 +16,10 @@ CONFLICTS=	mpd-[0-9]*
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
-# c++14
-GCC_REQD+=	6
+# c++17
+GCC_REQD+=	8
 
-MESON_ARGS+=	-Ddocumentation=true
+MESON_ARGS+=	-Ddocumentation=enabled
 
 # worrying libraries with limited maintainance:
 # - audiofile, many CVEs, no activity since 2016
@@ -112,7 +111,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${DESTDIR}${EGDIR}
 
 .include "../../devel/meson/build.mk"
-BUILDLINK_ABI_DEPENDS.flac+=	flac>=1.2
+BUILDLINK_API_DEPENDS.flac+=	flac>=1.2
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"
diff --git a/audio/musicpd/PLIST b/audio/musicpd/PLIST
index ca4e8fa4015..7e465b48ff0 100644
--- a/audio/musicpd/PLIST
+++ b/audio/musicpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2020/01/04 20:46:27 nia Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/10/02 09:47:09 wiz Exp $
 bin/mpd
 man/man1/mpd.1
 man/man5/mpd.conf.5
@@ -9,6 +9,8 @@ share/doc/mpd/README.md
 share/doc/mpd/html/.buildinfo
 share/doc/mpd/html/_sources/developer.rst.txt
 share/doc/mpd/html/_sources/index.rst.txt
+share/doc/mpd/html/_sources/mpd.1.rst.txt
+share/doc/mpd/html/_sources/mpd.conf.5.rst.txt
 share/doc/mpd/html/_sources/plugins.rst.txt
 share/doc/mpd/html/_sources/protocol.rst.txt
 share/doc/mpd/html/_sources/user.rst.txt
@@ -30,6 +32,8 @@ share/doc/mpd/html/_static/underscore.js
 share/doc/mpd/html/developer.html
 share/doc/mpd/html/genindex.html
 share/doc/mpd/html/index.html
+share/doc/mpd/html/mpd.1.html
+share/doc/mpd/html/mpd.conf.5.html
 share/doc/mpd/html/objects.inv
 share/doc/mpd/html/plugins.html
 share/doc/mpd/html/protocol.html
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index e0f00e74992..4ddd57c4b21 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.117 2020/07/07 12:52:19 nia Exp $
+$NetBSD: distinfo,v 1.118 2020/10/02 09:47:09 wiz Exp $
 
-SHA1 (mpd-0.21.25.tar.xz) = 7e733fc9bf98c9c25f6b780e0df2347d0f1717b2
-RMD160 (mpd-0.21.25.tar.xz) = 9951bf096e8d6d6fe3a07a82d660caf1d2bd91af
-SHA512 (mpd-0.21.25.tar.xz) = 67e0cbf176d18cd63effab0d12b22bea846458cbaa383ead9078c4b5f2a472dbb1d7308af4d6898691e8864a911c808af5ca2c553d8233323b8aaedfdc7189fc
-Size (mpd-0.21.25.tar.xz) = 683768 bytes
-SHA1 (patch-src_net_IPv6Address.hxx) = c9e9a5676451e6834fcef359266d37fc15f079e6
-SHA1 (patch-src_output_plugins_SolarisOutputPlugin.cxx) = 16f366dfc41b712753ed8da32389848a2cd84f4d
+SHA1 (mpd-0.22.tar.xz) = 5dd348085f39e6c6259a771e49d992370d55872e
+RMD160 (mpd-0.22.tar.xz) = b1b54c521796b26e20c60f1ab1b3600fed0ae397
+SHA512 (mpd-0.22.tar.xz) = 2a6671dc2392dbac65d8339b8cfe86626fc46727bedab80266b24c6d63b0a26a832fc233576866ab5115627efdaa61bbe6876f4d33cb48c21e16fb5b74d3cfe4
+Size (mpd-0.22.tar.xz) = 722940 bytes
+SHA1 (patch-src_net_IPv6Address.hxx) = 3e0ad6e63a970a17d0d8b2403acc538d8b08342e
diff --git a/audio/musicpd/patches/patch-src_net_IPv6Address.hxx b/audio/musicpd/patches/patch-src_net_IPv6Address.hxx
index 93f3398d410..7a61aa5dd2e 100644
--- a/audio/musicpd/patches/patch-src_net_IPv6Address.hxx
+++ b/audio/musicpd/patches/patch-src_net_IPv6Address.hxx
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_net_IPv6Address.hxx,v 1.1 2018/12/11 10:37:20 wiz Exp $
+$NetBSD: patch-src_net_IPv6Address.hxx,v 1.2 2020/10/02 09:47:09 wiz Exp $
 
 Fixes
 In file included from /usr/include/netinet/in.h:372:0,
@@ -13,7 +13,7 @@ https://mail-index.netbsd.org/source-changes/2018/12/10/msg101328.html
 
 https://github.com/MusicPlayerDaemon/MPD/issues/438
 
---- src/net/IPv6Address.hxx.orig	2018-11-16 12:27:58.000000000 +0000
+--- src/net/IPv6Address.hxx.orig	2020-09-23 13:26:51.000000000 +0000
 +++ src/net/IPv6Address.hxx
 @@ -41,6 +41,7 @@
  #include <ws2tcpip.h>
@@ -22,4 +22,4 @@ https://github.com/MusicPlayerDaemon/MPD/issues/438
 +#include <arpa/inet.h>
  #endif
  
- /**
+ class IPv4Address;