Fri Apr 18 12:46:58 2014 UTC ()
Update to 0.18.10. Add support for many more optional dependencies.

ver 0.18.10 (2014/04/10)
* decoder
  - ffmpeg: fix seeking bug
  - ffmpeg: handle unknown stream start time
  - gme: fix memory leak
  - sndfile: work around libsndfile bug on partial read
* don't interrupt playback when current song gets deleted

ver 0.18.9 (2014/03/02)
* protocol
  - "findadd" requires the "add" permission
* output
  - alsa: improved workaround for noise after manual song change
* decoder
  - vorbis: fix linker failure when libvorbis/libogg are static
* encoder
  - vorbis: fix another linker failure
* output
  - pipe: fix hanging child process due to blocked signals
* fix build failure due to missing signal.h include

ver 0.18.8 (2014/02/07)
* decoder
  - ffmpeg: support libav v10_alpha1
* encoder
  - vorbis: fix linker failure
* output
  - roar: documentation
* more robust Icy-Metadata parser
* fix Solaris build failure

ver 0.18.7 (2014/01/13)
* playlist
  - pls: fix crash after parser error
  - soundcloud: fix build failure with libyajl 2.0.1
* decoder
  - faad: fix memory leak
  - mpcdec: reject libmpcdec SV7 in configure script
* daemon: don't initialize supplementary groups when already running
  as the configured user

ver 0.18.6 (2013/12/24)
* input
  - cdio_paranoia: support libcdio-paranoia 0.90
* tags
  - riff: recognize upper-case "ID3" chunk name
* decoder
  - ffmpeg: use relative timestamps
* output
  - openal: fix build failure on Mac OS X
  - osx: fix build failure
* mixer
  - alsa: fix build failure with uClibc
* fix replay gain during cross-fade
* accept files without metadata

ver 0.18.5 (2013/11/23)
* configuration
  - fix crash when db_file is configured without music_directory
  - fix crash on "stats" without db_file/music_directory
* database
  - proxy: auto-reload statistics
  - proxy: provide "db_update" in "stats" response
* input
  - curl: work around stream resume bug (fixed in libcurl 7.32.0)
* decoder
  - fluidsynth: auto-detect by default
* clip 24 bit data from libsamplerate
* fix ia64, mipsel and other little-endian architectures
* fix build failures due to missing includes
* fix build failure with static libmpdclient

ver 0.18.4 (2013/11/13)
* decoder
  - dsdiff: fix byte order bug
* fix build failures due to missing includes
* libc++ compatibility

ver 0.18.3 (2013/11/08)
* fix stuck MPD after song change (0.18.2 regression)

ver 0.18.2 (2013/11/07)
* protocol:
  - "close" flushes the output buffer
* input:
  - cdio_paranoia: add setting "default_byte_order"
  - curl: fix bug with redirected streams
* playlist:
  - pls: fix reversed song order
* decoder:
  - audiofile: require libaudiofile 0.3 due to API breakage
  - dsf: enable DSD128
* enable buffering when starting playback (regression fix)
* fix build failures due to missing includes
* fix big-endian support

ver 0.18.1 (2013/11/04)
* protocol:
  - always ignore whitespace at the end of the line
* networking:
  - log UNIX domain path names instead of "localhost"
  - open listener sockets in the order they were configured
  - don't abort if IPv6 is not available
* output:
  - alsa: avoid endless loop in Raspberry Pi workaround
* filter:
  - autoconvert: fix "volume_normalization" with mp3 files
* add missing files to source tarball

ver 0.18 (2013/10/31)
* configuration:
  - allow tilde paths for socket
  - default filesystem charset is UTF-8 instead of ISO-8859-1
  - increase default buffer size to 4 MB
* protocol:
  - new command "readcomments" lists arbitrary file tags
  - new command "toggleoutput"
  - "find"/"search" with "any" does not match file name
  - "search" and "find" with base URI (keyword "base")
  - search for album artist falls back to the artist tag
  - re-add the "volume" command
