Update to 0.19.7:

ver 0.19.7 (2014/12/17)
* input
  - nfs: fix crash while canceling a failing file open operation
  - nfs: fix memory leak on connection failure
  - nfs: fix reconnect after mount failure
  - nfs: implement mount timeout (60 seconds)
* storage
  - nfs: implement I/O timeout (60 seconds)
* playlist
  - embcue: fix filename suffix detection
  - don't skip non-existent songs in "listplaylist"
* decoder
  - ffmpeg: fix time stamp underflow
* fix memory allocator bug on Windows

ver 0.19.6 (2014/12/08)
* decoder
  - ffmpeg: support FFmpeg 2.5
* fix build failure with musl
* android
  - update libFLAC to 1.3.1
  - update FFmpeg to 2.5

ver 0.19.5 (2014/11/26)
* input
  - nfs: fix crash on connection failure
* archive
  - zzip: fix crash after seeking
* decoder
  - dsdiff, dsf, opus: fix deadlock while seeking
  - mp4v2: remove because of incompatible license

ver 0.19.4 (2014/11/18)
* protocol
  - workaround for buggy clients that send "add /"
* decoder
  - ffmpeg: support opus
  - opus: add MIME types audio/ogg and application/ogg
* fix crash on failed filename charset conversion
* fix local socket detection from uid=0 (root)

ver 0.19.3 (2014/11/11)
* protocol
  - fix "(null)" result string to "list" when AlbumArtist is disabled
* database
  - upnp: fix breakage due to malformed URIs
* input
  - curl: another fix for redirected streams
* decoder
  - audiofile: fix crash while playing streams
  - audiofile: fix bit rate calculation
  - ffmpeg: support opus
  - opus: fix bogus duration on streams
  - opus: support chained streams
  - opus: improved error logging
* fix distorted audio with soxr resampler
* fix build failure on Mac OS X with non-Apple compilers

ver 0.19.2 (2014/11/02)
* input
  - curl: fix redirected streams
* playlist
  - don't allow empty playlist name
  - m3u: don't ignore unterminated last line
  - m3u: recognize the file suffix ".m3u8"
* decoder
  - ignore URI query string for plugin detection
  - faad: remove workaround for ancient libfaad2 ABI bug
  - ffmpeg: recognize MIME type audio/aacp
  - mad: fix negative replay gain values
* output
  - fix memory leak after filter initialization error
  - fall back to PCM if given DSD sample rate is not supported
* fix assertion failure on unsupported PCM conversion
* auto-disable plugins that require GLib when --disable-glib is used

ver 0.19.1 (2014/10/19)
* input
  - mms: fix deadlock bug
* playlist
  - extm3u: fix Extended M3U detection
  - m3u, extm3u, cue: fix truncated lines
* fix build failure on Mac OS X
* add missing file systemd/mpd.socket to tarball

ver 0.19 (2014/10/10)
* protocol
  - new commands "addtagid", "cleartagid", "listfiles", "listmounts",
    "listneighbors", "mount", "rangeid", "unmount"
  - "lsinfo" and "readcomments" allowed for remote files
  - "listneighbors" lists file servers on the local network
  - "playlistadd" supports file:///
  - "idle" with unrecognized event name fails
  - "list" on album artist falls back to the artist tag
  - "list" and "count" allow grouping
  - new "search"/"find" filter "modified-since"
  - "seek*" allows fractional position
  - close connection after syntax error
* database
  - proxy: forward "idle" events
  - proxy: forward the "update" command
  - proxy: copy "Last-Modified" from remote directories
  - simple: compress the database file using gzip
  - upnp: new plugin
  - cancel the update on shutdown
* storage
  - music_directory can point to a remote file server
  - nfs: new plugin
  - smbclient: new plugin
* playlist
  - cue: fix bogus duration of the last track
  - cue: restore CUE tracks from state file
  - soundcloud: use https instead of http
  - soundcloud: add default API key
* archive
  - read tags from songs in an archive
* input
  - alsa: new input plugin
  - curl: options "verify_peer" and "verify_host"
  - ffmpeg: update offset after seeking
  - ffmpeg: improved error messages
  - mms: non-blocking I/O
  - nfs: new input plugin
  - smbclient: new input plugin
* filter
  - volume: improved software volume dithering
* decoder:
  - vorbis, flac, opus: honor DESCRIPTION= tag in Xiph-based files as a comment to the song
  - audiofile: support scanning remote files
  - audiofile: log libaudiofile errors
  - dsdiff, dsf: report bit rate
  - dsdiff, dsf: implement seeking
  - dsf: support DSD512
  - dsf: support multi-channel files
  - dsf: fix big-endian bugs
  - dsf: fix noise at end of malformed file
  - mpg123: support ID3v2, ReplayGain and MixRamp
  - sndfile: support scanning remote files
  - sndfile: support tags "comment", "album", "track", "genre"
  - sndfile: native floating point playback
  - sndfile: optimized 16 bit playback
  - mp4v2: support playback of MP4 files.
* encoder:
  - shine: new encoder plugin
* output
  - alsa: support native DSD playback
  - alsa: rename "DSD over USB" to "DoP"
  - osx: fix hang after (un)plugging headphones
