Changeset efcf979


Ignore:
Timestamp:
12/29/2011 03:35:25 AM (13 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.4, 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, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal
Children:
98d5a95
Parents:
35bf1ea
Message:

Update to ffmpeg-0.9
Update Xine Libraries dependencies

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

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r35bf1ea refcf979  
    875875
    876876<!-- Chapter 40 -->
    877 <!ENTITY ffmpeg-version               "0.8.6">
     877<!ENTITY ffmpeg-version               "0.9">
    878878<!ENTITY avifile-version              "0.7.45">
    879879<!ENTITY mplayer-version              "1.0rc1">

  • introduction/welcome/changelog.xml

    r35bf1ea refcf979  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[bdubbs] - Update to ffmpeg-0.9.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[bdubbs] - Update Xine Libraries dependencies.</para>
     52        </listitem>
     53        <listitem>
    4854          <para>[bdubbs] - Update to lame-3.99.3</para>
    4955        </listitem>

  • multimedia/libdriv/xine-lib.xml

    r35bf1ea refcf979  
    3535    speakers.</para>
    3636
    37     &lfs67_checked;
     37    &lfs70_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    6363    <bridgehead renderas="sect4">Required</bridgehead>
    6464    <para role="required">
    65       <xref linkend="x-window-system"/> and at least one of:
     65      <xref linkend="x-window-system"/>,
     66      <xref linkend="ffmpeg"/>, and at least one of:
    6667        <xref linkend="alsa"/>,
    6768        <xref linkend="esound"/>,
    … …  
    7677
    7778    <bridgehead renderas="sect4">Optional</bridgehead>
    78     <para role="optional"><xref linkend="ffmpeg"/>, <xref linkend="flac"/>,
    79     <xref linkend="libtheora"/>, <xref linkend="libvorbis"/>,
    80     <xref linkend="sdl"/>, <xref linkend="speex"/>, <xref linkend="libfame"/>,
    81     <xref linkend="libmng"/>, <xref linkend="gnome-vfs"/>,
    82     <xref linkend="libmad"/>
    83     <xref linkend="samba3"/>, <xref linkend="imagemagick"/>,
    84     <ulink url="http://www.directfb.org/">DirectFB</ulink>, <ulink
    85     url="http://sourceforge.net/projects/dvd/">libdvdnav</ulink>,
    86     <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
    87     <ulink
    88     url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
    89     <xref linkend="aalib"/>, <xref linkend="liba52"/>, libdts (now <ulink
    90     url="http://www.videolan.org/developers/libdca.html">libdca</ulink>),
    91     <ulink url="http://www.wavpack.com/">WavPack</ulink>, and
    92     <ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>.</para>
     79    <para role="optional">
     80      <xref linkend="flac"/>,
     81      <xref linkend="libtheora"/>,
     82      <xref linkend="libvorbis"/>,
     83      <xref linkend="sdl"/>,
     84      <xref linkend="speex"/>,
     85      <xref linkend="libfame"/>,
     86      <xref linkend="libmng"/>,
     87      <xref linkend="gnome-vfs"/>,
     88      <xref linkend="libmad"/>
     89      <xref linkend="samba3"/>,
     90      <xref linkend="imagemagick"/>,
     91      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
     92      <ulink url="http://sourceforge.net/projects/dvd/">libdvdnav</ulink>,
     93      <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
     94      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
     95      <xref linkend="aalib"/>,
     96      <xref linkend="liba52"/>,
     97      libdts (now <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>),
     98      <ulink url="http://www.wavpack.com/">WavPack</ulink>, and
     99      <ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>
     100    </para>
    93101
    94102    <para>If the following packages are not found on the system, versions
    … …  
    99107
    100108    <para>The following are needed to build the API documentation:
    101     <ulink
    102     url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink>
     109    <ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink>
    103110    and <ulink url="http://www.xfig.org/">Transfig</ulink></para>
    104111
    … …  
    114121    following commands:</para>
    115122
    116 <screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &amp;&amp;
     123<screen><userinput>./configure --prefix=/usr          \
     124            --with-external-ffmpeg \
     125            --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &amp;&amp;
     126
    117127make</userinput></screen>
    118128
    … …  
    129139    <title>Command Explanations</title>
    130140
    131     <!--<para><option>
    132     sed -i 's/\(inline \)\(_x_is_fourcc\)/__\1int \2/' src/xine-engine/buffer.h
    133     &amp;&amp;</option>: This command enables c++ programs to use the header,
    134     for example in <xref linkend="kdemultimedia"/></para>-->
     141    <para><option>--with-external-ffmpeg</option>:
     142    The internal version of <application>ffmpeg</application> fails.
     143    This switch forces the use of the external version.
     144    </para>
    135145
    136146    <para><option>--docdir=/usr/share/xine-lib-&xine-lib-version;</option>:

  • multimedia/videoutils/ffmpeg.xml

    r35bf1ea refcf979  
    77  <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
    88  <!ENTITY ffmpeg-download-ftp  " ">
    9   <!ENTITY ffmpeg-md5sum        "b4ef1fa6506750569fdb64a0f0a646a8">
    10   <!ENTITY ffmpeg-size          "4.3 MB">
    11   <!ENTITY ffmpeg-buildsize     "178 MB (built with recommended dependency)">
    12   <!ENTITY ffmpeg-time          "2.5 SBU">
     9  <!ENTITY ffmpeg-md5sum        "795058de6fc432aa11271408273a0535">
     10  <!ENTITY ffmpeg-size          "4.7 MB">
     11  <!ENTITY ffmpeg-buildsize     "199 MB">
     12  <!ENTITY ffmpeg-time          "3.2 SBU">
    1313]>
    1414
    … …  
    7272
    7373    <bridgehead renderas="sect4">Recommended</bridgehead>
    74     <para role="recommended"><xref linkend="yasm"/></para>
     74    <para role="recommended">
     75      <xref linkend="yasm"/>
     76    </para>
    7577
    7678    <bridgehead renderas="sect4">Optional</bridgehead>
    77     <para role="optional"><xref linkend="faad2"/>, <xref linkend="lame"/>,
    78     <xref linkend="libtheora"/>, <xref linkend="libvorbis"/>,
    79     <xref linkend="libvpx"/>, <xref linkend="x-window-system"/>,
    80     <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>
    81     (x264 needs <ulink url="http://www.tortall.net/projects/yasm/">yasm</ulink>
    82     unless you configure it with <literal>--disable-asm</literal>),
    83     <xref linkend="xvid"/>,
    84     <ulink url="http://www.penguin.cz/~utx/amr">AMR narrowband
    85     (floating point)</ulink>,
    86     <ulink url="http://www.penguin.cz/~utx/amr">AMR wideband</ulink>,
    87     <xref linkend="faac"/>, <xref linkend="freetype2"/>,
    88     <ulink url="http://libgsm.sourcearchive.com/">GSM</ulink>,
    89     <xref linkend="liba52"/>,
    90     <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
    91     <ulink url="http://svn.mplayerhq.hu/nut/src/trunk/">libnut</ulink>
    92     (SVN checkout),
    93     <ulink url="http://sourceforge.net/projects/librtmp">librtmp</ulink>,
    94     <ulink url="http://diracvideo.org/">libschroedinger</ulink>,
    95     <ulink url="http://medialibrary.sourceforge.net/">MediaLibrary</ulink>,
    96     <ulink url="http://www.openjpeg.org">OpenJPEG</ulink>
    97     (<application>FFmpeg</application> includes code for it's own jpeg2000
    98     encoder and decoder which is enabled by default), <xref linkend="speex"/>,
    99     <!-- <xref linkend="tetex"/>, --> <xref linkend="sdl"/> and
    100     <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink>
    101     (to build HTML documentation).</para>
     79    <para role="optional">
     80      <xref linkend="faad2"/>,
     81      <xref linkend="lame"/>,
     82      <xref linkend="libtheora"/>,
     83      <xref linkend="libvorbis"/>,
     84      <xref linkend="libvpx"/>,
     85      <xref linkend="x-window-system"/>,
     86      <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>
     87      <xref linkend="xvid"/>,
     88      <ulink url="http://www.penguin.cz/~utx/amr">AMR narrowband (floating point)</ulink>,
     89      <ulink url="http://www.penguin.cz/~utx/amr">AMR wideband</ulink>,
     90      <xref linkend="faac"/>,
     91      <xref linkend="freetype2"/>,
     92      <ulink url="http://libgsm.sourcearchive.com/">GSM</ulink>,
     93      <xref linkend="liba52"/>,
     94      <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
     95      <ulink url="http://svn.mplayerhq.hu/nut/src/trunk/">libnut</ulink>
     96         (SVN checkout),
     97      <ulink url="http://sourceforge.net/projects/librtmp">librtmp</ulink>,
     98      <ulink url="http://diracvideo.org/">libschroedinger</ulink>,
     99      <ulink url="http://medialibrary.sourceforge.net/">MediaLibrary</ulink>,
     100      <ulink url="http://www.openjpeg.org">OpenJPEG</ulink>
     101        (<application>FFmpeg</application> includes code for it's own jpeg2000
     102        encoder and decoder which is enabled by default),
     103      <xref linkend="speex"/>,
     104      <xref linkend="sdl"/> and
     105      <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink>
     106        (to build HTML documentation).</para>
    102107
    103108    <para condition="html" role="usernotes">User Notes:
    … …  
    141146make install-man &amp;&amp;
    142147mkdir /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
    143 cp ../doc/*.txt /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
    144 texi2html --version &amp;&gt; /dev/null &amp;&amp;
    145 cp doc/*.html /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
     148cp ../doc/*.txt /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
    146149
    147150    <para>If you used <command>doxygen</command> to create the API
Note: See TracChangeset for help on using the changeset viewer.