* input:
  - curl: enable https
  - soup: plugin removed
* playlist:
  - lastfm: remove defunct Last.fm support
* decoder:
  - adplug: new decoder plugin using libadplug
  - dsf: don't play junk at the end of the "data" chunk
  - ffmpeg: drop support for pre-0.8 ffmpeg
  - flac: require libFLAC 1.2 or newer
  - flac: support FLAC files inside archives
  - opus: new decoder plugin for the Opus codec
  - vorbis: skip 16 bit quantisation, provide float samples
  - mikmod: add "loop" configuration parameter
  - modplug: add "loop_count" configuration parameter
  - mp4ff: obsolete plugin removed
* encoder:
  - opus: new encoder plugin for the Opus codec
  - vorbis: accept floating point input samples
* output:
  - new option "tags" may be used to disable sending tags to output
  - alsa: workaround for noise after manual song change
  - ffado: remove broken plugin
  - httpd: support HEAD requests
  - mvp: remove obsolete plugin
  - osx: disabled by default because it's unmaintained and unsupported
* improved decoder/output error reporting
* eliminate timer wakeup on idle MPD
* fix unresponsive MPD while waiting for stream
* port of the source code to C++11

ver 0.17.6 (2013/10/14)
* mixer:
  - alsa: fix busy loop when USB sound device gets unplugged
* decoder:
  - modplug: fix build with Debian package 1:0.8.8.4-4
* stored playlists:
  - fix loading playlists with references to local files
  - obey filesystem_charset for URLs


(wiz)
diff -r1.77 -r1.78 pkgsrc/audio/musicpd/Makefile
diff -r1.38 -r1.39 pkgsrc/audio/musicpd/distinfo
diff -r1.20 -r1.21 pkgsrc/audio/musicpd/options.mk
diff -r1.6 -r1.7 pkgsrc/audio/musicpd/files/mpd.conf
diff -r1.3 -r0 pkgsrc/audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c
cvs diff -r1.77 -r1.78 pkgsrc/audio/musicpd/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/Makefile 2014/04/16 11:22:01 1.77
+++ pkgsrc/audio/musicpd/Makefile 2014/04/18 12:46:57 1.78
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.77 2014/04/16 11:22:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.78 2014/04/18 12:46:57 wiz Exp $
2 2
3DISTNAME= mpd-0.17.5 3DISTNAME= mpd-0.18.10
4PKGNAME= ${DISTNAME:S/mpd/musicpd/} 4PKGNAME= ${DISTNAME:S/mpd/musicpd/}
5PKGREVISION= 6 
6CATEGORIES= audio 5CATEGORIES= audio
7MASTER_SITES= http://www.musicpd.org/download/mpd/0.17/ 6MASTER_SITES= http://www.musicpd.org/download/mpd/0.18/
8#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} 7#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
9EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.xz
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://musicpd.org/ 11HOMEPAGE= http://musicpd.org/
13COMMENT= Remote controllable audio player 12COMMENT= Remote controllable audio player
14LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
15 14
16CONFLICTS= mpd-[0-9]* 15CONFLICTS= mpd-[0-9]*
17 16
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 18USE_LIBTOOL= yes
20USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
21USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
22 21
cvs diff -r1.38 -r1.39 pkgsrc/audio/musicpd/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/distinfo 2013/10/01 15:21:44 1.38
+++ pkgsrc/audio/musicpd/distinfo 2014/04/18 12:46:57 1.39
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
1$NetBSD: distinfo,v 1.38 2013/10/01 15:21:44 drochner Exp $ 1$NetBSD: distinfo,v 1.39 2014/04/18 12:46:57 wiz Exp $
2 2
3SHA1 (mpd-0.17.5.tar.bz2) = 91e4d8d364a3db02e6f92676dd938880e5bb200a 3SHA1 (mpd-0.18.10.tar.xz) = 0923318cfda033bb4f89c219e6effa9d5b330c1d
4RMD160 (mpd-0.17.5.tar.bz2) = 883cd39027fe8c2dd75f6faa25f7417e9197d510 4RMD160 (mpd-0.18.10.tar.xz) = 5bb43bbf1bb028ef1b075aec441a9e7cb6d1f633
5Size (mpd-0.17.5.tar.bz2) = 585656 bytes 5Size (mpd-0.18.10.tar.xz) = 584312 bytes
6SHA1 (patch-src_decoder_audiofile__decoder__plugin.c) = 14ab61bae4dc6626177490cc47403870581bc4cd 
cvs diff -r1.20 -r1.21 pkgsrc/audio/musicpd/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/options.mk 2014/01/05 23:18:49 1.20
+++ pkgsrc/audio/musicpd/options.mk 2014/04/18 12:46:57 1.21
@@ -1,60 +1,84 @@ @@ -1,60 +1,84 @@
1# $NetBSD: options.mk,v 1.20 2014/01/05 23:18:49 wiz Exp $ 1# $NetBSD: options.mk,v 1.21 2014/04/18 12:46:57 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd 3PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
4PKG_SUPPORTED_OPTIONS= audiofile bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libwildmidi mikmod modplug musepack musicpd-lastfm ogg pulseaudio shout sqlite3 wavpack zziplib 4PKG_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
5PKG_SUGGESTED_OPTIONS= audiofile curl faad flac id3 inet6 libao musepack ogg 5PKG_SUGGESTED_OPTIONS= audiofile curl faad flac id3 inet6 libao musepack vorbis
6 6
7PKG_OPTIONS_LEGACY_OPTS= libmikmod:mikmod 7PKG_OPTIONS_OPTIONAL_GROUPS= vorbis
8PKG_OPTIONS_LEGACY_OPTS= aac:faad 8PKG_OPTIONS_GROUP.vorbis= tremor vorbis
 9
 10PKG_OPTIONS_LEGACY_OPTS= ogg:vorbis
