diff options
author | wiz <wiz> | 2014-04-18 12:46:57 +0000 |
---|---|---|
committer | wiz <wiz> | 2014-04-18 12:46:57 +0000 |
commit | 21dda408106e240d7f3c5b6103553225f1b077c5 (patch) | |
tree | 106fd4212dca49595b1bd8a521beb6ec6e8237ef /audio/musicpd | |
parent | 615d72ad89982854bcc4565d31de739fd916d22e (diff) | |
download | pkgsrc-21dda408106e240d7f3c5b6103553225f1b077c5.tar.gz |
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
Diffstat (limited to 'audio/musicpd')
-rw-r--r-- | audio/musicpd/Makefile | 9 | ||||
-rw-r--r-- | audio/musicpd/distinfo | 9 | ||||
-rw-r--r-- | audio/musicpd/files/mpd.conf | 4 | ||||
-rw-r--r-- | audio/musicpd/options.mk | 106 | ||||
-rw-r--r-- | audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c | 14 |
5 files changed, 101 insertions, 41 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index cd4f6ba1b27..9cbea9972d2 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.77 2014/04/16 11:22:01 wiz Exp $ +# $NetBSD: Makefile,v 1.78 2014/04/18 12:46:57 wiz Exp $ -DISTNAME= mpd-0.17.5 +DISTNAME= mpd-0.18.10 PKGNAME= ${DISTNAME:S/mpd/musicpd/} -PKGREVISION= 6 CATEGORIES= audio -MASTER_SITES= http://www.musicpd.org/download/mpd/0.17/ +MASTER_SITES= http://www.musicpd.org/download/mpd/0.18/ #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} -EXTRACT_SUFX= .tar.bz2 +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://musicpd.org/ diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 169d91be9ff..0362f5060fa 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.38 2013/10/01 15:21:44 drochner Exp $ +$NetBSD: distinfo,v 1.39 2014/04/18 12:46:57 wiz Exp $ -SHA1 (mpd-0.17.5.tar.bz2) = 91e4d8d364a3db02e6f92676dd938880e5bb200a -RMD160 (mpd-0.17.5.tar.bz2) = 883cd39027fe8c2dd75f6faa25f7417e9197d510 -Size (mpd-0.17.5.tar.bz2) = 585656 bytes -SHA1 (patch-src_decoder_audiofile__decoder__plugin.c) = 14ab61bae4dc6626177490cc47403870581bc4cd +SHA1 (mpd-0.18.10.tar.xz) = 0923318cfda033bb4f89c219e6effa9d5b330c1d +RMD160 (mpd-0.18.10.tar.xz) = 5bb43bbf1bb028ef1b075aec441a9e7cb6d1f633 +Size (mpd-0.18.10.tar.xz) = 584312 bytes diff --git a/audio/musicpd/files/mpd.conf b/audio/musicpd/files/mpd.conf index 7abfc71195d..4bf8302cb6d 100644 --- a/audio/musicpd/files/mpd.conf +++ b/audio/musicpd/files/mpd.conf @@ -1,4 +1,4 @@ -# $NetBSD: mpd.conf,v 1.6 2013/10/01 15:21:44 drochner Exp $ +# $NetBSD: mpd.conf,v 1.7 2014/04/18 12:46:58 wiz Exp $ # required music_directory "/mp3" @@ -22,7 +22,7 @@ bind_to_address "any" audio_output { type "oss" name "LibAO-OSS" - device "/dev/audio" + device "@DEVOSSAUDIO@" } mixer_type "software" diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk index cb968d08dd8..9c2ebeb1b36 100644 --- a/audio/musicpd/options.mk +++ b/audio/musicpd/options.mk @@ -1,21 +1,36 @@ -# $NetBSD: options.mk,v 1.20 2014/01/05 23:18:49 wiz Exp $ +# $NetBSD: options.mk,v 1.21 2014/04/18 12:46:57 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd -PKG_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 -PKG_SUGGESTED_OPTIONS= audiofile curl faad flac id3 inet6 libao musepack ogg +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 -PKG_OPTIONS_LEGACY_OPTS= libmikmod:mikmod -PKG_OPTIONS_LEGACY_OPTS= aac:faad +PKG_OPTIONS_OPTIONAL_GROUPS= vorbis +PKG_OPTIONS_GROUP.vorbis= tremor vorbis + +PKG_OPTIONS_LEGACY_OPTS= ogg:vorbis .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Madplug) +. include "../../audio/adplug/buildlink3.mk" +CONFIGURE_ARGS+= --enable-adplug +.else +CONFIGURE_ARGS+= --disable-adplug +.endif + .if !empty(PKG_OPTIONS:Maudiofile) +BUILDLINK_API_DEPENDS.libaudiofile+= libaudiofile>=0.3 . include "../../audio/libaudiofile/buildlink3.mk" CONFIGURE_ARGS+= --enable-audiofile .else CONFIGURE_ARGS+= --disable-audiofile .endif +.if !empty(PKG_OPTIONS:Mavahi) +. include "../../net/avahi/buildlink3.mk" +CONFIGURE_ARGS+= --with-zeroconf=avahi +.endif + .if !empty(PKG_OPTIONS:Mbzip2) . include "../../archivers/bzip2/buildlink3.mk" CONFIGURE_ARGS+= --enable-bzip2 @@ -23,6 +38,14 @@ CONFIGURE_ARGS+= --enable-bzip2 CONFIGURE_ARGS+= --disable-bzip2 .endif +# wants a different version of the library than we have in pkgsrc +#.if !empty(PKG_OPTIONS:Mcdparanoia) +#. include "../../audio/cdparanoia/buildlink3.mk" +#CONFIGURE_ARGS+= --enable-cdio-paranoia +#.else +#CONFIGURE_ARGS+= --enable-cdio-paranoia +#.endif + .if !empty(PKG_OPTIONS:Mcurl) . include "../../www/curl/buildlink3.mk" CONFIGURE_ARGS+= --enable-curl @@ -32,7 +55,7 @@ CONFIGURE_ARGS+= --disable-curl .if !empty(PKG_OPTIONS:Mfaad) . include "../../audio/faad2/buildlink3.mk" -CONFIGURE_ARGS+= --with-faad=${BUILDLINK_PREFIX.faad2} +CONFIGURE_ARGS+= --enable-aac .else CONFIGURE_ARGS+= --disable-aac .endif @@ -45,6 +68,7 @@ CONFIGURE_ARGS+= --disable-ffmpeg .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 @@ -110,6 +134,21 @@ CONFIGURE_ARGS+= --enable-mms CONFIGURE_ARGS+= --disable-mms .endif +.if !empty(PKG_OPTIONS:Mlibmpdclient) +. include "../../audio/libmpdclient/buildlink3.mk" +CONFIGURE_ARGS+= --enable-libmpdclient +.else +CONFIGURE_ARGS+= --disable-libmpdclient +.endif + +# does not find libresid-builder +#.if !empty(PKG_OPTIONS:Mlibsidplay2) +#. include "../../audio/libsidplay2/buildlink3.mk" +#CONFIGURE_ARGS+= --enable-sidplay +#.else +#CONFIGURE_ARGS+= --disable-sidplay +#.endif + .if !empty(PKG_OPTIONS:Mlibwildmidi) . include "../../audio/libwildmidi/buildlink3.mk" CONFIGURE_ARGS+= --enable-wildmidi @@ -131,25 +170,41 @@ CONFIGURE_ARGS+= --enable-modplug CONFIGURE_ARGS+= --disable-modplug .endif +.if !empty(PKG_OPTIONS:Mmpg123) +. include "../../audio/mpg123/buildlink3.mk" +CONFIGURE_ARGS+= --enable-mpg123 +.else +CONFIGURE_ARGS+= --disable-mpg123 +.endif + .if !empty(PKG_OPTIONS:Mmusepack) -. include "../../audio/libmpcdec/buildlink3.mk" -CONFIGURE_ENV+= mpcdec_prefix=${BUILDLINK_PREFIX.libmpcdec} +. include "../../wip/musepack/buildlink3.mk" +CONFIGURE_ENV+= mpcdec_prefix=${BUILDLINK_PREFIX.musepack} CONFIGURE_ARGS+= --enable-mpc .else CONFIGURE_ARGS+= --disable-mpc .endif -.if !empty(PKG_OPTIONS:Mmusicpd-lastfm) -CONFIGURE_ARGS+= --enable-lastfm +.if !empty(PKG_OPTIONS:Mmusicpd-soundcloud) +BUILDLINK_API_DEPENDS.yajl+= yajl>=2.1 +. include "../../devel/yajl/buildlink3.mk" +CONFIGURE_ARGS+= --enable-soundcloud .else -CONFIGURE_ARGS+= --disable-lastfm +CONFIGURE_ARGS+= --disable-soundcloud .endif -.if !empty(PKG_OPTIONS:Mogg) -. include "../../audio/libvorbis/buildlink3.mk" -CONFIGURE_ARGS+= --enable-vorbis +.if !empty(PKG_OPTIONS:Mopenal) +. include "../../audio/openal/buildlink3.mk" +CONFIGURE_ARGS+= --enable-openal .else -CONFIGURE_ARGS+= --disable-vorbis +CONFIGURE_ARGS+= --disable-openal +.endif + +.if !empty(PKG_OPTIONS:Mopus) +. include "../../audio/libopus/buildlink3.mk" +CONFIGURE_ARGS+= --enable-opus +.else +CONFIGURE_ARGS+= --disable-opus .endif .if !empty(PKG_OPTIONS:Mpulseaudio) @@ -182,6 +237,27 @@ CONFIGURE_ARGS+= --enable-sqlite CONFIGURE_ARGS+= --disable-sqlite .endif +.if !empty(PKG_OPTIONS:Mtremor) +. include "../../audio/tremor/buildlink3.mk" +CONFIGURE_ARGS+= --with-tremor=${BUILDLINK_PREFIX.tremor} +.else +CONFIGURE_ARGS+= --without-tremor +.endif + +.if !empty(PKG_OPTIONS:Mtwolame) +. include "../../audio/twolame/buildlink3.mk" +CONFIGURE_ARGS+= --enable-twolame-encoder +.else +CONFIGURE_ARGS+= --disable-twolame-encoder +.endif + +.if !empty(PKG_OPTIONS:Mvorbis) +. include "../../audio/libvorbis/buildlink3.mk" +CONFIGURE_ARGS+= --enable-vorbis +.else +CONFIGURE_ARGS+= --disable-vorbis +.endif + .if !empty(PKG_OPTIONS:Mwavpack) . include "../../audio/wavpack/buildlink3.mk" CONFIGURE_ARGS+= --enable-wavpack diff --git a/audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c b/audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c deleted file mode 100644 index 70518b33025..00000000000 --- a/audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_decoder_audiofile__decoder__plugin.c,v 1.3 2013/05/26 18:37:39 wiz Exp $ - -Include unistd.h for SEEK_CUR, SEEK_SET. - ---- src/decoder/audiofile_decoder_plugin.c.orig 2012-06-28 00:46:58.000000000 +0900 -+++ src/decoder/audiofile_decoder_plugin.c -@@ -27,6 +27,7 @@ - #include <assert.h> - #include <glib.h> - #include <stdio.h> -+#include <unistd.h> - - #undef G_LOG_DOMAIN - #define G_LOG_DOMAIN "audiofile" |