From 176c4756db999c4fa9687cb75874434fc6941c88 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Thu, 23 Dec 2004 02:37:59 +0000
Subject: [PATCH] Updated to Avifile-0.7.41

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3140 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  4 +-
 multimedia/videoutils/avifile.xml  | 67 ++++++++++--------------------
 3 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/general.ent b/general.ent
index 1a9bfc0689..53cfde144b 100644
--- a/general.ent
+++ b/general.ent
@@ -434,7 +434,7 @@
 
 <!-- Chapter 39 --> 
 <!ENTITY ffmpeg-version               "0.4.9-pre1">
-<!ENTITY avifile-version              "0.7.38">  
+<!ENTITY avifile-version              "0.7.41">  
 <!ENTITY mplayer-version              "1.0pre5"> 
 <!ENTITY xine-ui-version              "0.99.2">  
 <!ENTITY transcode-version            "0.6.12"> 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 36d57a88c7..830af04bfc 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -22,8 +22,8 @@ who wrote what.</para>
 
 <itemizedlist>
 
-<listitem><para>December 22nd, 2004 [randy]: Updated to Gnumeric-1.4.1 and
-Dillo-0.8.3.</para></listitem>
+<listitem><para>December 22nd, 2004 [randy]: Updated to Gnumeric-1.4.1, 
+Dillo-0.8.3 and Avifile-0.7.41.</para></listitem>
 
 <listitem><para>December 22nd, 2004 [igor]: Updated GCC-3.3.x to
 3.3.4.</para></listitem>
diff --git a/multimedia/videoutils/avifile.xml b/multimedia/videoutils/avifile.xml
index 1745c81cc1..3f516e6e61 100644
--- a/multimedia/videoutils/avifile.xml
+++ b/multimedia/videoutils/avifile.xml
@@ -2,16 +2,15 @@
    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
- 
+
   <!ENTITY avifile-download-http "http://prdownloads.sourceforge.net/avifile/avifile-0.7-&avifile-version;.tar.gz">
   <!ENTITY avifile-download-ftp  " ">
-  <!ENTITY avifile-size          "2.9 MB">
-  <!ENTITY avifile-buildsize     "51 MB">
-  <!ENTITY avifile-time          "2.85 SBU">
+  <!ENTITY avifile-size          "3.4 MB">
+  <!ENTITY avifile-buildsize     "48.2 MB">
+  <!ENTITY avifile-time          "2.73 SBU">
   <!ENTITY codec-download        "http://prdownloads.sourceforge.net/avifile/binaries-011002.tgz">
   <!ENTITY codec-size            "4.4 MB">
-  <!ENTITY codec-buildsize       "13 MB">
-  <!ENTITY codec-time            "0.01 SBU">
+  <!ENTITY codec-installsize     "13 MB">
 ]>
 
 <sect1 id="avifile" xreflabel="Avifile-&avifile-version;">
@@ -20,7 +19,7 @@
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="avifile.html"?>
-<title>Avifile-&avifile-version;</title>
+<title><application>Avifile</application>-&avifile-version;</title>
 
 <sect2>
 <title>Introduction to <application>Avifile</application></title>
@@ -37,38 +36,21 @@ useful for viewing and editing <acronym>AVI</acronym> files.</para>
 <ulink url="&avifile-download-ftp;"/></para></listitem>
 <listitem><para>Download size: 
 &avifile-size;</para></listitem>
-<listitem><para>Estimated Disk space required: 
+<listitem><para>Estimated disk space required: 
 &avifile-buildsize;</para></listitem>
 <listitem><para>Estimated build time: 
 &avifile-time;</para></listitem></itemizedlist>
 </sect3>
 
 <sect3><title>Additional downloads</title>
-<para><emphasis>CODECs</emphasis></para>
 <itemizedlist spacing='compact'>
