[blfs-book] r11942 - in trunk/BOOK: . general/graphlib introduction/welcome multimedia/cdwriteutils multimedia/libdriv multimedia/videoutils

igor at higgs.linuxfromscratch.org igor at higgs.linuxfromscratch.org
Tue Oct 8 09:45:32 PDT 2013


Author: igor
Date: Tue Oct  8 09:45:32 2013
New Revision: 11942

Log:
update to ffmpeg-2.0.1

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/gegl.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/cdwriteutils/k3b.xml
   trunk/BOOK/multimedia/libdriv/alsa-plugins.xml
   trunk/BOOK/multimedia/libdriv/libquicktime.xml
   trunk/BOOK/multimedia/libdriv/opal.xml
   trunk/BOOK/multimedia/libdriv/opus.xml
   trunk/BOOK/multimedia/libdriv/x264.xml
   trunk/BOOK/multimedia/videoutils/ffmpeg.xml
   trunk/BOOK/multimedia/videoutils/transcode.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/general.ent	Tue Oct  8 09:45:32 2013	(r11942)
@@ -807,7 +807,7 @@
 <!ENTITY gvolwheel-version            "1.0">
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "1.2.2">
+<!ENTITY ffmpeg-version               "2.0.1">
 <!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.7">
 <!ENTITY transcode-version            "1.1.7">

Modified: trunk/BOOK/general/graphlib/gegl.xml
==============================================================================
--- trunk/BOOK/general/graphlib/gegl.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/general/graphlib/gegl.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -71,6 +71,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gegl-&gegl-version;-ffmpeg2-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">gegl Dependencies</bridgehead>
 
 
@@ -118,8 +128,7 @@
       Install <application>gegl</application> by running the following commands:
     </para>
 
-<screen><userinput>sed -e '274cerr = avformat_open_input (&p->ic, o->path, NULL, NULL);' \
-    -i operations/external/ff-load.c &&
+<screen><userinput>patch -Np1 -i ../gegl-&gegl-version;-ffmpeg2-1.patch &&
 ./configure --prefix=/usr &&
 make</userinput></screen>
 
@@ -142,11 +151,6 @@
     <title>Command Explanations</title>
 
     <para>
