Changeset 791213b


Ignore:
Timestamp:
10/04/2014 07:58:39 PM (10 years ago)
Author:
Fernando de Oliveira <fernando@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, 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, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
9dad1d4
Parents:
b83be3d
Message:

Update to ffmpeg-2.4.1.
VLC-2.1.5 and Transcode-1.1.7: fix build with ffmpeg-2.4.1. Thanks Armin.

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

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • introduction/welcome/changelog.xml

    rb83be3d r791213b  
    4949      <itemizedlist>
    5050        <listitem>
     51          <para>[fernando] - VLC-2.1.5 and Transcode-1.1.7: fix build with
     52          ffmpeg-2.4.1. Thanks Armin.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[fernando] - Update to ffmpeg-2.4.1.  Fixes
     56          <ulink url="&blfs-ticket-root;5513">#5513</ulink>.</para>
     57        </listitem>
     58        <listitem>
    5159          <para>[fernando] - Update to samba-4.1.12.  Fixes
    5260          <ulink url="&blfs-ticket-root;5485">#5485</ulink>.</para>

  • multimedia/videoutils/ffmpeg.xml

    rb83be3d r791213b  
    77  <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
    88  <!ENTITY ffmpeg-download-ftp  " ">
    9   <!ENTITY ffmpeg-md5sum        "72361d3b8717b6db3ad2b9da8df7af5e">
    10   <!ENTITY ffmpeg-size          "7.2 MB">
    11   <!ENTITY ffmpeg-buildsize     "128 MB (additional 857 MB for docs and 1871 MB to run the FATE tests)">
    12   <!ENTITY ffmpeg-time          "3.3 SBU (additional 0.9 SBU for docs and 4.5 SBU to run the FATE tests, after sample files are downloaded)">
     9  <!ENTITY ffmpeg-md5sum        "c36caa8d29b3677dcb7bd8c546890c9d">
     10  <!ENTITY ffmpeg-size          "7.1 MB">
     11  <!ENTITY ffmpeg-buildsize     "130 MB (additional 870 MB for docs and 1903 MB to run the FATE tests)">
     12  <!ENTITY ffmpeg-time          "3.5 SBU (additional 0.9 SBU for docs and 5 SBU to run the FATE tests, after sample files are downloaded)">
    1313]>
    1414
    … …  
    141141      <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>,
    142142      <ulink url="http://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),
    143       <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>,
    144       <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink> (to build HTML documentation), and
     143      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>, and
    145144      <ulink url="http://www.videolan.org/developers/x265.html">x265 (H.265/MPEG-H HEVC)</ulink>
    146145    </para>
    … …  
    182181            --enable-libvpx      \
    183182            --enable-libx264     \
    184             --enable-x11grab     &amp;&amp;
     183            --enable-x11grab     \
     184            --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
    185185make &amp;&amp;
    186186gcc tools/qt-faststart.c -o tools/qt-faststart</userinput></screen>
    … …  
    189189
    190190    <para>
    191       HTML documentation was built in the previous step if
    192       <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink> is
    193       installed. If the HTML was built (check for any
    194       <filename class="extension">.html</filename> files in the
    195       <filename class="directory">doc</filename> directory) and you have
     191      HTML documentation was built in the previous step. If  you have
    196192      <xref linkend="texlive"/> installed and wish to build PDF and
    197193      Postscript versions of the documentation, issue the following commands:
    … …  
    222218      installed and follow the instructions for the
    223219      <ulink url="http://www.ffmpeg.org/fate.html">
    224       FFmpeg Automated Testing Environment</ulink> (FATE). First, about 872 MB
     220      FFmpeg Automated Testing Environment</ulink> (FATE). First, about 879 MB
    225221      of sample files used to run FATE are downloaded with the command:
    226222    </para>
    … …  
    239235      Estimated values in "Package Information" do not include the download
    240236      SBU. Next, FATE is executed, with the commands (you obtain a number of
    241       tests greater than 1900):
     237      tests greater than 2000):
    242238    </para>
    243239
    … …  
    251247<screen role="root"><userinput>make install &amp;&amp;
    252248install -v -m755    tools/qt-faststart /usr/bin &amp;&amp;
    253 install -v -m755 -d /usr/share/doc/ffmpeg &amp;&amp;
    254249install -v -m644    doc/*.txt \
    255                     /usr/share/doc/ffmpeg</userinput></screen>
    256 
    257     <para>
    258       If HTML documentation was built, issue the following command to install it:
    259     </para>
    260 
    261 <screen role="root"><userinput>install -v -m644 doc/*.html \
    262                  /usr/share/doc/ffmpeg</userinput></screen>
     250                    /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
     251
     252    <para>
     253      If PDF and Postscript documentations were built, issue the following
     254      commands, as the <systemitem class="username">root</systemitem> user, to
     255      install them:
     256    </para>
     257
     258<screen role="root"><userinput>install -v -m644 doc/*. pdf \
     259                 /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
     260install -v -m644 doc/*.ps   \
     261                 /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
    263262
    264263    <para>
    … …  
    268267    </para>
    269268
    270 <screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api                       &amp;&amp;
    271 cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg/api                    &amp;&amp;
    272 find /usr/share/doc/ffmpeg/api -type f -exec chmod -c 0644 "{}" ";" &amp;&amp;
    273 find /usr/share/doc/ffmpeg/api -type d -exec chmod -c 0755 "{}" ";"</userinput></screen>
     269<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg-&ffmpeg-version;/api                       &amp;&amp;
     270cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api                    &amp;&amp;
     271find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type f -exec chmod -c 0644 "{}" ";" &amp;&amp;
     272find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type d -exec chmod -c 0755 "{}" ";"</userinput></screen>
    274273
    275274  </sect2>
    … …  
    445444          /usr/include/libswscale,
    446445          /usr/share/ffmpeg, and
    447           /usr/share/doc/ffmpeg
     446          /usr/share/doc/ffmpeg-&ffmpeg-version;
    448447        </seg>
    449448      </seglistitem>

  • multimedia/videoutils/transcode.xml

    rb83be3d r791213b  
    164164<screen><userinput>sed -i 's|doc/transcode|&amp;-$(PACKAGE_VERSION)|' \
    165165       $(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &amp;&amp;
    166 patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch &amp;&amp;
     166sed -i "s:av_close_input_file:avformat_close_input:g" \
     167       import/probe_ffmpeg.c                                       &amp;&amp;
     168
     169patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch                   &amp;&amp;
     170&transcode-version;
    167171./configure --prefix=/usr \
    168172            --enable-alsa \
    … …  
    192196    <para>
    193197      <command>sed -i ...</command>: Fixes install location for documentation.
     198    </para>
     199
     200    <para>
     201      <command>sed ... import/probe_ffmpeg.c</command>: This sed fixes
     202      compilation with <application>ffmpeg</application> 2.4.
    194203    </para>
    195204

  • multimedia/videoutils/vlc.xml

    rb83be3d r791213b  
    216216<screen><userinput>sed -i 's:libsmbclient.h:samba-4.0/&amp;:' modules/access/smb.c &amp;&amp;
    217217./bootstrap                                                 &amp;&amp;
     218sed "s:&lt; 56:&lt; 57:g" -i configure                            &amp;&amp;
    218219./configure --prefix=/usr                                   &amp;&amp;
    219220make</userinput></screen>
    … …  
    253254      <command>./bootstrap</command>: This command calls autoreconf to generate
    254255      m4 macros and prepare Makefiles.
     256    </para>
     257
     258    <para>
     259      <command>sed ... configure</command>: This sed fixes compilation with
     260      <application>ffmpeg</application> 2.4.
    255261    </para>
    256262

  • packages.ent

    rb83be3d r791213b  
    689689
    690690<!-- Chapter 40 -->
    691 <!ENTITY ffmpeg-version               "2.3.3">
     691<!ENTITY ffmpeg-version               "2.4.1">
    692692<!ENTITY mplayer-version              "1.1.1">
    693693<!ENTITY xine-ui-version              "0.99.9">
Note: See TracChangeset for help on using the changeset viewer.