musicpd: Update to 0.21.11

changes in pkgsrc:

* switch from libmad to libmpg123 for mp3 decoding.
  it's more actively maintained.
* switch from libaudiofile to libsndfile for lossless formats.
  it's more actively maintained.
* add more options, and try to clarify existing options to
  make it obvious what is being enabled.
* enable ffmpeg by default so playing m4a files works
* fix cdparanoia support

ver 0.21.11 (2019/07/03)
* input
  - tidal: deprecated because Tidal has changed the protocol
* decoder
  - wildmidi: log error if library initialization fails
* output
  - alsa: fix busy loop while draining
  - alsa: fix missing drain call
  - alsa: improve xrun-avoiding silence generator
  - alsa: log when generating silence due to slow decoder
  - alsa, osx: fix distortions with DSD_U32 and DoP on 32 bit CPUs
* protocol
  - fix "list" with multiple "group" levels

4 files changed, 147 insertions, 59 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 7bbcecd4ae6..c1ca77e81f2 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.187 2019/07/01 04:07:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.188 2019/07/15 13:47:14 nia Exp $
 
-DISTNAME=		mpd-0.21.10
+DISTNAME=		mpd-0.21.11
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=		1
 CATEGORIES=		audio
-MASTER_SITES=		http://www.musicpd.org/download/mpd/0.21/
-#MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=		https://www.musicpd.org/download/mpd/0.21/
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://musicpd.org/
+HOMEPAGE=		https://www.musicpd.org/
 COMMENT=		Remote controllable audio player
 LICENSE=		gnu-gpl-v2
 
@@ -21,6 +19,19 @@ USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
 MESON_ARGS+=		-Ddocumentation=true
 
+# worrying libraries with limited maintainance:
+# - audiofile, many CVEs, no activity since 2016
+#   using sndfile instead
+# - mad, no release since 2004
+#   using mpg123 instead
+MESON_ARGS+=		-Dmad=disabled
+MESON_ARGS+=		-Daudiofile=disabled
+
+# not available in pkgsrc?
+MESON_ARGS+=		-Dnfs=disabled
+MESON_ARGS+=		-Diso9660=disabled
+MESON_ARGS+=		-Dsndio=disabled
+
 # c++14
 GCC_REQD+=		6
 
@@ -32,7 +43,7 @@ EGDIR=			${PREFIX}/share/examples/mpd
 CONF_FILES=		${EGDIR}/mpd.conf ${PKG_SYSCONFDIR}/mpd.conf
 RCD_SCRIPTS=		mpd
 
-FILES_SUBST+=		DEVOSSAUDIO=${DEVOSSAUDIO:Q}
+FILES_SUBST+=		DEVOSSAUDIO=${DEVOSSAUDIO}
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
@@ -58,10 +69,17 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${DESTDIR}${EGDIR}
 
 .include "../../devel/py-meson/build.mk"
+BUILDLINK_ABI_DEPENDS.flac+=	flac>=1.2
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libopus/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index ea9b2a0a5a4..5294962297f 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.100 2019/06/11 10:21:43 wiz Exp $
+$NetBSD: distinfo,v 1.101 2019/07/15 13:47:14 nia Exp $
 
-SHA1 (mpd-0.21.10.tar.xz) = f4c086264c5889b34844ae5bdbfbd037c6de7dac
-RMD160 (mpd-0.21.10.tar.xz) = 610cc56e2f6d74f9fb66505ebbb1ba5cff7ff23d
-SHA512 (mpd-0.21.10.tar.xz) = 42272ab5f767c5a6b907f5dd922ca35abc759dfbb4769a235261fdf0433a0f70494f503255403d41dfd34902bd6aff21f48291b24fd5bc260a5fdef53800c991
-Size (mpd-0.21.10.tar.xz) = 670952 bytes
+SHA1 (mpd-0.21.11.tar.xz) = ae7c9ce111bdb7fdfe6316083fda56ad0a676438
+RMD160 (mpd-0.21.11.tar.xz) = b9c77baa7b138a9a9e25007e16d6269fe35c4090
+SHA512 (mpd-0.21.11.tar.xz) = 40e25428295f1bded618872c1450f6836c46b2e788dca06d0af134b939a25a7a9a215273bb005306df288e5dc5ccb44d4054c47e5583e54b970fa252e4b030a7
+Size (mpd-0.21.11.tar.xz) = 671444 bytes
 SHA1 (patch-src_net_IPv6Address.hxx) = c9e9a5676451e6834fcef359266d37fc15f079e6
