[blfs-book] r10699 - in trunk/BOOK: . introduction/welcome multimedia/videoutils

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Wed Sep 26 18:55:13 PDT 2012


Author: bdubbs
Date: 2012-09-26 19:55:09 -0600 (Wed, 26 Sep 2012)
New Revision: 10699

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/videoutils/ffmpeg.xml
Log:
Update to ffmpeg-0.11.2

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-09-26 23:07:49 UTC (rev 10698)
+++ trunk/BOOK/general.ent	2012-09-27 01:55:09 UTC (rev 10699)
@@ -868,7 +868,7 @@
 
 <!-- Chapter 40 -->
 <!ENTITY dvb-apps-version             "2012-06-10">
-<!ENTITY ffmpeg-version               "0.11.1">
+<!ENTITY ffmpeg-version               "0.11.2">
 <!ENTITY mplayer-version              "1.1">
 <!ENTITY xine-ui-version              "0.99.7">
 <!ENTITY transcode-version            "1.1.7">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-09-26 23:07:49 UTC (rev 10698)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-09-27 01:55:09 UTC (rev 10699)
@@ -47,6 +47,10 @@
       <para>September 26th, 2012</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to ffmpeg-0.11.2. Fixes
+          <ulink url="&blfs-ticket-root;3581">#3581</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to git-1.7.12.1. Fixes
           <ulink url="&blfs-ticket-root;3573">#3573</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml	2012-09-26 23:07:49 UTC (rev 10698)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml	2012-09-27 01:55:09 UTC (rev 10699)
@@ -7,10 +7,10 @@
   <!ENTITY ffmpeg-download-http
     "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "ff8cb914f657e164dd60ea1008b555a8">
-  <!ENTITY ffmpeg-size          "5.8 MB">
-  <!ENTITY ffmpeg-buildsize     "256 MB">
-  <!ENTITY ffmpeg-time          "3.9 SBU">
+  <!ENTITY ffmpeg-md5sum        "93c1908022567b321df74db7214da6ac">
+  <!ENTITY ffmpeg-size          "5.7 MB">
+  <!ENTITY ffmpeg-buildsize     "244 MB">
+  <!ENTITY ffmpeg-time          "3.6 SBU">
 ]>
 
 <sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@@ -138,20 +138,21 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --enable-gpl \
-      --enable-shared --disable-static &&
+<screen><userinput>./configure --prefix=/usr   \
+            --enable-gpl    \
+            --enable-shared \
+            --disable-static &&
 make</userinput></screen>
 
     <para>To convert the docs to html use the following commands:</para>
 
-<screen><userinput>cd doc &&
-sed -i '/@top/d;/ignore$/d' *.texi &&
-sed -i '/@include avoptions/d' avtools-common-opts.texi &&
-for DOC in *.texi
-do makeinfo --html --no-split -o ${DOC%texi}html ${DOC}
-done &&
-cd ..</userinput></screen>
+<screen><userinput>sed -i '/@top/d;/ignore$/d'    doc/*.texi                   &&
+sed -i '/@include avoptions/d' doc/avtools-common-opts.texi &&
 
+for DOC in doc/*.texi; do
+   makeinfo --html --no-split -o ${DOC%texi}html ${DOC}
+done</userinput></screen>
+
     <para>
       If you have <xref linkend="doxygen"/> installed and wish to create the API
       documentation (takes about 150 MB of space), issue the command
@@ -163,10 +164,10 @@
     <para>Now, as the <systemitem class="username">root</systemitem>
     user:</para>
 
-<screen role="root"><userinput>make install &&
+<screen role="root"><userinput>make install     &&
 make install-man &&
-mkdir /usr/share/doc/ffmpeg-&ffmpeg-version; &&
-cp doc/*.html doc/*.txt /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
+mkdir -p                  /usr/share/doc/ffmpeg-&ffmpeg-version; &&
+cp    -v doc/*.{html,txt} /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
 
     <para>
       The <application>FFmpeg</application> source contains a tool called
@@ -187,8 +188,8 @@
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>mkdir /usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
-cp -v doxy/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api</userinput></screen>
+<screen role="root"><userinput>mkdir -p        /usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
+cp    -v doxy/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api</userinput></screen>
   </sect2>
 
   <sect2 role="commands">




More information about the blfs-book mailing list