9 11
10.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
11 13
 14.if !empty(PKG_OPTIONS:Madplug)
 15. include "../../audio/adplug/buildlink3.mk"
 16CONFIGURE_ARGS+= --enable-adplug
 17.else
 18CONFIGURE_ARGS+= --disable-adplug
 19.endif
 20
12.if !empty(PKG_OPTIONS:Maudiofile) 21.if !empty(PKG_OPTIONS:Maudiofile)
 22BUILDLINK_API_DEPENDS.libaudiofile+= libaudiofile>=0.3
13. include "../../audio/libaudiofile/buildlink3.mk" 23. include "../../audio/libaudiofile/buildlink3.mk"
14CONFIGURE_ARGS+= --enable-audiofile 24CONFIGURE_ARGS+= --enable-audiofile
15.else 25.else
16CONFIGURE_ARGS+= --disable-audiofile 26CONFIGURE_ARGS+= --disable-audiofile
17.endif 27.endif
18 28
 29.if !empty(PKG_OPTIONS:Mavahi)
 30. include "../../net/avahi/buildlink3.mk"
 31CONFIGURE_ARGS+= --with-zeroconf=avahi
 32.endif
 33
19.if !empty(PKG_OPTIONS:Mbzip2) 34.if !empty(PKG_OPTIONS:Mbzip2)
20. include "../../archivers/bzip2/buildlink3.mk" 35. include "../../archivers/bzip2/buildlink3.mk"
21CONFIGURE_ARGS+= --enable-bzip2 36CONFIGURE_ARGS+= --enable-bzip2
22.else 37.else
23CONFIGURE_ARGS+= --disable-bzip2 38CONFIGURE_ARGS+= --disable-bzip2
24.endif 39.endif
25 40
 41# wants a different version of the library than we have in pkgsrc
 42#.if !empty(PKG_OPTIONS:Mcdparanoia)
 43#. include "../../audio/cdparanoia/buildlink3.mk"
 44#CONFIGURE_ARGS+= --enable-cdio-paranoia
 45#.else
 46#CONFIGURE_ARGS+= --enable-cdio-paranoia
 47#.endif
 48