-      <command>sed -e '274cerr ...</command>: Fixes building against
-      <application>FFMpeg</application> 0.11.1.
-    </para>
-
-    <para>
       <parameter>install -v -m644/docs/*/{css,html} ...</parameter>:
       This and the subsequent commands install all the provided documentation
       instead of only <filename>operations.html</filename> and the stylesheet

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -47,6 +47,10 @@
       <para>October 8th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[igor] - Update to ffmpeg-2.0.1. Fixes
+          <ulink url="&blfs-ticket-root;3953">#3953</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Added x264-20131007-2245.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/multimedia/cdwriteutils/k3b.xml
==============================================================================
--- trunk/BOOK/multimedia/cdwriteutils/k3b.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/multimedia/cdwriteutils/k3b.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -93,7 +93,7 @@
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/k3b-&k3b-version;-ffmpeg_fix-2.patch"/>
+          <ulink url="&patch-root;/k3b-&k3b-version;-ffmpeg2-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -153,7 +153,7 @@
       commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg_fix-2.patch &&
+<screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg2-1.patch &&
 
 mkdir build &&
 cd    build &&

Modified: trunk/BOOK/multimedia/libdriv/alsa-plugins.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/alsa-plugins.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/multimedia/libdriv/alsa-plugins.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -70,6 +70,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/alsa-plugins-&alsa-plugins-version;-ffmpeg2-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">ALSA Plugins Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -99,7 +109,8 @@
       running the following commands:
     </para>
 
-<screen><userinput>./configure &&
+<screen><userinput>patch -Np1 -i ../alsa-plugins-&alsa-plugins-version;-ffmpeg2-1.patch &&
+./configure &&
 make</userinput></screen>
 
     <para>

Modified: trunk/BOOK/multimedia/libdriv/libquicktime.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libquicktime.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/multimedia/libdriv/libquicktime.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -75,6 +75,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/libquicktime-&libquicktime-version;-ffmpeg2-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">libquicktime Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -108,7 +118,8 @@
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
+<screen><userinput>patch -Np1 -i ../libquicktime-&libquicktime-version;-ffmpeg2-1.patch &&
+./configure --prefix=/usr     \
             --enable-gpl      \
             --without-doxygen \
             --docdir=/usr/share/doc/libquicktime-&libquicktime-version; **

Modified: trunk/BOOK/multimedia/libdriv/opal.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/opal.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/multimedia/libdriv/opal.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -76,7 +76,7 @@
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/opal-&opal-version;-ffmpeg-1.patch"/>
+          <ulink url="&patch-root;/opal-&opal-version;-ffmpeg2-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -113,7 +113,7 @@
     <para>Install <application>Opal</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg-1.patch &&
+<screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg2-1.patch &&
 
 ./configure --prefix=/usr &&
 make</userinput></screen>

Modified: trunk/BOOK/multimedia/libdriv/opus.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/opus.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/multimedia/libdriv/opus.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -141,7 +141,7 @@
         <term><filename class="libraryfile">libopus.so</filename></term>
         <listitem>
           <para>
-            provides the functions used to read and write opus format.
+            provides the functions used to read and write Opus format.
           </para>
           <indexterm zone="opus libopus">
             <primary sortas="c-libopus">libopus.so</primary>

Modified: trunk/BOOK/multimedia/libdriv/x264.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/x264.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/multimedia/libdriv/x264.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -111,9 +111,6 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
     <para>
       <parameter>--disable-cli</parameter>: This switch disables building the
       command-line encoder which is redundant since it requires FFmpeg for

Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -7,10 +7,10 @@
   <!ENTITY ffmpeg-download-http
            "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "4997660dfc077922e37d0583f9322f6b">
-  <!ENTITY ffmpeg-size          "5.7 MB">
+  <!ENTITY ffmpeg-md5sum        "dd71a1baedb2daa3e4d21e0651daa918">
+  <!ENTITY ffmpeg-size          "6.0 MB">
   <!ENTITY ffmpeg-buildsize     "100 MB">
-  <!ENTITY ffmpeg-time          "4.0 SBU">
+  <!ENTITY ffmpeg-time          "2.6 SBU">
 ]>
 
 <sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@@ -80,48 +80,46 @@
 
     <bridgehead renderas="sect3">FFmpeg Dependencies</bridgehead>
 
-    <!-- All dependencies are listed in the order as they are displayed in
-         the configure script. This makes it easy for readers (and editors)
-         to match up the dependency list with what is required or desired. -->
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="faac"/>,
-      <xref linkend="freetype2"/>,
+      <xref linkend="yasm"/>,
+      <xref linkend="libass"/>,
+      <xref linkend="fdk-aac"/>,
       <xref linkend="lame"/>,
-      <xref linkend="openjpeg"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="speex"/>,
+      <xref linkend="opus"/>,
       <xref linkend="libtheora"/>,
       <xref linkend="libvorbis"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="xvid"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="sdl"/>,
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="yasm"/>
+      <xref linkend="libvpx"/>, and
+      <xref linkend="x264"/>
     </para>
 
-    <bridgehead renderas="sect4">Recommended (For Hardware Video Decoding)</bridgehead>
+    <bridgehead renderas="sect4">Recommended for desktop use</bridgehead>
     <para>
+      <xref linkend="x-window-system"/>,
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="sdl"/>,
       <xref linkend="libva"/> and
-      <xref linkend="libvdpau"/>
-      (with the corresponding driver package)
+      <xref linkend="libvdpau"/> (with the corresponding driver package)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="faac"/>,
+      <xref linkend="freetype2"/>,
+      <xref linkend="openjpeg"/>,
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="speex"/>,
+      <xref linkend="xvid"/>,
+      <xref linkend="openssl"/>,
       <xref linkend="fontconfig"/>,
       <ulink url="http://www.piksel.org/frei0r">frei0r</ulink>,
       <xref linkend="gnutls"/>,
       <ulink url="http://tipok.org.ua/node/17">libaacplus</ulink>,
-      <xref linkend="libass"/>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://caca.zoy.org/">libcaca</ulink>,
       <ulink url="http://www.celt-codec.org/">libcelt</ulink>,
       <ulink url="http://ftp.gnu.org/pub/gnu/libcdio/">libcdio</ulink>,
       <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
-      <xref linkend="fdk-aac"/>,
       <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
       <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
       <ulink url="https://ieee1394.wiki.kernel.org/index.php/Libraries">libiec61883</ulink>,
@@ -130,14 +128,12 @@
       <ulink url="http://svn.mplayerhq.hu/nut/src/trunk/">libnut</ulink> (SVN checkout),
       <ulink url="http://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
       <ulink url="http://opencv.org/">OpenCV</ulink>,
-      <xref linkend="opus"/>,
       <ulink url="http://sourceforge.net/projects/librtmp">librtmp</ulink>,
       <ulink url="http://diracvideo.org/">Schroedinger</ulink>,
       <ulink url="http://www.twolame.org/">TwoLAME</ulink>,
       <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>,
-      <xref linkend="x264"/>,
       <ulink url="http://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),
       <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>, and
       <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink> (to build HTML documentation)
@@ -164,10 +160,6 @@
       commands:
     </para>
 
-    <!-- The confiure optinos are listed in the order as they are displayed in
-         the configure script. This makes it easy for readers (and editors)
-         to match up the options with what is required or desired. -->
-
 <screen><userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &&
 ./configure --prefix=/usr        \
             --enable-gpl         \
@@ -175,19 +167,16 @@
             --enable-nonfree     \
             --disable-static     \
             --enable-shared      \
-            --enable-x11grab     \
-            --enable-libfaac     \
-            --enable-libfreetype \
+            --disable-debug      \
+            --enable-libass      \
+            --enable-libfdk-aac  \
             --enable-libmp3lame  \
-            --enable-libopenjpeg \
-            --enable-libpulse    \
-            --enable-libspeex    \
+            --enable-libopus     \
             --enable-libtheora   \
             --enable-libvorbis   \
             --enable-libvpx      \
-            --enable-libxvid     \
-            --enable-openssl     \
-            --disable-debug      &&
+            --enable-libx264     \
+            --enable-x11grab     &&
 make &&
 gcc tools/qt-faststart.c -o tools/qt-faststart &&
 unset LIBRARY_PATH</userinput></screen>
@@ -301,17 +290,18 @@
     </para>
 
     <para>
-      <parameter>--enable-x11grab</parameter>: Enables X11 grabbing.
+      <parameter>--disable-debug</parameter>: Disables building debugging
+      symbols into the programs and libraries.
     </para>
 
     <para>
-      <parameter>--enable-libfaac</parameter>: Enables AAC encoding via
-      <filename class="libraryfile">libfaac</filename>.
+      <parameter>--enable-libass</parameter>: Enables ASS/SSA subtitle format
+      rendering <filename class="libraryfile">libass</filename>.
     </para>
 
     <para>
-      <parameter>--enable-libfreetype</parameter>: Enables the use of
-      <filename class="libraryfile">libfreetype</filename>.
+      <parameter>--enable-libfdk-aac</parameter>: Enables audio encoding in AAC
+      format via <filename class="libraryfile">libfdk-aac</filename>.
     </para>
 
     <para>
@@ -320,20 +310,8 @@
     </para>
 
     <para>
-      <parameter>--enable-libopenjpeg</parameter>: Enables JPEG 2000 de/encoding
-      via <filename class="libraryfile">libopenjpeg</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libpulse</parameter>: Enables
-      <application>Pulseaudio</application> input via
-      <filename class="libraryfile">libpulse</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libspeex</parameter>: Enables
-      <application>Speex</application> de/encoding
-      via <filename class="libraryfile">libspeex</filename>.
+      <parameter>--enable-libopus</parameter>: Enables Opus format encoding and
+      decoding via <filename class="libraryfile">libopus</filename>.
     </para>
 
     <para>
@@ -354,32 +332,25 @@
     </para>
 
     <para>
-      <parameter>--enable-libxvid</parameter>: Enables
-      <application>Xvid</application> encoding
-      via <filename class="libraryfile">libxvidcore</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-openssl</parameter>: Enables
-      <application>OpenSSL</application> cryptography.
+      <parameter>--enable-libx264</parameter>: Enables H.264 de/encoding
+      via <filename class="libraryfile">libvpx</filename>.
     </para>
 
     <para>
-      <parameter>--disable-debug</parameter>: Disables building debugging
-      symbols into the programs and libraries.
+      <parameter>--enable-x11grab</parameter>: Enables X11 grabbing.
     </para>
 
     <para>
-      <option>--enable-<replaceable><codec></replaceable></option>:
-      <application>FFmpeg</application> comes with code to compile decoders for
-      almost every codec you could think of. The only reason to enable a
-      specific codec (and make <application>FFmpeg</application> link to the
-      prerequisite shared library installed on your system) is to make
+      Support for most of the dependency packages requires using options passed
+      to the <command>configure</command> script. View the the output from
+      <command>./configure --help</command> for complete information about
+      enabling dependency packages. The only reason to enable a specific codec
+      (and make <application>FFmpeg</application> link to the prerequisite
+      shared library installed on your system) is to make
       <application>FFmpeg</application> compile an <emphasis>encoder</emphasis>
-      for that codec. <application>FFmpeg</application> provides an excellent
-      collection of decoders. If you just want to use
-      <application>FFmpeg</application> to watch video or listen to music (via
-      other applications such as <application>Gstreamer</application> or
+      and/or <emphasis>decoder</emphasis> for that codec. If you just want to
+      use <application>FFmpeg</application> to watch video or listen to music
+      (via other applications such as <application>Gstreamer</application> or
       <application>Xine</application>) then you will not benefit from linking
       <application>FFmpeg</application> to other codec libraries.
     </para>
@@ -425,13 +396,13 @@
 
       <seglistitem>
         <seg>
-          ffmpeg, ffplay, ffprobe, ffserver and
+          ffmpeg, ffplay, ffprobe, ffserver, and
           qt-faststart
         </seg>
         <seg>
           libavcodec.so, libavdevice.so, libavfilter.so,
           libavformat.so, libavutil.so, libpostproc.so,
-          libswresample and libswscale.so
+          libswresample, and libswscale.so
         </seg>
         <seg>
           /usr/include/libavcodec,
@@ -442,7 +413,7 @@
           /usr/include/libpostproc,
           /usr/include/libswresample
           /usr/include/libswscale,
-          /usr/share/ffmpeg and
+          /usr/share/ffmpeg, and
           /usr/share/doc/ffmpeg-&ffmpeg-version;
         </seg>
       </seglistitem>

Modified: trunk/BOOK/multimedia/videoutils/transcode.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/transcode.xml	Tue Oct  8 08:50:53 2013	(r11941)
+++ trunk/BOOK/multimedia/videoutils/transcode.xml	Tue Oct  8 09:45:32 2013	(r11942)
@@ -78,7 +78,7 @@
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg-2.patch"/>
+          <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg2-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -155,7 +155,7 @@
 
 <screen><userinput>sed -i 's|doc/transcode|&-$(PACKAGE_VERSION)|' \
        $(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &&
-patch -Np1 -i ../transcode-&transcode-version;-ffmpeg-2.patch &&
+patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch &&
 ./configure --prefix=/usr \
             --enable-alsa \
             --enable-libmpeg2 &&



More information about the blfs-book mailing list