diff --git a/audio/musicpd/files/mpd.conf b/audio/musicpd/files/mpd.conf
index 4bf8302cb6d..8f2e0a173f1 100644
--- a/audio/musicpd/files/mpd.conf
+++ b/audio/musicpd/files/mpd.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mpd.conf,v 1.7 2014/04/18 12:46:58 wiz Exp $
+# $NetBSD: mpd.conf,v 1.8 2019/07/15 13:47:14 nia Exp $
 
 # required
 music_directory		"/mp3"
@@ -16,7 +16,6 @@ state_file		"/mp3/.mpdstate"
 save_absolute_paths_in_playlists "no"
 
 max_playlist_length	"4096"
-buffer_before_play	"25%"
 bind_to_address		"any"
 
 audio_output {
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index e203d0d6851..554e47749d7 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,168 +1,239 @@
-# $NetBSD: options.mk,v 1.33 2019/01/06 14:47:20 wiz Exp $
+# $NetBSD: options.mk,v 1.34 2019/07/15 13:47:14 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS=	adplug audiofile avahi bzip2 curl faad ffmpeg flac fluidsynth game-music-emu id3 libao lame jack libmms libmpdclient libsoxr libwildmidi mikmod modplug mpg123 musepack musicpd-soundcloud openal opus pulseaudio shine shout sqlite3 tremor twolame vorbis wavpack zziplib
-PKG_SUGGESTED_OPTIONS=	audiofile curl faad flac id3 libao musepack shout vorbis
+PKG_SUPPORTED_OPTIONS=	adplug avahi bzip2 cdparanoia chromaprint curl dbus faad ffmpeg fluidsynth id3 libao libgme lame jack libmms libmpdclient libsoxr libwildmidi mikmod modplug musepack musicpd-soundcloud openal pulseaudio samba samplerate sidplay shine shout sndfile tremor twolame upnp wavpack zziplib
+PKG_SUGGESTED_OPTIONS=	curl faad ffmpeg id3 libao musepack samplerate shout sndfile vorbis
 
-PKG_OPTIONS_OPTIONAL_GROUPS=	vorbis
+PKG_OPTIONS_LEGACY_OPTS+=	game-music-emu:libgme
+
+PKG_OPTIONS_OPTIONAL_GROUPS=	resampler vorbis
 PKG_OPTIONS_GROUP.vorbis=	tremor vorbis
+PKG_OPTIONS_GROUP.resampler=	samplerate libsoxr
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Madplug)
 .  include "../../audio/adplug/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Maudiofile)
-BUILDLINK_API_DEPENDS.libaudiofile+=	libaudiofile>=0.3
-.  include "../../audio/libaudiofile/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dadplug=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mavahi)
 .  include "../../net/avahi/buildlink3.mk"
+MESON_ARGS+=	-Dzeroconf=avahi
+.else
+MESON_ARGS+=	-Dzeroconf=auto
 .endif
 
 .if !empty(PKG_OPTIONS:Mbzip2)
 .  include "../../archivers/bzip2/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dbzip2=disabled
 .endif
 
-# wants a different version of the library than we have in pkgsrc
-#.if !empty(PKG_OPTIONS:Mcdparanoia)
-#.  include "../../audio/cdparanoia/buildlink3.mk"
-#.endif
+.if !empty(PKG_OPTIONS:Mcdparanoia)
+.  include "../../misc/libcdio-paranoia/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dcdio_paranoia=disabled
+.endif
+
+.if !empty(PKG_OPTIONS:Mchromaprint)
+.  include "../../audio/chromaprint/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dchromaprint=disabled
+.endif
 
 .if !empty(PKG_OPTIONS:Mcurl)
 .  include "../../www/curl/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dcurl=disabled
