From 343e15dc62c96b63c4cc6fea5c940013750e3b04 Mon Sep 17 00:00:00 2001
From: Guy Dalziel <gdalziel@linuxfromscratch.org>
Date: Mon, 20 Jul 2009 15:39:23 +0000
Subject: [PATCH] Updated to libmpeg3-1.8, libogg-1.1.4, and libvorbis-1.2.3.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7852 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  8 ++++----
 introduction/welcome/changelog.xml | 14 ++++++++++++++
 multimedia/libdriv/libmpeg3.xml    | 13 ++++++-------
 multimedia/libdriv/libogg.xml      |  6 +++---
 multimedia/libdriv/libvorbis.xml   | 15 +++------------
 5 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/general.ent b/general.ent
index ec0072d9d5..15e979415e 100644
--- a/general.ent
+++ b/general.ent
@@ -3,7 +3,7 @@ $LastChangedBy$
 $Date$
 -->
 
-<!ENTITY day          "19">                   <!-- Always 2 digits -->
+<!ENTITY day          "20">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2009">
 <!ENTITY copyrightdate "2001-&year;">
@@ -647,12 +647,12 @@ $Date$
 <!ENTITY esound-version               "0.2.40">
 <!ENTITY sdl-version                  "1.2.13">
 <!ENTITY libao-version                "0.8.8">
-<!ENTITY libogg-version               "1.1.3">
-<!ENTITY libvorbis-version            "1.2.0">
+<!ENTITY libogg-version               "1.1.4">
+<!ENTITY libvorbis-version            "1.2.3">
 <!ENTITY faad2-version                "2.6.1">
 <!ENTITY faac-version                 "1.26">
 <!ENTITY nas-version                  "1.9.1">
-<!ENTITY libmpeg3-version             "1.7">
+<!ENTITY libmpeg3-version             "1.8">
 <!ENTITY libmad-version               "0.15.1b">
 <!ENTITY libquicktime-version         "1.0.0">
 <!ENTITY libfame-version              "0.9.1">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7406396d0e..1ff684c576 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -40,6 +40,20 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>July 20th, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[gdalziel] - Updated to libmpeg3-1.8</para>
+        </listitem>
+        <listitem>
+          <para>[gdalziel] - Updated to libvorbis-1.2.3</para>
+        </listitem>
+        <listitem>
+          <para>[gdalziel] - Updated to libogg-1.1.4</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>July 19th, 2009</para>
diff --git a/multimedia/libdriv/libmpeg3.xml b/multimedia/libdriv/libmpeg3.xml
index f67e5ab521..d2031e458c 100644
--- a/multimedia/libdriv/libmpeg3.xml
+++ b/multimedia/libdriv/libmpeg3.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libmpeg3-download-http "&sourceforge-repo;/heroines/libmpeg3-&libmpeg3-version;-src.tar.bz2">
   <!ENTITY libmpeg3-download-ftp  " ">
-  <!ENTITY libmpeg3-md5sum        "4a3e8896164d59d7d0dff69b50b75352">
-  <!ENTITY libmpeg3-size          "320 KB">
-  <!ENTITY libmpeg3-buildsize     "12 MB">
+  <!ENTITY libmpeg3-md5sum        "a9d0d34e8941a4437eb8e7dfe559eca1">
+  <!ENTITY libmpeg3-size          "2.4 MB">
+  <!ENTITY libmpeg3-buildsize     "13 MB">
   <!ENTITY libmpeg3-time          "less than 0.1 SBU">
 ]>
 
@@ -58,7 +58,7 @@
     <itemizedlist spacing='compact'>
       <listitem>
         <para>Required Patch: <ulink
-        url="&patch-root;/libmpeg3-&libmpeg3-version;-makefile_mods-1.patch"/></para>
+        url="&patch-root;/libmpeg3-&libmpeg3-version;-makefile_fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
 
@@ -78,7 +78,7 @@
     <para>Install <application>LibMPEG3</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../libmpeg3-&libmpeg3-version;-makefile_mods-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libmpeg3-&libmpeg3-version;-makefile_fixes-1.patch &amp;&amp;
 ./configure &amp;&amp;
 make</userinput></screen>
 
@@ -105,8 +105,7 @@ make</userinput></screen>
     <filename>Makefile</filename> so that everything is installed with the
     <command>make install</command> command instead of just the executables
     being installed and manual commands used to install the library, interface
-    headers and documentation. The patch also fixes a syntax error in the
-    <filename>Makefile</filename>.</para>
+    headers and documentation.</para>
 
     <para><command>./configure</command>: This is not a typical Autotools
     script. It is only used to check for the availability of the NASM
diff --git a/multimedia/libdriv/libogg.xml b/multimedia/libdriv/libogg.xml
index d332f1edbf..f5e51f5581 100644
--- a/multimedia/libdriv/libogg.xml
+++ b/multimedia/libdriv/libogg.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libogg-download-http "http://downloads.xiph.org/releases/ogg/libogg-&libogg-version;.tar.gz">
   <!ENTITY libogg-download-ftp  " ">
-  <!ENTITY libogg-md5sum        "eaf7dc6ebbff30975de7527a80831585">
-  <!ENTITY libogg-size          "403 KB">
-  <!ENTITY libogg-buildsize     "3.6 MB">
+  <!ENTITY libogg-md5sum        "10200ec22543841d9d1c23e0aed4e5e9">
+  <!ENTITY libogg-size          "430 KB">
+  <!ENTITY libogg-buildsize     "4 MB">
   <!ENTITY libogg-time          "less than 0.1 SBU">
 ]>
 
diff --git a/multimedia/libdriv/libvorbis.xml b/multimedia/libdriv/libvorbis.xml
index 6792c852aa..6eb0917ae0 100644
--- a/multimedia/libdriv/libvorbis.xml
+++ b/multimedia/libdriv/libvorbis.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libvorbis-download-http "http://downloads.xiph.org/releases/vorbis/libvorbis-&libvorbis-version;.tar.bz2">
   <!ENTITY libvorbis-download-ftp  " ">
-  <!ENTITY libvorbis-md5sum        "7c6e409d7aa1fa8a5481dea571d5bde0">
+  <!ENTITY libvorbis-md5sum        "67beb237faf97d74782ec7071756b2b6">
   <!ENTITY libvorbis-size          "1.2 MB">
-  <!ENTITY libvorbis-buildsize     "18 MB">
+  <!ENTITY libvorbis-buildsize     "19 MB">
   <!ENTITY libvorbis-time          "0.2 SBU">
 ]>
 
@@ -56,14 +56,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-          url="&patch-root;/libvorbis-&libvorbis-version;-security_fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">libvorbis Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -86,8 +78,7 @@
     <para>Install <application>libvorbis</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../libvorbis-&libvorbis-version;-security_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>