From ea4068757def9db58270f9c1c2feb0d050873883 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 6 Feb 2014 21:32:50 +0100
Subject: [PATCH 1/4] configure.ac: link the Vorbis encoder with libvorbis

Since the encoder plugin uses a libvorbis function (and not only
libvorbisenc functions), we need to link with libvorbis explicitly.
---
 NEWS         | 2 ++
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1a0c5c415..4efe51a7f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 ver 0.18.8 (not yet released)
 * decoder
   - ffmpeg: support libav v10_alpha1
+* encoder
+  - vorbis: fix linker failure
 * more robust Icy-Metadata parser
 * fix Solaris build failure
 
diff --git a/configure.ac b/configure.ac
index fc94f4c1e..301c3a033 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1139,7 +1139,7 @@ fi
 AM_CONDITIONAL(ENABLE_FLAC_ENCODER, test x$enable_flac_encoder = xyes)
 
 dnl ---------------------------- Ogg Vorbis Encoder ---------------------------
-MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc],
+MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc vorbis],
 	[Ogg Vorbis encoder], [libvorbisenc not found])
 
 if test x$enable_vorbis_encoder = xyes; then

From af66ed25057564063185072a7b90596e3b377ae0 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 6 Feb 2014 21:46:29 +0100
Subject: [PATCH 2/4] doc/user: document the RoarAudio output plugin

---
 NEWS         |  2 ++
 doc/user.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/NEWS b/NEWS
index 4efe51a7f..26c46f106 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ ver 0.18.8 (not yet released)
   - ffmpeg: support libav v10_alpha1
 * encoder
   - vorbis: fix linker failure
+* output
+  - roar: documentation
 * more robust Icy-Metadata parser
 * fix Solaris build failure
 
diff --git a/doc/user.xml b/doc/user.xml
index ccc9e7119..6357267e4 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -1852,6 +1852,51 @@ systemctl start mpd.socket</programlisting>
         </informaltable>
       </section>
 
+      <section>
+        <title><varname>roar</varname></title>
+
+        <para>
+          The <varname>roar</varname> plugin connects to a <ulink
+          url="http://roaraudio.keep-cool.org/">RoarAudio</ulink>
+          server.
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <thead>
+              <row>
+                <entry>Setting</entry>
+                <entry>Description</entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry>
+                  <varname>server</varname>
+                  <parameter>HOSTNAME</parameter>
+                </entry>
+                <entry>
+                  The host name of the RoarAudio server.  If not
+                  specified, then MPD will connect to the default
+                  locations.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  <varname>role</varname>
+                  <parameter>ROLE</parameter>
+                </entry>
+                <entry>
+                  The "role" that MPD registers itself as in the
+                  RoarAudio server.  The default is "music".
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+      </section>
+
       <section>
         <title><varname>recorder</varname></title>
 

From fce20e514eae5814529aa1a5dd510ac982dcf69f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 7 Feb 2014 00:06:28 +0100
Subject: [PATCH 3/4] NEWS: fix 0.18.7 release year

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 26c46f106..18b882836 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,7 @@ ver 0.18.8 (not yet released)
 * more robust Icy-Metadata parser
 * fix Solaris build failure
 
-ver 0.18.7 (2013/01/13)
+ver 0.18.7 (2014/01/13)
 * playlist
   - pls: fix crash after parser error
   - soundcloud: fix build failure with libyajl 2.0.1

From ddb5390d88ad9301ab70d3b6fff741ef2bb2551f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 7 Feb 2014 00:06:17 +0100
Subject: [PATCH 4/4] release v0.18.8

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 18b882836..066e12792 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-ver 0.18.8 (not yet released)
+ver 0.18.8 (2014/02/07)
 * decoder
   - ffmpeg: support libav v10_alpha1
 * encoder