From f087518e7ab66933ce6d084637fb8da9dd13f52b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 10 Nov 2015 08:33:50 +0100 Subject: [PATCH 1/7] configure.ac: prepare for 0.19.12 --- NEWS | 2 ++ configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 94a676b84..393841ce7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ver 0.19.12 (not yet released) + ver 0.19.11 (2015/10/27) * tags - ape: fix buffer overflow diff --git a/configure.ac b/configure.ac index 3d29e724f..107b45a03 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.19.11, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.19.12, musicpd-dev-team@lists.sourceforge.net) VERSION_MAJOR=0 VERSION_MINOR=19 -VERSION_REVISION=11 +VERSION_REVISION=12 VERSION_EXTRA=0 AC_CONFIG_SRCDIR([src/Main.cxx]) From 315f9d98f6099c84ad38ecae9fd5e83101fb1b16 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 10 Nov 2015 08:38:53 +0100 Subject: [PATCH 2/7] Main: fix build failure on non-Linux systems --- NEWS | 1 + src/Main.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 393841ce7..1ba510797 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ ver 0.19.12 (not yet released) +* fix build failure on non-Linux systems ver 0.19.11 (2015/10/27) * tags diff --git a/src/Main.cxx b/src/Main.cxx index a3a1b0021..d646573e2 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -630,7 +630,7 @@ static int mpd_main_after_fork(struct options options) config_get_unsigned(CONF_AUTO_UPDATE_DEPTH, INT_MAX)); #else - FormatWarning(main_domain, + FormatWarning(config_domain, "inotify: auto_update was disabled. enable during compilation phase"); #endif } From 6626c2d00da4a4a756ba16d612156d4895a502ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sat, 21 Nov 2015 23:54:51 +0100 Subject: [PATCH 3/7] Makefile.am: fix static build with alsa MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add ALSA_LIBS to MIXER_LIBS, otherwise building mpd in a static context fails with lot of undefined references to alsa-lib (libasound) required by src/mixer/plugins/AlsaMixerPlugin.cxx. Signed-off-by: Jörg Krause --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 89819de36..307fcba11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1219,6 +1219,7 @@ liboutput_plugins_a_SOURCES = \ MIXER_LIBS = \ libmixer_plugins.a \ + $(ALSA_LIBS) \ $(PULSE_LIBS) MIXER_API_SRC = \ From 77aaf1baee9a3d5202df32c87ce54e14ed56ee70 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 1 Dec 2015 08:53:35 +0100 Subject: [PATCH 4/7] fix LimitRTTIME in systemd unit file systemd does not understand LimitRTTIME=-1. For no limit we have to use the string 'infinity' (see systemd.exec(5)). Signed-off-by: Christian Hesse --- NEWS | 1 + systemd/mpd.service.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 1ba510797..702953a5e 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ ver 0.19.12 (not yet released) * fix build failure on non-Linux systems +* fix LimitRTTIME in systemd unit file ver 0.19.11 (2015/10/27) * tags diff --git a/systemd/mpd.service.in b/systemd/mpd.service.in index de91eb4d5..0e8eb84ba 100644 --- a/systemd/mpd.service.in +++ b/systemd/mpd.service.in @@ -7,7 +7,7 @@ ExecStart=@prefix@/bin/mpd --no-daemon # allow MPD to use real-time priority 50 LimitRTPRIO=50 -LimitRTTIME=-1 +LimitRTTIME=infinity [Install] WantedBy=multi-user.target From 09112c686972f032aa91bfbd119adbe4c4943158 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 26 Oct 2015 22:40:51 -0400 Subject: [PATCH 5/7] docs: add vlc and mpv to the list of example applications These are other popular clients. In particular, VLC is available on mobile devices. Signed-off-by: Ben Boeckel --- doc/user.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user.xml b/doc/user.xml index 010d2f980..5a60dc6d8 100644 --- a/doc/user.xml +++ b/doc/user.xml @@ -2647,7 +2647,8 @@ buffer_size: 16384 / IceCast. HTTP streaming clients like - mplayer can connect to it. + mplayer, VLC, + and mpv can connect to it. From cae28117625153178cd91c85d13fc90acfc692be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 14 Nov 2015 21:18:41 +0100 Subject: [PATCH 6/7] fix mpd crash on invalid utf8 stream title --- NEWS | 1 + src/tag/TagString.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 702953a5e..f3649d7df 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ ver 0.19.12 (not yet released) +* fix assertion failure on malformed UTF-8 tag * fix build failure on non-Linux systems * fix LimitRTTIME in systemd unit file diff --git a/src/tag/TagString.cxx b/src/tag/TagString.cxx index 4f07cd62a..aab9bceb2 100644 --- a/src/tag/TagString.cxx +++ b/src/tag/TagString.cxx @@ -40,9 +40,9 @@ FindInvalidUTF8(const char *p, const char *const end) /* now call the other SequenceLengthUTF8() overload which also validates the continuations */ const size_t t = SequenceLengthUTF8(p); - assert(s == t); if (t == 0) return p; + assert(s == t); p += s; } From 82e261ad33ebb1021d82b9f20a06d8b6913a779b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 15 Dec 2015 21:54:42 +0100 Subject: [PATCH 7/7] release v0.19.12 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index f3649d7df..4da2a8518 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.19.12 (not yet released) +ver 0.19.12 (2015/12/15) * fix assertion failure on malformed UTF-8 tag * fix build failure on non-Linux systems * fix LimitRTTIME in systemd unit file