26.if !empty(PKG_OPTIONS:Mcurl) 49.if !empty(PKG_OPTIONS:Mcurl)
27. include "../../www/curl/buildlink3.mk" 50. include "../../www/curl/buildlink3.mk"
28CONFIGURE_ARGS+= --enable-curl 51CONFIGURE_ARGS+= --enable-curl
29.else 52.else
30CONFIGURE_ARGS+= --disable-curl 53CONFIGURE_ARGS+= --disable-curl
31.endif 54.endif
32 55
33.if !empty(PKG_OPTIONS:Mfaad) 56.if !empty(PKG_OPTIONS:Mfaad)
34. include "../../audio/faad2/buildlink3.mk" 57. include "../../audio/faad2/buildlink3.mk"
35CONFIGURE_ARGS+= --with-faad=${BUILDLINK_PREFIX.faad2} 58CONFIGURE_ARGS+= --enable-aac
36.else 59.else
37CONFIGURE_ARGS+= --disable-aac 60CONFIGURE_ARGS+= --disable-aac
38.endif 61.endif
39 62
40.if !empty(PKG_OPTIONS:Mffmpeg) 63.if !empty(PKG_OPTIONS:Mffmpeg)
41. include "../../multimedia/ffmpeg/buildlink3.mk" 64. include "../../multimedia/ffmpeg/buildlink3.mk"
42CONFIGURE_ARGS+= --enable-ffmpeg 65CONFIGURE_ARGS+= --enable-ffmpeg
43.else 66.else
44CONFIGURE_ARGS+= --disable-ffmpeg 67CONFIGURE_ARGS+= --disable-ffmpeg
45.endif 68.endif
46 69
47.if !empty(PKG_OPTIONS:Mflac) 70.if !empty(PKG_OPTIONS:Mflac)
 71BUILDLINK_ABI_DEPENDS.flac+= flac>=1.2
48. include "../../audio/flac/buildlink3.mk" 72. include "../../audio/flac/buildlink3.mk"
49# XXX whole album flac files can appearently be parsed without libcue, 73# XXX whole album flac files can appearently be parsed without libcue,
50# so I've yet to find out what libcue is good for 74# so I've yet to find out what libcue is good for
51#. include "../../audio/libcue/buildlink3.mk" 75#. include "../../audio/libcue/buildlink3.mk"
52CONFIGURE_ARGS+= --enable-flac 76CONFIGURE_ARGS+= --enable-flac
53.else 77.else
54CONFIGURE_ARGS+= --disable-flac 78CONFIGURE_ARGS+= --disable-flac
55.endif 79.endif
56 80
57.if !empty(PKG_OPTIONS:Mfluidsynth) 81.if !empty(PKG_OPTIONS:Mfluidsynth)
58. include "../../audio/fluidsynth/buildlink3.mk" 82. include "../../audio/fluidsynth/buildlink3.mk"
59CONFIGURE_ARGS+= --enable-fluidsynth 83CONFIGURE_ARGS+= --enable-fluidsynth
60.else 84.else
@@ -100,66 +124,97 @@ CONFIGURE_ARGS+= --disable-lame-encoder @@ -100,66 +124,97 @@ CONFIGURE_ARGS+= --disable-lame-encoder
100. include "../../audio/libao/buildlink3.mk" 124. include "../../audio/libao/buildlink3.mk"
101CONFIGURE_ARGS+= --enable-ao 125CONFIGURE_ARGS+= --enable-ao
102.else 126.else
103CONFIGURE_ARGS+= --disable-ao 127CONFIGURE_ARGS+= --disable-ao
104.endif 128.endif
105 129
106.if !empty(PKG_OPTIONS:Mlibmms) 130.if !empty(PKG_OPTIONS:Mlibmms)
107. include "../../net/libmms/buildlink3.mk" 131. include "../../net/libmms/buildlink3.mk"
108CONFIGURE_ARGS+= --enable-mms 132CONFIGURE_ARGS+= --enable-mms
109.else 133.else
110CONFIGURE_ARGS+= --disable-mms 134CONFIGURE_ARGS+= --disable-mms
111.endif 135.endif
112 136
 137.if !empty(PKG_OPTIONS:Mlibmpdclient)
 138. include "../../audio/libmpdclient/buildlink3.mk"
 139CONFIGURE_ARGS+= --enable-libmpdclient
 140.else
 141CONFIGURE_ARGS+= --disable-libmpdclient
 142.endif
 143
 144# does not find libresid-builder
 145#.if !empty(PKG_OPTIONS:Mlibsidplay2)
 146#. include "../../audio/libsidplay2/buildlink3.mk"
 147#CONFIGURE_ARGS+= --enable-sidplay
 148#.else
 149#CONFIGURE_ARGS+= --disable-sidplay
 150#.endif
 151