+.endif
+
+.if !empty(PKG_OPTIONS:Mdbus)
+.  include "../../sysutils/dbus/buildlink3.mk"
+.else
+MESON_ARGS+=	-Ddbus=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mfaad)
 .  include "../../audio/faad2/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dfaad=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mffmpeg)
 .  include "../../multimedia/ffmpeg4/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mflac)
-BUILDLINK_ABI_DEPENDS.flac+=	flac>=1.2
-.  include "../../audio/flac/buildlink3.mk"
-# XXX whole album flac files can appearently be parsed without libcue,
-# so I've yet to find out what libcue is good for
-#.  include "../../audio/libcue/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dffmpeg=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mfluidsynth)
 .  include "../../audio/fluidsynth/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dfluidsynth=disabled
 .endif
 
-.if !empty(PKG_OPTIONS:Mgame-music-emu)
+.if !empty(PKG_OPTIONS:Mlibgme)
 .  include "../../audio/game-music-emu/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dgme=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mid3)
 .  include "../../audio/libid3tag/buildlink3.mk"
+.else
+MESON_ARGS+=	-Did3tag=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mjack)
 .  include "../../audio/jack/buildlink3.mk"
+.else
+MESON_ARGS+=	-Djack=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mlame)
 .  include "../../audio/lame/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dlame=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibao)
 .  include "../../audio/libao/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dao=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibmms)
 .  include "../../net/libmms/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dmms=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibmpdclient)
 .  include "../../audio/libmpdclient/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dlibmpdclient=disabled
 .endif
 
-# does not find libresid-builder
-#.if !empty(PKG_OPTIONS:Mlibsidplay2)
-#.  include "../../audio/libsidplay2/buildlink3.mk"
-#.endif
-
 .if !empty(PKG_OPTIONS:Mlibsoxr)
 .  include "../../audio/libsoxr/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dsoxr=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibwildmidi)
 .  include "../../audio/libwildmidi/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dwildmidi=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mmikmod)
 .  include "../../audio/libmikmod/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dmikmod=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mmodplug)
 .  include "../../audio/libmodplug/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mmpg123)
-.  include "../../audio/mpg123/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dmodplug=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mmusepack)
 .  include "../../audio/musepack/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dmpcdec=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mmusicpd-soundcloud)
 BUILDLINK_API_DEPENDS.yajl+=	yajl>=2.1
 .  include "../../devel/yajl/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dyajl=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mopenal)
 .  include "../../audio/openal-soft/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mopus)
-.  include "../../audio/libopus/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dopenal=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .  include "../../audio/pulseaudio/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dpulse=disabled
+.endif
+
+.if !empty(PKG_OPTIONS:Msamba)
+.  include "../../net/samba4/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dsmbclient=disabled
+.endif
+
+.if !empty(PKG_OPTIONS:Msamplerate)
+.  include "../../audio/libsamplerate/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dsamplerate=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mshine)
 .  include "../../audio/shine/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dshine=disabled
+.endif
+
+.if !empty(PKG_OPTIONS:Msidplay)
+.  include "../../audio/libsidplay2/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dsidplay=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mshout)
 .  include "../../audio/libshout/buildlink3.mk"
 .  include "../../audio/lame/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dshout=disabled
 .endif
 
-# needs libresid-builder or libsidutils, both not packaged yet
-#.if !empty(PKG_OPTIONS:Msidplay)
-#.  include "../../audio/libsidplay2/buildlink3.mk"
-#.endif
-
-.if !empty(PKG_OPTIONS:Msqlite3)
-.  include "../../databases/sqlite3/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Msndfile)
+.  include "../../audio/libsndfile/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dsndfile=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mtremor)
 .  include "../../audio/tremor/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dtremor=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mtwolame)
 .  include "../../audio/twolame/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dtwolame=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mvorbis)
 .  include "../../audio/libvorbis/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dvorbis=disabled
+MESON_ARGS+=	-Dvorbisenc=disabled
+.endif
+
+.if !empty(PKG_OPTIONS:Mupnp)
+.  include "../../net/libupnp/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dupnp=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mwavpack)
 .  include "../../audio/wavpack/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dwavpack=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mzziplib)
 .  include "../../archivers/zziplib/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dzzip=disabled
 .endif