From ecc890a620b03af3f3351188225f884f0f5d615b Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Tue, 18 Nov 2014 21:52:01 +0000
Subject: [PATCH] Update to libmusicbrainz-5.1.0.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14961 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml     |  4 +++
 multimedia/libdriv/libmusicbrainz5.xml | 45 +++++++++++++++++++-------
 packages.ent                           |  2 +-
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 410aef18e6..b6ab717dc7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>November 18th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to libmusicbrainz-5.1.0. Fixes
+          <ulink url="&blfs-ticket-root;5825">#5825</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to LVM2.2.02.112. Fixes
           <ulink url="&blfs-ticket-root;5809">#5809</ulink>.</para>
diff --git a/multimedia/libdriv/libmusicbrainz5.xml b/multimedia/libdriv/libmusicbrainz5.xml
index 9e822aa903..58d6666f5e 100644
--- a/multimedia/libdriv/libmusicbrainz5.xml
+++ b/multimedia/libdriv/libmusicbrainz5.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libmusicbrainz5-download-http "https://github.com/downloads/metabrainz/libmusicbrainz/libmusicbrainz-&libmusicbrainz5-version;.tar.gz">
+  <!ENTITY libmusicbrainz5-download-http "https://github.com/metabrainz/libmusicbrainz/releases/download/release-&libmusicbrainz5-version;/libmusicbrainz-&libmusicbrainz5-version;.tar.gz">
   <!ENTITY libmusicbrainz5-download-ftp  " ">
-  <!ENTITY libmusicbrainz5-md5sum        "a0406b94c341c2b52ec0fe98f57cadf3">
-  <!ENTITY libmusicbrainz5-size          "108 KB">
-  <!ENTITY libmusicbrainz5-buildsize     "7.0 MB">
-  <!ENTITY libmusicbrainz5-time          "0.2 SBU">
+  <!ENTITY libmusicbrainz5-md5sum        "4cc5556aa40ff7ab8f8cb83965535bc3">
+  <!ENTITY libmusicbrainz5-size          "76 KB">
+  <!ENTITY libmusicbrainz5-buildsize     "6.6 MB (additional 4.4 MB for the API documentaion)">
+  <!ENTITY libmusicbrainz5-time          "0.1 SBU">
 ]>
 
 <sect1 id="libmusicbrainz5" xreflabel="libmusicbrainz-&libmusicbrainz5-version;">
@@ -69,7 +69,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -78,16 +78,22 @@
           <ulink url="&patch-root;/libmusicbrainz-&libmusicbrainz5-version;-build_system-1.patch"/>
         </para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist>-->
 
     <bridgehead renderas="sect3">libmusicbrainz Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="cmake"/> and
+      <xref linkend="cmake"/>,
+      <xref linkend="libxml2"/> and
       <xref linkend="neon"/>
     </para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libmusicbrainz5"/>
     </para>
@@ -101,14 +107,19 @@
       commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../libmusicbrainz-&libmusicbrainz5-version;-build_system-1.patch &amp;&amp;
-
-mkdir build &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
 make</userinput></screen>
 
+    <para>
+      If you have installed <xref linkend="doxygen"/>, optionally build the API
+      documentation:
+    </para>
+
+<screen><userinput>doxygen ../Doxyfile</userinput></screen>
+
     <para>
       This package does not come with a test suite.
     </para>
@@ -118,6 +129,15 @@ make</userinput></screen>
     </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If you have built the API documentation, install, as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen><userinput>rm -rf /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version; &amp;&amp;
+cp -vr docs/ /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version;</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">
@@ -136,7 +156,8 @@ make</userinput></screen>
           libmusicbrainz5.so
         </seg>
         <seg>
-          /usr/include/libmusicbrainz5
+          /usr/include/libmusicbrainz5 and
+          /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version;
         </seg>
       </seglistitem>
     </segmentedlist>
diff --git a/packages.ent b/packages.ent
index fc40ddc3e2..b1d60426e0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -652,7 +652,7 @@
 <!ENTITY libmpeg2-version             "0.5.1">
 <!ENTITY libmusicbrainz-version       "2.1.5">
 <!ENTITY libmusicbrainz3-version      "3.0.3">
-<!ENTITY libmusicbrainz5-version      "5.0.1">
+<!ENTITY libmusicbrainz5-version      "5.1.0">
 <!ENTITY libogg-version               "1.3.2">
 <!ENTITY libquicktime-version         "1.2.4">
 <!ENTITY libsamplerate-version        "0.1.8">