diff options
author | drochner <drochner@pkgsrc.org> | 2013-10-01 15:21:44 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2013-10-01 15:21:44 +0000 |
commit | ff7f63abb47afe151716267035cd7d83f1f79013 (patch) | |
tree | fa52b3ae3df9fc31c961e5df327a750c1d8e2e66 /audio | |
parent | 4ef1e4a61a45930ca9dae36178ad0f56cab2d85c (diff) | |
download | pkgsrc-ff7f63abb47afe151716267035cd7d83f1f79013.tar.gz |
update to 0.17.5
It fixes two protocol bugs and a crash in the mikmod decoder plugin.
pkgsrc note: updated the sample config file for current reality
Diffstat (limited to 'audio')
-rw-r--r-- | audio/musicpd/Makefile | 4 | ||||
-rw-r--r-- | audio/musicpd/distinfo | 11 | ||||
-rw-r--r-- | audio/musicpd/files/mpd.conf | 7 | ||||
-rw-r--r-- | audio/musicpd/patches/patch-aa | 16 | ||||
-rw-r--r-- | audio/musicpd/patches/patch-ad | 16 | ||||
-rw-r--r-- | audio/musicpd/patches/patch-ae | 13 |
6 files changed, 8 insertions, 59 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 05009ede373..d8302066489 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.70 2013/05/26 18:37:39 wiz Exp $ +# $NetBSD: Makefile,v 1.71 2013/10/01 15:21:44 drochner Exp $ -DISTNAME= mpd-0.17.4 +DISTNAME= mpd-0.17.5 PKGNAME= ${DISTNAME:S/mpd/musicpd/} CATEGORIES= audio MASTER_SITES= http://www.musicpd.org/download/mpd/0.17/ diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 68a3b939065..169d91be9ff 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.37 2013/05/27 10:27:02 drochner Exp $ +$NetBSD: distinfo,v 1.38 2013/10/01 15:21:44 drochner Exp $ -SHA1 (mpd-0.17.4.tar.bz2) = e3a16b5d784c3699b151e72cfa58d0ea54a49b13 -RMD160 (mpd-0.17.4.tar.bz2) = bc54ccaccd91df3af9debc1b96848ed84c9badbd -Size (mpd-0.17.4.tar.bz2) = 582579 bytes -SHA1 (patch-aa) = 2c6c0390101d8587268121ac7c2738491aab500e -SHA1 (patch-ad) = 17c7aee04e7ea0b15f81c5e1edfa8e567d610610 -SHA1 (patch-ae) = ebda3f48c57252893f0c4ae910e8aaa227250a8f +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 diff --git a/audio/musicpd/files/mpd.conf b/audio/musicpd/files/mpd.conf index 50d9ede9f3e..7abfc71195d 100644 --- a/audio/musicpd/files/mpd.conf +++ b/audio/musicpd/files/mpd.conf @@ -1,12 +1,12 @@ -# $NetBSD: mpd.conf,v 1.5 2011/03/26 14:18:53 wiz Exp $ +# $NetBSD: mpd.conf,v 1.6 2013/10/01 15:21:44 drochner Exp $ # required -port "2100" music_directory "/mp3" playlist_directory "/mp3" log_file "/var/log/mpd.log" # optional +port "6600" max_connections "5" max_command_list_size "2048" max_output_buffer_size "2048" @@ -22,10 +22,7 @@ bind_to_address "any" audio_output { type "oss" name "LibAO-OSS" - driver "oss" - write_size "1024" device "/dev/audio" - options "dsp=@DEVOSSAUDIO@" } mixer_type "software" diff --git a/audio/musicpd/patches/patch-aa b/audio/musicpd/patches/patch-aa deleted file mode 100644 index 2febea924c2..00000000000 --- a/audio/musicpd/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.12 2013/05/26 18:37:39 wiz Exp $ - -fix misuse of "bool", should fix build with some compilers, from -Pouya D. Tafti per pkgsrc-users - ---- src/conf.c.orig 2012-08-13 14:55:06.000000000 +0900 -+++ src/conf.c -@@ -317,7 +317,7 @@ config_read_block(FILE *fp, int *count, - g_set_error(error_r, config_quark(), 0, - "line %i: Unknown tokens after '}'", - *count); -- return false; -+ return NULL; - } - - return ret; diff --git a/audio/musicpd/patches/patch-ad b/audio/musicpd/patches/patch-ad deleted file mode 100644 index a22bb34c627..00000000000 --- a/audio/musicpd/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2013/05/26 18:37:39 wiz Exp $ - -fix misuse of "bool", should fix build with some compilers, from -Pouya D. Tafti per pkgsrc-users - ---- src/song_update.c.orig 2012-06-28 00:46:58.000000000 +0900 -+++ src/song_update.c -@@ -187,7 +187,7 @@ song_file_update_inarchive(struct song * - if (suffix == NULL) - return false; - -- plugin = decoder_plugin_from_suffix(suffix, false); -+ plugin = decoder_plugin_from_suffix(suffix, NULL); - if (plugin == NULL) - return false; - diff --git a/audio/musicpd/patches/patch-ae b/audio/musicpd/patches/patch-ae deleted file mode 100644 index 12271535d68..00000000000 --- a/audio/musicpd/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2013/05/27 10:27:02 drochner Exp $ - ---- src/update_song.c.orig 2012-12-20 12:56:41.000000000 +0000 -+++ src/update_song.c -@@ -104,7 +104,7 @@ update_song_file(struct directory *direc - const struct stat *st) - { - const struct decoder_plugin *plugin = -- decoder_plugin_from_suffix(suffix, false); -+ decoder_plugin_from_suffix(suffix, NULL); - if (plugin == NULL) - return false; - |