113.if !empty(PKG_OPTIONS:Mlibwildmidi) 152.if !empty(PKG_OPTIONS:Mlibwildmidi)
114. include "../../audio/libwildmidi/buildlink3.mk" 153. include "../../audio/libwildmidi/buildlink3.mk"
115CONFIGURE_ARGS+= --enable-wildmidi 154CONFIGURE_ARGS+= --enable-wildmidi
116.else 155.else
117CONFIGURE_ARGS+= --disable-wildmidi 156CONFIGURE_ARGS+= --disable-wildmidi
118.endif 157.endif
119 158
120.if !empty(PKG_OPTIONS:Mmikmod) 159.if !empty(PKG_OPTIONS:Mmikmod)
121. include "../../audio/libmikmod/buildlink3.mk" 160. include "../../audio/libmikmod/buildlink3.mk"
122CONFIGURE_ARGS+= --enable-mikmod 161CONFIGURE_ARGS+= --enable-mikmod
123.else 162.else
124CONFIGURE_ARGS+= --disable-mikmod 163CONFIGURE_ARGS+= --disable-mikmod
125.endif 164.endif
126 165
127.if !empty(PKG_OPTIONS:Mmodplug) 166.if !empty(PKG_OPTIONS:Mmodplug)
128. include "../../audio/libmodplug/buildlink3.mk" 167. include "../../audio/libmodplug/buildlink3.mk"
129CONFIGURE_ARGS+= --enable-modplug 168CONFIGURE_ARGS+= --enable-modplug
130.else 169.else
131CONFIGURE_ARGS+= --disable-modplug 170CONFIGURE_ARGS+= --disable-modplug
132.endif 171.endif
133 172
 173.if !empty(PKG_OPTIONS:Mmpg123)
 174. include "../../audio/mpg123/buildlink3.mk"
 175CONFIGURE_ARGS+= --enable-mpg123
 176.else
 177CONFIGURE_ARGS+= --disable-mpg123
 178.endif
 179
134.if !empty(PKG_OPTIONS:Mmusepack) 180.if !empty(PKG_OPTIONS:Mmusepack)
135. include "../../audio/libmpcdec/buildlink3.mk" 181. include "../../wip/musepack/buildlink3.mk"
136CONFIGURE_ENV+= mpcdec_prefix=${BUILDLINK_PREFIX.libmpcdec} 182CONFIGURE_ENV+= mpcdec_prefix=${BUILDLINK_PREFIX.musepack}
137CONFIGURE_ARGS+= --enable-mpc 183CONFIGURE_ARGS+= --enable-mpc
138.else 184.else
139CONFIGURE_ARGS+= --disable-mpc 185CONFIGURE_ARGS+= --disable-mpc
140.endif 186.endif
141 187
142.if !empty(PKG_OPTIONS:Mmusicpd-lastfm) 188.if !empty(PKG_OPTIONS:Mmusicpd-soundcloud)
143CONFIGURE_ARGS+= --enable-lastfm 189BUILDLINK_API_DEPENDS.yajl+= yajl>=2.1
 190. include "../../devel/yajl/buildlink3.mk"
 191CONFIGURE_ARGS+= --enable-soundcloud
