Update to 0.16, add libsidplay option.

ver 0.16 (2010/12/11)
* protocol:
  - send song modification time to client
  - added "update" idle event
  - removed the deprecated "volume" command
  - added the "findadd" command
  - range support for "delete"
  - "previous" really plays the previous song
  - "addid" with negative position is deprecated
  - "load" supports remote playlists (extm3u, pls, asx, xspf, lastfm://)
  - allow changing replay gain mode on-the-fly
  - omitting the range end is possible
  - "update" checks if the path is malformed
* archive:
  - iso: renamed plugin to "iso9660"
  - zip: renamed plugin to "zzip"
* input:
  - lastfm: obsolete plugin removed
  - ffmpeg: new input plugin using libavformat's "avio" library
* tags:
  - added tags "ArtistSort", "AlbumArtistSort"
  - id3: revised "performer" tag support
  - id3: support multiple values
  - ape: MusicBrainz tags
  - ape: support multiple values
* decoders:
  - don't try a plugin twice (MIME type & suffix)
  - don't fall back to "mad" unless no plugin matches
  - ffmpeg: support multiple tags
  - ffmpeg: convert metadata to generic format
  - ffmpeg: implement the libavutil log callback
  - sndfile: new decoder plugin based on libsndfile
  - flac: moved CUE sheet support to a playlist plugin
  - flac: support streams without STREAMINFO block
  - mikmod: sample rate is configurable
  - mpg123: new decoder plugin based on libmpg123
  - sidplay: support sub-tunes
  - sidplay: implemented songlength database
  - sidplay: support seeking
  - sidplay: play monaural SID tunes in mono
  - sidplay: play mus, str, prg, x00 files
  - wavpack: activate 32 bit support
  - wavpack: allow more than 2 channels
  - mp4ff: rename plugin "mp4" to "mp4ff"
* encoders:
  - twolame: new encoder plugin based on libtwolame
  - flac: new encoder plugin based on libFLAC
  - wave: new encoder plugin for PCM WAV format
* output:
  - recorder: new output plugin for recording radio streams
  - alsa: don't recover on CANCEL
  - alsa: fill period buffer with silence before draining
  - openal: new output plugin
  - pulse: announce "media.role=music"
  - pulse: renamed context to "Music Player Daemon"
  - pulse: connect to server on MPD startup, implement pause
  - jack: require libjack 0.100
  - jack: don't disconnect during pause
  - jack: connect to server on MPD startup
  - jack: added options "client_name", "server_name"
  - jack: clear ring buffers before activating
  - jack: renamed option "ports" to "destination_ports"
  - jack: support more than two audio channels
  - httpd: bind port when output is enabled
  - httpd: added name/genre/website configuration
  - httpd: implement "pause"
  - httpd: bind_to_address support (including IPv6)
  - oss: 24 bit support via OSS4
  - win32: new output plugin for Windows Wave
  - shout, httpd: more responsive to control commands
  - wildcards allowed in audio_format configuration
  - consistently lock audio output objects
* player:
  - drain audio outputs at the end of the playlist
* mixers:
  - removed support for legacy mixer configuration
  - reimplemented software volume as mixer+filter plugin
  - per-device software/hardware mixer setting
* commands:
  - added new "status" line with more precise "elapsed time"
* update:
  - automatically update the database with Linux inotify
  - support .mpdignore files in the music directory
  - sort songs by album name first, then disc/track number
  - rescan after metadata_to_use change
* normalize: upgraded to AudioCompress 2.0
  - automatically convert to 16 bit samples
* replay gain:
  - reimplemented as a filter plugin
  - fall back to track gain if album gain is unavailable
  - optionally use hardware mixer to apply replay gain
  - added mode "auto"
  - parse replay gain from APE tags
* log unused/unknown block parameters
* removed the deprecated "error_file" option
* save state when stopped
* renamed option "--stdout" to "--stderr"
* removed options --create-db and --no-create-db
* state_file: save only if something has changed
* database: eliminated maximum line length
* log: redirect stdout/stderr to /dev/null if syslog is used
* set the close-on-exec flag on all file descriptors
* pcm_volume, pcm_mix: implemented 32 bit support
* support packed 24 bit samples
* CUE sheet support
* support for MixRamp tags
* obey $(sysconfdir) for default mpd.conf location
* build with large file support by default
* added test suite ("make check")
* require GLib 2.12
* added libwrap support
* make single mode 'sticky'

7 files changed, 44 insertions, 63 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 3cc7b40e913..b8de432a6eb 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.46 2011/01/11 11:43:19 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2011/02/27 10:42:13 wiz Exp $
 
-DISTNAME=		mpd-0.15.15
+DISTNAME=		mpd-0.16
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
 CATEGORIES=		audio
 #MASTER_SITES=		http://musicpd.org/uploads/files/
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 EXTRACT_SUFX=		.tar.bz2
 
-CONFLICTS=		mpd-[0-9]*
-
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://musicpd.org/
 COMMENT=		Remote controllable audio player
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+CONFLICTS=		mpd-[0-9]*
+
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index db8b0c75875..cb1314169f3 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.29 2011/01/11 11:43:19 drochner Exp $
+$NetBSD: distinfo,v 1.30 2011/02/27 10:42:13 wiz Exp $
 
-SHA1 (mpd-0.15.15.tar.bz2) = 2ec37cc32469255ea603d15617f100d1f12e766c
-RMD160 (mpd-0.15.15.tar.bz2) = 16b6196f698f0442ad6d76b7a03f06f0dcc5a245
-Size (mpd-0.15.15.tar.bz2) = 391688 bytes
-SHA1 (patch-aa) = 14c63f15f09d6d22770b90a30cc49951c8d1d38a
-SHA1 (patch-ab) = 080c2b068fd30cd9ea9c67fb1dcb5ca7c1336a04
-SHA1 (patch-ac) = 1fa9333d4e54ccabe02ed94c4bddd1d3a1e6d914
+SHA1 (mpd-0.16.tar.bz2) = ab2fc09474501b5b9396a359027ca4f1ebbd4aa5
+RMD160 (mpd-0.16.tar.bz2) = acc2f53f160dedb5222c0dea75afbffad95d46c2
+Size (mpd-0.16.tar.bz2) = 479757 bytes
+SHA1 (patch-ac) = 573d8a07a12d56036a938323e387d62d4d21448f
+SHA1 (patch-configure) = 4858fb0fce6a73b951b6c196838c5876330b3fcc
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index 5097f209384..3225d2f6ccb 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.14 2011/01/11 11:43:19 drochner Exp $
+# $NetBSD: options.mk,v 1.15 2011/02/27 10:42:13 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS=	aac audiofile curl flac id3 libao jack libmikmod musepack ogg inet6 shout ffmpeg
+PKG_SUPPORTED_OPTIONS=	aac audiofile curl ffmpeg flac id3 inet6 libao jack libmikmod musepack ogg shout sidplay
 PKG_SUGGESTED_OPTIONS=	aac audiofile curl flac id3 libao musepack ogg
 
 .include "../../mk/bsd.options.mk"
@@ -94,6 +94,12 @@ CONFIGURE_ARGS+=	--enable-shout
 CONFIGURE_ARGS+=	--disable-shout
 .endif
 
+.if !empty(PKG_OPTIONS:Msidplay)
+.  include "../../audio/libsidplay2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-sidplay
+.endif
+
 .if !empty(PKG_OPTIONS:Mffmpeg)
 .  include "../../multimedia/ffmpeg/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ffmpeg=${BUILDLINK_PREFIX.ffmpeg}
diff --git a/audio/musicpd/patches/patch-aa b/audio/musicpd/patches/patch-aa
deleted file mode 100644
index c2da6ab7049..00000000000
--- a/audio/musicpd/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2009/07/30 16:51:04 drochner Exp $
-
---- src/decoder/flac_plugin.c.orig	2009-07-15 22:34:47.000000000 +0200
-+++ src/decoder/flac_plugin.c
-@@ -619,6 +619,7 @@ flac_container_decode(struct decoder* de
- 		// we only need to break at the end of track if we are in "cue mode"
- 		if (data.time >= data.total_time)
- 		{
-+			break;
- 			flacPrintErroredState(flac_get_state(flac_dec));
- 			flac_finish(flac_dec);
- 		}
diff --git a/audio/musicpd/patches/patch-ab b/audio/musicpd/patches/patch-ab
deleted file mode 100644
index cfb8b65a58e..00000000000
--- a/audio/musicpd/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/08/10 23:10:29 tnn Exp $
-
---- src/decoder/mp4ff_plugin.c.orig	2009-07-15 22:34:45.000000000 +0200
-+++ src/decoder/mp4ff_plugin.c
-@@ -47,7 +47,7 @@ mp4_get_aac_track(mp4ff_t * infile, faac
- 	/* neaacdec.h declares all arguments as "unsigned long", but
- 	   internally expects uint32_t pointers.  To avoid gcc
- 	   warnings, use this workaround. */
--	unsigned long *sample_rate_r = (unsigned long*)sample_rate;
-+	unsigned long sample_rate_r;
- #else
- 	uint32_t *sample_rate_r = sample_rate;
- #endif
-@@ -73,12 +73,14 @@ mp4_get_aac_track(mp4ff_t * infile, faac
- 			continue;
- 
- 		rc = faacDecInit2(decoder, buff, buff_size,
--				  sample_rate_r, channels_r);
-+				  &sample_rate_r, channels_r);
- 		free(buff);
- 
--		if (rc >= 0)
-+		if (rc >= 0) {
- 			/* found a valid AAC track */
-+			*sample_rate = (uint32_t)sample_rate_r;
- 			return i;
-+		}
- 	}
- 
- 	/* can't decode this */
diff --git a/audio/musicpd/patches/patch-ac b/audio/musicpd/patches/patch-ac
index 40ee2f192df..0e04cff5b88 100644
--- a/audio/musicpd/patches/patch-ac
+++ b/audio/musicpd/patches/patch-ac
@@ -1,12 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2010/05/19 18:25:19 drochner Exp $
+$NetBSD: patch-ac,v 1.4 2011/02/27 10:42:14 wiz Exp $
 
---- src/output/ao_plugin.c.orig	2010-05-19 14:49:45.000000000 +0000
+Initialise structure.
+
+--- src/output/ao_plugin.c.orig	2010-12-11 12:17:51.000000000 +0000
 +++ src/output/ao_plugin.c
-@@ -175,6 +175,7 @@ ao_output_open(void *data, struct audio_
- 	if (audio_format->bits > 16)
- 		audio_format->bits = 16;
+@@ -170,6 +170,8 @@ ao_output_open(void *data, struct audio_
+ 	ao_sample_format format;
+ 	struct ao_data *ad = (struct ao_data *)data;
  
 +	memset(&format, 0, sizeof(format));
- 	format.bits = audio_format->bits;
- 	format.rate = audio_format->sample_rate;
- 	format.byte_format = AO_FMT_NATIVE;
++
+ 	switch (audio_format->format) {
+ 	case SAMPLE_FORMAT_S8:
+ 		format.bits = 8;
diff --git a/audio/musicpd/patches/patch-configure b/audio/musicpd/patches/patch-configure
new file mode 100644
index 00000000000..ad96f9096b1
--- /dev/null
+++ b/audio/musicpd/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2011/02/27 10:42:14 wiz Exp $
+
+Unportable test(1) construct.
+
+--- configure.orig	2011-02-26 16:48:03.000000000 +0000
++++ configure
+@@ -7783,7 +7783,7 @@ else
+ fi
+ 
+ 
+-if test x$with_tremor == xno || test -z $with_tremor; then
++if test x$with_tremor = xno || test -z $with_tremor; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5