Author: fernando
Date: Sat Oct 4 12:58:39 2014
New Revision: 14489
Log:
Update to ffmpeg-2.4.1.
VLC-2.1.5 and Transcode-1.1.7: fix build with ffmpeg-2.4.1. Thanks Armin.
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/videoutils/ffmpeg.xml
trunk/BOOK/multimedia/videoutils/transcode.xml
trunk/BOOK/multimedia/videoutils/vlc.xml
trunk/BOOK/packages.ent
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Oct 4 05:02:07
2014 (r14488)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sat Oct 4 12:58:39
2014 (r14489)
@@ -48,6 +48,14 @@
<para>October 4th, 2014</para>
<itemizedlist>
<listitem>
+ <para>[fernando] - VLC-2.1.5 and Transcode-1.1.7: fix build with
+ ffmpeg-2.4.1. Thanks Armin.</para>
+ </listitem>
+ <listitem>
+ <para>[fernando] - Update to ffmpeg-2.4.1. Fixes
+ <ulink url="&blfs-ticket-root;5513">#5513</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[fernando] - Update to samba-4.1.12. Fixes
<ulink url="&blfs-ticket-root;5485">#5485</ulink>.</para>
</listitem>
Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml Sat Oct 4 05:02:07 2014
(r14488)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml Sat Oct 4 12:58:39 2014
(r14489)
@@ -6,10 +6,10 @@
<!ENTITY ffmpeg-download-http
"http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2";>
<!ENTITY ffmpeg-download-ftp " ">
- <!ENTITY ffmpeg-md5sum "72361d3b8717b6db3ad2b9da8df7af5e">
- <!ENTITY ffmpeg-size "7.2 MB">
- <!ENTITY ffmpeg-buildsize "128 MB (additional 857 MB for docs and 1871
MB to run the FATE tests)">
- <!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)">
+ <!ENTITY ffmpeg-md5sum "c36caa8d29b3677dcb7bd8c546890c9d">
+ <!ENTITY ffmpeg-size "7.1 MB">
+ <!ENTITY ffmpeg-buildsize "130 MB (additional 870 MB for docs and 1903
MB to run the FATE tests)">
+ <!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)">
]>
<sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@@ -140,8 +140,7 @@
<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>,
<ulink url="http://xavs.sourceforge.net/";>libxavs</ulink> (SVN checkout),
- <ulink url="http://kcat.strangesoft.net/openal-releases/";>OpenAL</ulink>,
- <ulink url="http://www.nongnu.org/texi2html";>texi2html</ulink> (to build
HTML documentation), and
+ <ulink
url="http://kcat.strangesoft.net/openal-releases/";>OpenAL</ulink>, and
<ulink url="http://www.videolan.org/developers/x265.html";>x265
(H.265/MPEG-H HEVC)</ulink>
</para>
@@ -181,18 +180,15 @@
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
- --enable-x11grab &&
+ --enable-x11grab \
+ --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &&
make &&
gcc tools/qt-faststart.c -o tools/qt-faststart</userinput></screen>
<!--
unset LIBRARY_PATH</userinput></screen>-->
<para>
- HTML documentation was built in the previous step if
- <ulink url="http://www.nongnu.org/texi2html";>texi2html</ulink> is
- installed. If the HTML was built (check for any
- <filename class="extension">.html</filename> files in the
- <filename class="directory">doc</filename> directory) and you have
+ HTML documentation was built in the previous step. If you have
<xref linkend="texlive"/> installed and wish to build PDF and
Postscript versions of the documentation, issue the following commands:
</para>
@@ -221,7 +217,7 @@
To properly test the installation you must have <xref linkend="rsync"/>
installed and follow the instructions for the
<ulink url="http://www.ffmpeg.org/fate.html";>
- FFmpeg Automated Testing Environment</ulink> (FATE). First, about 872 MB
+ FFmpeg Automated Testing Environment</ulink> (FATE). First, about 879 MB
of sample files used to run FATE are downloaded with the command:
</para>
@@ -238,7 +234,7 @@
repository. Now, the download size and time are drastically reduced.
Estimated values in "Package Information" do not include the download
SBU. Next, FATE is executed, with the commands (you obtain a number of
- tests greater than 1900):
+ tests greater than 2000):
</para>
<screen><userinput>make fate SAMPLES=fate-suite/ | tee ../fate.log &&
@@ -250,16 +246,19 @@
<screen role="root"><userinput>make install &&
install -v -m755 tools/qt-faststart /usr/bin &&
-install -v -m755 -d /usr/share/doc/ffmpeg &&
install -v -m644 doc/*.txt \
- /usr/share/doc/ffmpeg</userinput></screen>
+ /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
<para>
- If HTML documentation was built, issue the following command to install
it:
+ If PDF and Postscript documentations were built, issue the following
+ commands, as the <systemitem class="username">root</systemitem> user, to
+ install them:
</para>
-<screen role="root"><userinput>install -v -m644 doc/*.html \
- /usr/share/doc/ffmpeg</userinput></screen>
+<screen role="root"><userinput>install -v -m644 doc/*. pdf \
+ /usr/share/doc/ffmpeg-&ffmpeg-version; &&
+install -v -m644 doc/*.ps \
+ /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
<para>
If you used <command>doxygen</command> to create the API documentation,
@@ -267,10 +266,10 @@
as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api
&&
-cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg/api &&
-find /usr/share/doc/ffmpeg/api -type f -exec chmod -c 0644 "{}" ";" &&
-find /usr/share/doc/ffmpeg/api -type d -exec chmod -c 0755 "{}"
";"</userinput></screen>
+<screen role="root"><userinput>install -v -m755 -d
/usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
+cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api
&&
+find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type f -exec chmod -c 0644
"{}" ";" &&
+find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type d -exec chmod -c 0755
"{}" ";"</userinput></screen>
</sect2>
@@ -444,7 +443,7 @@
/usr/include/libswresample
/usr/include/libswscale,
/usr/share/ffmpeg, and
- /usr/share/doc/ffmpeg
+ /usr/share/doc/ffmpeg-&ffmpeg-version;
</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/multimedia/videoutils/transcode.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/transcode.xml Sat Oct 4 05:02:07
2014 (r14488)
+++ trunk/BOOK/multimedia/videoutils/transcode.xml Sat Oct 4 12:58:39
2014 (r14489)
@@ -163,7 +163,11 @@
<screen><userinput>sed -i 's|doc/transcode|&-$(PACKAGE_VERSION)|' \
$(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &&
-patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch &&
+sed -i "s:av_close_input_file:avformat_close_input:g" \
+ import/probe_ffmpeg.c &&
+
+patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch
&&
+&transcode-version;
./configure --prefix=/usr \
--enable-alsa \
--enable-libmpeg2 &&
@@ -194,6 +198,11 @@
</para>
<para>
+ <command>sed ... import/probe_ffmpeg.c</command>: This sed fixes
+ compilation with <application>ffmpeg</application> 2.4.
+ </para>
+
+ <para>
Support for most of the dependency packages requires using
options passed to the <command>configure</command> script. View the
<filename>INSTALL</filename> file and the output from
Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml Sat Oct 4 05:02:07 2014
(r14488)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml Sat Oct 4 12:58:39 2014
(r14489)
@@ -215,6 +215,7 @@
<screen><userinput>sed -i 's:libsmbclient.h:samba-4.0/&:'
modules/access/smb.c &&
./bootstrap &&
+sed "s:< 56:< 57:g" -i configure &&
./configure --prefix=/usr &&
make</userinput></screen>
@@ -255,6 +256,11 @@
</para>
<para>
+ <command>sed ... configure</command>: This sed fixes compilation with
+ <application>ffmpeg</application> 2.4.
+ </para>
+
+ <para>
<option>--disable-lua</option>: Use this switch if you don't have
<application>Lua</application> installed.
</para>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Sat Oct 4 05:02:07 2014 (r14488)
+++ trunk/BOOK/packages.ent Sat Oct 4 12:58:39 2014 (r14489)
@@ -688,7 +688,7 @@
<!ENTITY pnmixer-version "0.5.1">
<!-- Chapter 40 -->
-<!ENTITY ffmpeg-version "2.3.3">
+<!ENTITY ffmpeg-version "2.4.1">
<!ENTITY mplayer-version "1.1.1">
<!ENTITY xine-ui-version "0.99.9">
<!ENTITY transcode-version "1.1.7">
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