144.else 192.else
145CONFIGURE_ARGS+= --disable-lastfm 193CONFIGURE_ARGS+= --disable-soundcloud
146.endif 194.endif
147 195
148.if !empty(PKG_OPTIONS:Mogg) 196.if !empty(PKG_OPTIONS:Mopenal)
149. include "../../audio/libvorbis/buildlink3.mk" 197. include "../../audio/openal/buildlink3.mk"
150CONFIGURE_ARGS+= --enable-vorbis 198CONFIGURE_ARGS+= --enable-openal
151.else 199.else
152CONFIGURE_ARGS+= --disable-vorbis 200CONFIGURE_ARGS+= --disable-openal
 201.endif
 202
 203.if !empty(PKG_OPTIONS:Mopus)
 204. include "../../audio/libopus/buildlink3.mk"
 205CONFIGURE_ARGS+= --enable-opus
 206.else
 207CONFIGURE_ARGS+= --disable-opus
153.endif 208.endif
154 209
155.if !empty(PKG_OPTIONS:Mpulseaudio) 210.if !empty(PKG_OPTIONS:Mpulseaudio)
156. include "../../audio/pulseaudio/buildlink3.mk" 211. include "../../audio/pulseaudio/buildlink3.mk"
157CONFIGURE_ARGS+= --enable-pulse 212CONFIGURE_ARGS+= --enable-pulse
158.else 213.else
159CONFIGURE_ARGS+= --disable-pulse 214CONFIGURE_ARGS+= --disable-pulse
160.endif 215.endif
161 216
162.if !empty(PKG_OPTIONS:Mshout) 217.if !empty(PKG_OPTIONS:Mshout)
163. include "../../audio/libshout/buildlink3.mk" 218. include "../../audio/libshout/buildlink3.mk"
164. include "../../audio/lame/buildlink3.mk" 219. include "../../audio/lame/buildlink3.mk"
165CONFIGURE_ARGS+= --enable-shout 220CONFIGURE_ARGS+= --enable-shout
@@ -172,26 +227,47 @@ CONFIGURE_ARGS+= --disable-shout @@ -172,26 +227,47 @@ CONFIGURE_ARGS+= --disable-shout
172#. include "../../audio/libsidplay2/buildlink3.mk" 227#. include "../../audio/libsidplay2/buildlink3.mk"
173#CONFIGURE_ARGS+= --enable-sidplay 228#CONFIGURE_ARGS+= --enable-sidplay
174#.else 229#.else
175#CONFIGURE_ARGS+= --disable-sidplay 230#CONFIGURE_ARGS+= --disable-sidplay
176#.endif 231#.endif
177 232
178.if !empty(PKG_OPTIONS:Msqlite3) 233.if !empty(PKG_OPTIONS:Msqlite3)
179. include "../../databases/sqlite3/buildlink3.mk" 234. include "../../databases/sqlite3/buildlink3.mk"
180CONFIGURE_ARGS+= --enable-sqlite 235CONFIGURE_ARGS+= --enable-sqlite
181.else 236.else
182CONFIGURE_ARGS+= --disable-sqlite 237CONFIGURE_ARGS+= --disable-sqlite
183.endif 238.endif
184 239
 240.if !empty(PKG_OPTIONS:Mtremor)
 241. include "../../audio/tremor/buildlink3.mk"
 242CONFIGURE_ARGS+= --with-tremor=${BUILDLINK_PREFIX.tremor}
 243.else
 244CONFIGURE_ARGS+= --without-tremor
 245.endif
 246
 247.if !empty(PKG_OPTIONS:Mtwolame)
 248. include "../../audio/twolame/buildlink3.mk"
 249CONFIGURE_ARGS+= --enable-twolame-encoder
 250.else
 251CONFIGURE_ARGS+= --disable-twolame-encoder
 252.endif
 253
 254.if !empty(PKG_OPTIONS:Mvorbis)
 255. include "../../audio/libvorbis/buildlink3.mk"
 256CONFIGURE_ARGS+= --enable-vorbis
 257.else
 258CONFIGURE_ARGS+= --disable-vorbis
 259.endif
 260
