Changeset 89d37eb8


Ignore:
Timestamp:
10/08/2013 04:45:32 PM (11 years ago)
Author:
Igor Živković <igor@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
c0fce1d
Parents:
7f2dfa0
Message:

update to ffmpeg-2.0.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11942 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
11 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r7f2dfa0 r89d37eb8  
    808808
    809809<!-- Chapter 40 -->
    810 <!ENTITY ffmpeg-version               "1.2.2">
     810<!ENTITY ffmpeg-version               "2.0.1">
    811811<!ENTITY mplayer-version              "1.1.1">
    812812<!ENTITY xine-ui-version              "0.99.7">

  • general/graphlib/gegl.xml

    r7f2dfa0 r89d37eb8  
    6868        <para>
    6969          Estimated build time: &gegl-time;
     70        </para>
     71      </listitem>
     72    </itemizedlist>
     73
     74    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     75    <itemizedlist spacing="compact">
     76      <listitem>
     77        <para>
     78          Required patch:
     79          <ulink url="&patch-root;/gegl-&gegl-version;-ffmpeg2-1.patch"/>
    7080        </para>
    7181      </listitem>
    … …  
    119129    </para>
    120130
    121 <screen><userinput>sed -e '274cerr = avformat_open_input (&amp;p->ic, o->path, NULL, NULL);' \
    122     -i operations/external/ff-load.c &amp;&amp;
     131<screen><userinput>patch -Np1 -i ../gegl-&gegl-version;-ffmpeg2-1.patch &amp;&amp;
    123132./configure --prefix=/usr &amp;&amp;
    124133make</userinput></screen>
    … …  
    141150  <sect2 role="commands">
    142151    <title>Command Explanations</title>
    143 
    144     <para>
    145       <command>sed -e '274cerr ...</command>: Fixes building against
    146       <application>FFMpeg</application> 0.11.1.
    147     </para>
    148152
    149153    <para>

  • introduction/welcome/changelog.xml

    r7f2dfa0 r89d37eb8  
    4848      <itemizedlist>
    4949        <listitem>
     50          <para>[igor] - Update to ffmpeg-2.0.1. Fixes
     51          <ulink url="&blfs-ticket-root;3953">#3953</ulink>.</para>
     52        </listitem>
     53        <listitem>
    5054          <para>[igor] - Added x264-20131007-2245.</para>
    5155        </listitem>

  • multimedia/cdwriteutils/k3b.xml

    r7f2dfa0 r89d37eb8  
    9494        <para>
    9595          Required patch:
    96           <ulink url="&patch-root;/k3b-&k3b-version;-ffmpeg_fix-2.patch"/>
     96          <ulink url="&patch-root;/k3b-&k3b-version;-ffmpeg2-1.patch"/>
    9797        </para>
    9898      </listitem>
    … …  
    154154    </para>
    155155
    156 <screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg_fix-2.patch &amp;&amp;
     156<screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg2-1.patch &amp;&amp;
    157157
    158158mkdir build &amp;&amp;

  • multimedia/libdriv/alsa-plugins.xml

    r7f2dfa0 r89d37eb8  
    7171    </itemizedlist>
    7272
     73    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     74    <itemizedlist spacing="compact">
     75      <listitem>
     76        <para>
     77          Required patch:
     78          <ulink url="&patch-root;/alsa-plugins-&alsa-plugins-version;-ffmpeg2-1.patch"/>
     79        </para>
     80      </listitem>
     81    </itemizedlist>
     82
    7383    <bridgehead renderas="sect3">ALSA Plugins Dependencies</bridgehead>
    7484
    … …  
    100110    </para>
    101111
    102 <screen><userinput>./configure &amp;&amp;
     112<screen><userinput>patch -Np1 -i ../alsa-plugins-&alsa-plugins-version;-ffmpeg2-1.patch &amp;&amp;
     113./configure &amp;&amp;
    103114make</userinput></screen>
    104115

  • multimedia/libdriv/libquicktime.xml

    r7f2dfa0 r89d37eb8  
    7272        <para>
    7373          Estimated build time: &libquicktime-time;
     74        </para>
     75      </listitem>
     76    </itemizedlist>
     77
     78    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     79    <itemizedlist spacing="compact">
     80      <listitem>
     81        <para>
     82          Required patch:
     83          <ulink url="&patch-root;/libquicktime-&libquicktime-version;-ffmpeg2-1.patch"/>
    7484        </para>
    7585      </listitem>
    … …  
    109119    </para>
    110120
    111 <screen><userinput>./configure --prefix=/usr     \
     121<screen><userinput>patch -Np1 -i ../libquicktime-&libquicktime-version;-ffmpeg2-1.patch &amp;&amp;
     122./configure --prefix=/usr     \
    112123            --enable-gpl      \
    113124            --without-doxygen \

  • multimedia/libdriv/opal.xml

    r7f2dfa0 r89d37eb8  
    7777        <para>
    7878          Required patch:
    79           <ulink url="&patch-root;/opal-&opal-version;-ffmpeg-1.patch"/>
     79          <ulink url="&patch-root;/opal-&opal-version;-ffmpeg2-1.patch"/>
    8080        </para>
    8181      </listitem>
    … …  
    114114    commands:</para>
    115115
    116 <screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg-1.patch &amp;&amp;
     116<screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg2-1.patch &amp;&amp;
    117117
    118118./configure --prefix=/usr &amp;&amp;

  • multimedia/libdriv/opus.xml

    r7f2dfa0 r89d37eb8  
    142142        <listitem>
    143143          <para>
    144             provides the functions used to read and write opus format.
     144            provides the functions used to read and write Opus format.
    145145          </para>
    146146          <indexterm zone="opus libopus">

  • multimedia/libdriv/x264.xml

    r7f2dfa0 r89d37eb8  
    112112    <title>Command Explanations</title>
    113113
    114     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115       href="../../xincludes/static-libraries.xml"/>
    116 
    117114    <para>
    118115      <parameter>--disable-cli</parameter>: This switch disables building the

  • multimedia/videoutils/ffmpeg.xml

    r7f2dfa0 r89d37eb8  
    88           "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
    99  <!ENTITY ffmpeg-download-ftp  " ">
    10   <!ENTITY ffmpeg-md5sum        "4997660dfc077922e37d0583f9322f6b">
    11   <!ENTITY ffmpeg-size          "5.7 MB">
     10  <!ENTITY ffmpeg-md5sum        "dd71a1baedb2daa3e4d21e0651daa918">
     11  <!ENTITY ffmpeg-size          "6.0 MB">
    1212  <!ENTITY ffmpeg-buildsize     "100 MB">
    13   <!ENTITY ffmpeg-time          "4.0 SBU">
     13  <!ENTITY ffmpeg-time          "2.6 SBU">
    1414]>
    1515
    … …  
    8181    <bridgehead renderas="sect3">FFmpeg Dependencies</bridgehead>
    8282
    83     <!-- All dependencies are listed in the order as they are displayed in
    84          the configure script. This makes it easy for readers (and editors)
    85          to match up the dependency list with what is required or desired. -->
    86 
    8783    <bridgehead renderas="sect4">Recommended</bridgehead>
    8884    <para role="recommended">
     85      <xref linkend="yasm"/>,
     86      <xref linkend="libass"/>,
     87      <xref linkend="fdk-aac"/>,
     88      <xref linkend="lame"/>,
     89      <xref linkend="opus"/>,
     90      <xref linkend="libtheora"/>,
     91      <xref linkend="libvorbis"/>,
     92      <xref linkend="libvpx"/>, and
     93      <xref linkend="x264"/>
     94    </para>
     95
     96    <bridgehead renderas="sect4">Recommended for desktop use</bridgehead>
     97    <para>
     98      <xref linkend="x-window-system"/>,
     99      <xref linkend="alsa-lib"/>,
     100      <xref linkend="sdl"/>,
     101      <xref linkend="libva"/> and
     102      <xref linkend="libvdpau"/> (with the corresponding driver package)
     103    </para>
     104
     105    <bridgehead renderas="sect4">Optional</bridgehead>
     106    <para role="optional">
    89107      <xref linkend="faac"/>,
    90108      <xref linkend="freetype2"/>,
    91       <xref linkend="lame"/>,
    92109      <xref linkend="openjpeg"/>,
    93110      <xref linkend="pulseaudio"/>,
    94111      <xref linkend="speex"/>,
    95       <xref linkend="libtheora"/>,
    96       <xref linkend="libvorbis"/>,
    97       <xref linkend="libvpx"/>,
    98112      <xref linkend="xvid"/>,
    99113      <xref linkend="openssl"/>,
    100       <xref linkend="sdl"/>,
    101       <xref linkend="xorg7-lib"/>,
    102       <xref linkend="yasm"/>
    103     </para>
    104 
    105     <bridgehead renderas="sect4">Recommended (For Hardware Video Decoding)</bridgehead>
    106     <para>
    107       <xref linkend="libva"/> and
    108       <xref linkend="libvdpau"/>
    109       (with the corresponding driver package)
    110     </para>
    111 
    112     <bridgehead renderas="sect4">Optional</bridgehead>
    113     <para role="optional">
    114114      <xref linkend="fontconfig"/>,
    115115      <ulink url="http://www.piksel.org/frei0r">frei0r</ulink>,
    116116      <xref linkend="gnutls"/>,
    117117      <ulink url="http://tipok.org.ua/node/17">libaacplus</ulink>,
    118       <xref linkend="libass"/>,
    119118      <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
    120119      <ulink url="http://caca.zoy.org/">libcaca</ulink>,
    … …  
    122121      <ulink url="http://ftp.gnu.org/pub/gnu/libcdio/">libcdio</ulink>,
    123122      <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
    124       <xref linkend="fdk-aac"/>,
    125123      <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
    126124      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
    … …  
    131129      <ulink url="http://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
    132130      <ulink url="http://opencv.org/">OpenCV</ulink>,
    133       <xref linkend="opus"/>,
    134131      <ulink url="http://sourceforge.net/projects/librtmp">librtmp</ulink>,
    135132      <ulink url="http://diracvideo.org/">Schroedinger</ulink>,
    … …  
    138135      <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
    139136      <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>,
    140       <xref linkend="x264"/>,
    141137      <ulink url="http://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),
    142138      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>, and
    … …  
    164160      commands:
    165161    </para>
    166 
    167     <!-- The confiure optinos are listed in the order as they are displayed in
    168          the configure script. This makes it easy for readers (and editors)
    169          to match up the options with what is required or desired. -->
    170162
    171163<screen><userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &amp;&amp;
    … …  
    176168            --disable-static     \
    177169            --enable-shared      \
    178             --enable-x11grab     \
    179             --enable-libfaac     \
    180             --enable-libfreetype \
     170            --disable-debug      \
     171            --enable-libass      \
     172            --enable-libfdk-aac \
    181173            --enable-libmp3lame  \
    182             --enable-libopenjpeg \
    183             --enable-libpulse    \
    184             --enable-libspeex    \
     174            --enable-libopus     \
    185175            --enable-libtheora   \
    186176            --enable-libvorbis   \
    187177            --enable-libvpx      \
    188             --enable-libxvid     \
    189             --enable-openssl     \
    190             --disable-debug      &amp;&amp;
     178            --enable-libx264     \
     179            --enable-x11grab     &amp;&amp;
    191180make &amp;&amp;
    192181gcc tools/qt-faststart.c -o tools/qt-faststart &amp;&amp;
    … …  
    302291
    303292    <para>
    304       <parameter>--enable-x11grab</parameter>: Enables X11 grabbing.
    305     </para>
    306 
    307     <para>
    308       <parameter>--enable-libfaac</parameter>: Enables AAC encoding via
    309       <filename class="libraryfile">libfaac</filename>.
    310     </para>
    311 
    312     <para>
    313       <parameter>--enable-libfreetype</parameter>: Enables the use of
    314       <filename class="libraryfile">libfreetype</filename>.
     293      <parameter>--disable-debug</parameter>: Disables building debugging
     294      symbols into the programs and libraries.
     295    </para>
     296
     297    <para>
     298      <parameter>--enable-libass</parameter>: Enables ASS/SSA subtitle format
     299      rendering <filename class="libraryfile">libass</filename>.
     300    </para>
     301
     302    <para>
     303      <parameter>--enable-libfdk-aac</parameter>: Enables audio encoding in AAC
     304      format via <filename class="libraryfile">libfdk-aac</filename>.
    315305    </para>
    316306
    … …  
    321311
    322312    <para>
    323       <parameter>--enable-libopenjpeg</parameter>: Enables JPEG 2000 de/encoding
    324       via <filename class="libraryfile">libopenjpeg</filename>.
    325     </para>
    326 
    327     <para>
    328       <parameter>--enable-libpulse</parameter>: Enables
    329       <application>Pulseaudio</application> input via
    330       <filename class="libraryfile">libpulse</filename>.
    331     </para>
    332 
    333     <para>
    334       <parameter>--enable-libspeex</parameter>: Enables
    335       <application>Speex</application> de/encoding
    336       via <filename class="libraryfile">libspeex</filename>.
     313      <parameter>--enable-libopus</parameter>: Enables Opus format encoding and
     314      decoding via <filename class="libraryfile">libopus</filename>.
    337315    </para>
    338316
    … …  
    355333
    356334    <para>
    357       <parameter>--enable-libxvid</parameter>: Enables
    358       <application>Xvid</application> encoding
    359       via <filename class="libraryfile">libxvidcore</filename>.
    360     </para>
    361 
    362     <para>
    363       <parameter>--enable-openssl</parameter>: Enables
    364       <application>OpenSSL</application> cryptography.
    365     </para>
    366 
    367     <para>
    368       <parameter>--disable-debug</parameter>: Disables building debugging
    369       symbols into the programs and libraries.
    370     </para>
    371 
    372     <para>
    373       <option>--enable-<replaceable>&lt;codec&gt;</replaceable></option>:
    374       <application>FFmpeg</application> comes with code to compile decoders for
    375       almost every codec you could think of. The only reason to enable a
    376       specific codec (and make <application>FFmpeg</application> link to the
    377       prerequisite shared library installed on your system) is to make
     335      <parameter>--enable-libx264</parameter>: Enables H.264 de/encoding
     336      via <filename class="libraryfile">libvpx</filename>.
     337    </para>
     338
     339    <para>
     340      <parameter>--enable-x11grab</parameter>: Enables X11 grabbing.
     341    </para>
     342
     343    <para>
     344      Support for most of the dependency packages requires using options passed
     345      to the <command>configure</command> script. View the the output from
     346      <command>./configure --help</command> for complete information about
     347      enabling dependency packages. The only reason to enable a specific codec
     348      (and make <application>FFmpeg</application> link to the prerequisite
     349      shared library installed on your system) is to make
    378350      <application>FFmpeg</application> compile an <emphasis>encoder</emphasis>
    379       for that codec. <application>FFmpeg</application> provides an excellent
    380       collection of decoders. If you just want to use
    381       <application>FFmpeg</application> to watch video or listen to music (via
    382       other applications such as <application>Gstreamer</application> or
     351      and/or <emphasis>decoder</emphasis> for that codec. If you just want to
     352      use <application>FFmpeg</application> to watch video or listen to music
     353      (via other applications such as <application>Gstreamer</application> or
    383354      <application>Xine</application>) then you will not benefit from linking
    384355      <application>FFmpeg</application> to other codec libraries.
    … …  
    426397      <seglistitem>
    427398        <seg>
    428           ffmpeg, ffplay, ffprobe, ffserver and
     399          ffmpeg, ffplay, ffprobe, ffserver, and
    429400          qt-faststart
    430401        </seg>
    … …  
    432403          libavcodec.so, libavdevice.so, libavfilter.so,
    433404          libavformat.so, libavutil.so, libpostproc.so,
    434           libswresample and libswscale.so
     405          libswresample, and libswscale.so
    435406        </seg>
    436407        <seg>
    … …  
    443414          /usr/include/libswresample
    444415          /usr/include/libswscale,
    445           /usr/share/ffmpeg and
     416          /usr/share/ffmpeg, and
    446417          /usr/share/doc/ffmpeg-&ffmpeg-version;
    447418        </seg>

  • multimedia/videoutils/transcode.xml

    r7f2dfa0 r89d37eb8  
    7979        <para>
    8080          Required patch:
    81           <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg-2.patch"/>
     81          <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg2-1.patch"/>
    8282        </para>
    8383      </listitem>
    … …  
    156156<screen><userinput>sed -i 's|doc/transcode|&amp;-$(PACKAGE_VERSION)|' \
    157157       $(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &amp;&amp;
    158 patch -Np1 -i ../transcode-&transcode-version;-ffmpeg-2.patch &amp;&amp;
     158patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch &amp;&amp;
    159159./configure --prefix=/usr \
    160160            --enable-alsa \
Note: See TracChangeset for help on using the changeset viewer.