-<listitem><para>Required <acronym>CODEC</acronym>s: 
+<listitem><para>Required <acronym>CODEC</acronym>: 
 <ulink url="&codec-download;"/></para></listitem>
 <listitem><para>Download size: 
 &codec-size;</para></listitem>
-<listitem><para>Estimated Disk space required: 
-&codec-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&codec-time;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&codec-installsize;</para></listitem>
 </itemizedlist>
-
-<para><emphasis>Patches</emphasis></para>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch (if compiled using 
-<application><acronym>GCC</acronym></application>-3.4.x): <ulink 
-url="&patch-root;/avifile-&avifile-version;-gcc34-1.patch"/></para>
-</listitem>
-<listitem><para>Required Patch (if 
-<application>FFmpeg</application> is installed): <ulink 
-url="&patch-root;/avifile-&avifile-version;-gcc34_ffmpeg-1.patch"/></para>
-</listitem>
-<listitem><para>Required Patch: <ulink 
-url="&patch-root;/avifile-&avifile-version;-freetype_fix-1.patch"/></para>
-</listitem></itemizedlist>
 </sect3>
 
 <sect3><title><application>Avifile</application> dependencies</title>
@@ -77,12 +59,16 @@ url="&patch-root;/avifile-&avifile-version;-freetype_fix-1.patch"/></para>
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="pkgconfig"/>, <xref linkend="libjpeg"/>, 
-<xref linkend="libogg"/>, <xref linkend="liba52"/>, 
-<xref linkend="ffmpeg"/>, <xref linkend="lame"/>, 
-<xref linkend="libmad"/>, <xref linkend="libvorbis"/>, 
-<xref linkend="xvid"/> (plugin currently broken), 
-<ulink url="http://www.audiocoding.com/modules/mydownloads/">FAAD</ulink> and 
+<para><xref linkend="pkgconfig"/>, 
+<xref linkend="libjpeg"/>, 
+<xref linkend="libogg"/>, 
+<xref linkend="libvorbis"/>, 
+<xref linkend="liba52"/>, 
+<xref linkend="lame"/>, 
+<xref linkend="libmad"/>, 
+<xref linkend="xvid"/>, 
+<ulink url="http://www.audiocoding.com/modules/mydownloads/">FAAD2</ulink>, 
+<ulink url="http://www.divx.com/divx/linux/">DivX4Linux</ulink> and 
 <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
 </sect4>
 </sect3>
@@ -95,15 +81,8 @@ url="&patch-root;/avifile-&avifile-version;-freetype_fix-1.patch"/></para>
 <para>Install <application>Avifile</application> by running the 
 following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../avifile-&avifile-version;-gcc34-1.patch &amp;&amp;
-patch -Np1 -i ../avifile-&avifile-version;-gcc34_ffmpeg-1.patch &amp;&amp;
-patch -Np1 -i ../avifile-&avifile-version;-freetype_fix-1.patch &amp;&amp;
-install -d /usr/lib/avifile-0.7/win32 &amp;&amp;
+<screen><userinput><command>install -d /usr/lib/avifile-0.7/win32 &amp;&amp;
 tar xzvf ../binaries-011002.tgz -C /usr/lib/avifile-0.7 &amp;&amp;
-./autogen.sh &amp;&amp;
-./configure &amp;&amp;
-make maintainer-clean &amp;&amp;
-./autogen.sh &amp;&amp;
 ./configure --prefix=/usr \
     --with-win32-path=/usr/lib/avifile-0.7/win32 &amp;&amp;
 make &amp;&amp;
@@ -111,7 +90,7 @@ make install</command></userinput></screen>
 
 </sect2>
 
-<sect2>
+<!-- <sect2>
 <title>Command explanations</title>
 
 <para><command>./autogen.sh &amp;&amp; ./configure &amp;&amp;
@@ -121,7 +100,7 @@ problems like configure not being able to detect some libraries and compilation
 errors. This is fixed by rebuilding the configuration scripts.
 </para>
 
-</sect2>
+</sect2> -->
 
 <sect2>
 <title>Contents</title>