185.if !empty(PKG_OPTIONS:Mwavpack) 261.if !empty(PKG_OPTIONS:Mwavpack)
186. include "../../audio/wavpack/buildlink3.mk" 262. include "../../audio/wavpack/buildlink3.mk"
187CONFIGURE_ARGS+= --enable-wavpack 263CONFIGURE_ARGS+= --enable-wavpack
188.else 264.else
189CONFIGURE_ARGS+= --disable-wavpack 265CONFIGURE_ARGS+= --disable-wavpack
190.endif 266.endif
191 267
192.if !empty(PKG_OPTIONS:Mzziplib) 268.if !empty(PKG_OPTIONS:Mzziplib)
193. include "../../archivers/zziplib/buildlink3.mk" 269. include "../../archivers/zziplib/buildlink3.mk"
194CONFIGURE_ARGS+= --enable-zzip 270CONFIGURE_ARGS+= --enable-zzip
195.else 271.else
196CONFIGURE_ARGS+= --disable-zzip 272CONFIGURE_ARGS+= --disable-zzip
197.endif 273.endif
cvs diff -r1.6 -r1.7 pkgsrc/audio/musicpd/files/mpd.conf (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/files/mpd.conf 2013/10/01 15:21:44 1.6
+++ pkgsrc/audio/musicpd/files/mpd.conf 2014/04/18 12:46:58 1.7
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: mpd.conf,v 1.6 2013/10/01 15:21:44 drochner Exp $ 1# $NetBSD: mpd.conf,v 1.7 2014/04/18 12:46:58 wiz Exp $
2 2
3# required 3# required
4music_directory "/mp3" 4music_directory "/mp3"
5playlist_directory "/mp3" 5playlist_directory "/mp3"
6log_file "/var/log/mpd.log" 6log_file "/var/log/mpd.log"
7 7
8# optional 8# optional
9port "6600" 9port "6600"
10max_connections "5" 10max_connections "5"
11max_command_list_size "2048" 11max_command_list_size "2048"
12max_output_buffer_size "2048" 12max_output_buffer_size "2048"
13connection_timeout "60" 13connection_timeout "60"
14db_file "/mp3/.mpddb" 14db_file "/mp3/.mpddb"
15state_file "/mp3/.mpdstate" 15state_file "/mp3/.mpdstate"
16save_absolute_paths_in_playlists "no" 16save_absolute_paths_in_playlists "no"
17 17
18max_playlist_length "4096" 18max_playlist_length "4096"
19buffer_before_play "25%" 19buffer_before_play "25%"
20bind_to_address "any" 20bind_to_address "any"
21 21
22audio_output { 22audio_output {
23 type "oss" 23 type "oss"
24 name "LibAO-OSS" 24 name "LibAO-OSS"
25 device "/dev/audio" 25 device "@DEVOSSAUDIO@"
26} 26}
27 27
28mixer_type "software" 28mixer_type "software"
29# mixer_control defaults to the master volume control. uncomment the 29# mixer_control defaults to the master volume control. uncomment the
30# following line to have mpd's volume control modify the "PCM" 30# following line to have mpd's volume control modify the "PCM"
31# volume instead: 31# volume instead:
32# mixer_control "Pcm" 32# mixer_control "Pcm"
33 33
34#user "mp3" 34#user "mp3"
35 35
36# log_level can be "default", "secure", "verbose" 36# log_level can be "default", "secure", "verbose"
37log_level "default" 37log_level "default"
38#password "password@read,add,control,admin" 38#password "password@read,add,control,admin"
File Deleted: pkgsrc/audio/musicpd/patches/Attic/patch-src_decoder_audiofile__decoder__plugin.c