* threads:
  - the update thread runs at "idle" priority
  - the output thread runs at "real-time" priority
  - increase kernel timer slack on Linux
  - name each thread (for debugging)
* configuration
  - allow playlist directory without music directory
  - use XDG to auto-detect "music_directory" and "db_file"
* add tags "AlbumSort", "MUSICBRAINZ_RELEASETRACKID"
* disable global Latin-1 fallback for tag values
* new resampler option using libsoxr
* ARM NEON optimizations
* install systemd unit for socket activation
* Android port

5 files changed, 37 insertions, 11 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 21a77264c66..fab8bd12f47 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.98 2014/12/30 13:40:51 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2015/01/05 22:19:02 wiz Exp $
 
-DISTNAME=		mpd-0.18.21
+DISTNAME=		mpd-0.19.7
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
 CATEGORIES=		audio
-MASTER_SITES=		http://www.musicpd.org/download/mpd/0.18/
+MASTER_SITES=		http://www.musicpd.org/download/mpd/0.19/
 #MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 EXTRACT_SUFX=		.tar.xz
 
@@ -47,7 +47,9 @@ post-extract:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/mpd.conf ${DESTDIR}${EGDIR}
 
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
diff --git a/audio/musicpd/PLIST b/audio/musicpd/PLIST
index 011869e23bd..68719e7399a 100644
--- a/audio/musicpd/PLIST
+++ b/audio/musicpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:04:58 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/01/05 22:19:02 wiz Exp $
 bin/mpd
 man/man1/mpd.1
 man/man5/mpd.conf.5
@@ -6,6 +6,5 @@ share/doc/mpd/AUTHORS
 share/doc/mpd/COPYING
 share/doc/mpd/NEWS
 share/doc/mpd/README
-share/doc/mpd/UPGRADING
 share/doc/mpd/mpdconf.example
 share/examples/mpd/mpd.conf
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index ac23384feb0..6c486c1415c 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.54 2014/12/30 13:40:51 wiz Exp $
+$NetBSD: distinfo,v 1.55 2015/01/05 22:19:02 wiz Exp $
 
-SHA1 (mpd-0.18.21.tar.xz) = e3101df4fcadada763096ac41ddee87452a021a4
-RMD160 (mpd-0.18.21.tar.xz) = cfe6242cb4e56c2aafde09fee2adba964c0e8429
-Size (mpd-0.18.21.tar.xz) = 586824 bytes
-SHA1 (patch-src_output_HttpdOutputPlugin.cxx) = 6e046d00a4e59c905d8fe014afe854aac1337e8d
+SHA1 (mpd-0.19.7.tar.xz) = 6f67d8ac14881c2d72c2907c2c1e14c6b2fd04c5
+RMD160 (mpd-0.19.7.tar.xz) = a3e87425945378a48b537ad2eb00c14af0f29c13
+Size (mpd-0.19.7.tar.xz) = 704040 bytes
+SHA1 (patch-src_thread_Name.hxx) = 74638b3f4984415b8890e23cd06754e240e9bebd
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index 28cc0e63ebc..7f9b25096d6 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,9 +1,13 @@
-# $NetBSD: options.mk,v 1.26 2014/12/14 15:47:03 wiz Exp $
+# $NetBSD: options.mk,v 1.27 2015/01/05 22:19:02 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.musicpd
 PKG_SUPPORTED_OPTIONS=	adplug audiofile avahi bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libmpdclient libwildmidi mikmod modplug mpg123 musepack musicpd-soundcloud openal opus pulseaudio shout sqlite3 tremor twolame vorbis wavpack zziplib
 PKG_SUGGESTED_OPTIONS=	audiofile curl faad flac id3 inet6 libao musepack vorbis
 
+# TODO:
+# shine
+# libsoxr
+
 PKG_OPTIONS_OPTIONAL_GROUPS=	vorbis
 PKG_OPTIONS_GROUP.vorbis=	tremor vorbis
 
diff --git a/audio/musicpd/patches/patch-src_thread_Name.hxx b/audio/musicpd/patches/patch-src_thread_Name.hxx
new file mode 100644
index 00000000000..19d0f08740c
--- /dev/null
+++ b/audio/musicpd/patches/patch-src_thread_Name.hxx
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_thread_Name.hxx,v 1.1 2015/01/05 22:19:02 wiz Exp $
+
+http://bugs.musicpd.org/view.php?id=4266
+
+Still gives:
+In file included from src/IOThread.cxx:25:0:
+src/thread/Name.hxx: In function 'void SetThreadName(const char*)':
+src/thread/Name.hxx:37:51: warning: cast from type 'const char*' to type 'void*' casts away qualifiers [-Wcast-qual]
+  pthread_setname_np(pthread_self(), "%s", (void *)name);
+                                                   ^
+--- src/thread/Name.hxx.orig	2014-10-24 22:28:53.000000000 +0000
++++ src/thread/Name.hxx
+@@ -33,6 +33,8 @@ SetThreadName(const char *name)
+ #ifdef HAVE_PTHREAD_SETNAME_NP
+ #ifdef __APPLE__
+ 	pthread_setname_np(name);
++#elif defined(__NetBSD__)
++	pthread_setname_np(pthread_self(), "%s", (void *)name);
+ #else
+ 	pthread_setname_np(pthread_self(), name);
+ #endif