Author: bdubbs
Date: 2012-10-07 12:37:39 -0600 (Sun, 07 Oct 2012)
New Revision: 10719
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/graphlib/aalib.xml
trunk/BOOK/general/prog/slang.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/libdriv/audiofile.xml
trunk/BOOK/multimedia/libdriv/esound.xml
trunk/BOOK/multimedia/videoutils/ffmpeg.xml
Log:
Update to ffmpeg-1.0.
Tag some packages for 7.2.
Modified: trunk/BOOK/general/graphlib/aalib.xml
===================================================================
--- trunk/BOOK/general/graphlib/aalib.xml 2012-10-07 09:59:17 UTC (rev
10718)
+++ trunk/BOOK/general/graphlib/aalib.xml 2012-10-07 18:37:39 UTC (rev
10719)
@@ -9,7 +9,7 @@
<!ENTITY aalib-md5sum "9801095c42bba12edebd1902bcf0a990">
<!ENTITY aalib-size "388 KB">
<!ENTITY aalib-buildsize "6.5 MB">
- <!ENTITY aalib-time "0.15 SBU">
+ <!ENTITY aalib-time "0.1 SBU">
]>
<sect1 id="aalib" xreflabel="AAlib-&aalib-version;">
Modified: trunk/BOOK/general/prog/slang.xml
===================================================================
--- trunk/BOOK/general/prog/slang.xml 2012-10-07 09:59:17 UTC (rev 10718)
+++ trunk/BOOK/general/prog/slang.xml 2012-10-07 18:37:39 UTC (rev 10719)
@@ -34,7 +34,7 @@
It provides facilities required by interactive applications such as
display/screen management, keyboard input and keymaps.</para>
- &lfs70_checked;
+ &lfs72_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-10-07 09:59:17 UTC (rev 10718)
+++ trunk/BOOK/general.ent 2012-10-07 18:37:39 UTC (rev 10719)
@@ -876,7 +876,7 @@
<!-- Chapter 40 -->
<!ENTITY dvb-apps-version "2012-06-10">
-<!ENTITY ffmpeg-version "0.11.2">
+<!ENTITY ffmpeg-version "1.0">
<!ENTITY mplayer-version "1.1">
<!ENTITY xine-ui-version "0.99.7">
<!ENTITY transcode-version "1.1.7">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-10-07 09:59:17 UTC
(rev 10718)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-10-07 18:37:39 UTC
(rev 10719)
@@ -47,6 +47,10 @@
<para>October 7th, 2012</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update to ffmpeg-1.0. Fixes
+ <ulink url="&blfs-ticket-root;3583">#3583</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[krejzi] - Empathy 3.6.0.1.</para>
</listitem>
<listitem>
Modified: trunk/BOOK/multimedia/libdriv/audiofile.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/audiofile.xml 2012-10-07 09:59:17 UTC (rev
10718)
+++ trunk/BOOK/multimedia/libdriv/audiofile.xml 2012-10-07 18:37:39 UTC (rev
10719)
@@ -35,7 +35,7 @@
to support basic sound file formats.
</para>
- &lfs71_built;
+ &lfs72_built;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/multimedia/libdriv/esound.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/esound.xml 2012-10-07 09:59:17 UTC (rev
10718)
+++ trunk/BOOK/multimedia/libdriv/esound.xml 2012-10-07 18:37:39 UTC (rev
10719)
@@ -7,9 +7,9 @@
<!ENTITY esound-download-http
"&gnome-download-http;/esound/0.2/esound-&esound-version;.tar.bz2">
<!ENTITY esound-download-ftp
"&gnome-download-ftp;/esound/0.2/esound-&esound-version;.tar.bz2">
<!ENTITY esound-md5sum "8d9aad3d94d15e0d59ba9dc0ea990c6c">
- <!ENTITY esound-size "387 KB">
- <!ENTITY esound-buildsize "5 MB">
- <!ENTITY esound-time "0.1 SBU">
+ <!ENTITY esound-size "392 KB">
+ <!ENTITY esound-buildsize "5.3 MB">
+ <!ENTITY esound-time "0.3 SBU">
]>
<sect1 id="esound" xreflabel="EsounD-&esound-version;">
@@ -33,7 +33,7 @@
the Enlightened Sound Daemon. This is useful for mixing together
several digitized audio streams for playback by a single device.</para>
- &lfs70_checked;
+ &lfs72_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -77,7 +77,7 @@
<para>Install <application>EsounD</application> by running the following
commands:</para>
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &&
+<screen><userinput>LIBS=-lm ./configure --prefix=/usr --sysconfdir=/etc
&&
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -96,6 +96,9 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <para><parameter>LIBS=-lm</parameter>: Make sure the linker uses the math
+ library.</para>
+
<para><parameter>--sysconfdir=/etc</parameter>: This switch puts
configuration files in <filename class="directory">/etc</filename> instead
of <filename class="directory">/usr/etc</filename>.</para>
Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml 2012-10-07 09:59:17 UTC (rev
10718)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml 2012-10-07 18:37:39 UTC (rev
10719)
@@ -7,10 +7,10 @@
<!ENTITY ffmpeg-download-http
"http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2";>
<!ENTITY ffmpeg-download-ftp " ">
- <!ENTITY ffmpeg-md5sum "93c1908022567b321df74db7214da6ac">
- <!ENTITY ffmpeg-size "5.7 MB">
- <!ENTITY ffmpeg-buildsize "244 MB">
- <!ENTITY ffmpeg-time "3.6 SBU">
+ <!ENTITY ffmpeg-md5sum "3ed526cea20c1bffb5a37f7730f710bd">
+ <!ENTITY ffmpeg-size "6.2 MB">
+ <!ENTITY ffmpeg-buildsize "90 MB (plus 805 MB for tests)">
+ <!ENTITY ffmpeg-time "3.2 SBU (plus 2.0 SBU for tests)">
]>
<sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@@ -70,48 +70,41 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
+ <xref linkend="faac"/>,
+ <xref linkend="freetype2"/>,
+ <xref linkend="lame"/>,
+ <xref linkend="libtheora"/>,
+ <xref linkend="libvorbis"/>,
+ <xref linkend="libvpx"/>,
+ <xref linkend="openjpeg"/>,
+ <xref linkend="openssl"/>,
+ <xref linkend="sdl"/>,
+ <xref linkend="speex"/>,
+ <xref linkend="xorg7-lib"/>,
+ <xref linkend="xvid"/>, and
<xref linkend="yasm"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="faad2"/>,
- <xref linkend="lame"/>,
- <xref linkend="libtheora"/>,
- <xref linkend="libvorbis"/>,
- <xref linkend="libvpx"/>,
- <xref linkend="xorg7-lib"/>,
- <ulink url="http://www.videolan.org/developers/x264.html";>x264</ulink>
- <xref linkend="xvid"/>,
+ <xref linkend="gnutls"/>,
+ <ulink url="http://www.videolan.org/developers/x264.html";>x264</ulink>,
<ulink url="http://sourceforge.net/projects/opencore-amr";>OpenCore
AMR</ulink>,
- <xref linkend="faac"/>,
- <xref linkend="freetype2"/>,
<ulink url="http://libgsm.sourcearchive.com/";>GSM</ulink>,
<ulink url="http://sourceforge.net/projects/libdc1394";>libdc1394</ulink>,
- <ulink url="http://svn.mplayerhq.hu/nut/src/trunk/";>libnut</ulink>
- (SVN checkout),
- <ulink url="http://xavs.sourceforge.net/";>libxavs</ulink>
- (SVN checkout),
+ <ulink url="http://svn.mplayerhq.hu/nut/src/trunk/";>libnut</ulink> (SVN
checkout),
+ <ulink url="http://xavs.sourceforge.net/";>libxavs</ulink> (SVN checkout),
<ulink url="http://sourceforge.net/projects/librtmp";>librtmp</ulink>,
<ulink url="http://diracvideo.org/";>libschroedinger</ulink>,
<ulink url="http://medialibrary.sourceforge.net/";>MediaLibrary</ulink>,
- <ulink
- url="http://connect.creativelabs.com/openal/default.aspx";>OpenAL</ulink>,
+ <ulink
url="http://connect.creativelabs.com/openal/default.aspx";>OpenAL</ulink>,
<ulink url="http://tipok.org.ua/node/17";>libaacplus</ulink>,
<ulink url="http://code.google.com/p/libass/";>libass</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/opencvlibrary/";>libopencv</ulink>,
+ <ulink
url="http://sourceforge.net/projects/opencvlibrary/";>libopencv</ulink>,
<ulink
url="http://sourceforge.net/projects/libdc1394/";>libdc1394</ulink>,
- <ulink url="http://linuxtv.org/downloads/v4l-utils/";>libv4l2</ulink>,
- <xref linkend="openjpeg"/>
- (<application>FFmpeg</application> includes code for its own jpeg2000
- encoder and decoder, which is enabled by default),
- <xref linkend="speex"/>,
- <xref linkend="gnutls"/>,
- <xref linkend="openssl"/>,
- <xref linkend="sdl"/> and
+ <ulink url="http://linuxtv.org/downloads/v4l-utils/";>libv4l2</ulink>, and
<ulink url="http://www.nongnu.org/texi2html";>texi2html</ulink>
(to build HTML documentation).</para>
@@ -133,42 +126,66 @@
<sect2 role="installation">
<title>Installation of FFmpeg</title>
+ <para>If you have not installed <application>Xorg</application> in
+ <filename class='directory'>/usr</filename>, tell
<filename>configure</filename>
+ where to find it:</para>
+
+<screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
+
<para>
Install <application>FFmpeg</application> by running the following
commands:
</para>
-<screen><userinput>./configure --prefix=/usr \
- --enable-gpl \
- --enable-shared \
- --disable-static &&
+<screen><userinput>./configure --prefix=/usr \
+ --disable-debug \
+ --enable-shared \
+ --disable-static \
+ --enable-gpl \
+ --enable-x11grab \
+ --enable-postproc \
+ --enable-version3 \
+ --enable-nonfree \
+ --enable-libfaac \
+ --enable-libfreetype \
+ --enable-libmp3lame \
+ --enable-libopenjpeg \
+ --enable-libspeex \
+ --enable-libtheora \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libxvid \
+ --enable-libpulse \
+ --enable-openssl &&
make</userinput></screen>
+<!--
<para>To convert the docs to html use the following commands:</para>
<screen><userinput>sed -i '/@top/d;/ignore$/d' doc/*.texi
&&
sed -i '/@include avoptions/d' doc/avtools-common-opts.texi &&
for DOC in doc/*.texi; do
- makeinfo --html --no-split -o ${DOC%texi}html ${DOC}
+ makeinfo - -html - -no-split -o ${DOC%texi}html ${DOC}
done</userinput></screen>
+-->
<para>
If you have <xref linkend="doxygen"/> installed and wish to create the
API
- documentation (takes about 150 MB of space), issue the command
+ documentation (takes about 444 MB of space, 26 SBU), issue the command
<command>doxygen</command>.
</para>
- <para>This package does not come with a test suite.</para>
-
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
-<screen role="root"><userinput>make install &&
-make install-man &&
-mkdir -p /usr/share/doc/ffmpeg-&ffmpeg-version; &&
-cp -v doc/*.{html,txt}
/usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
+<screen role="root"><userinput>make install
&&
+mkdir -p /usr/share/doc/ffmpeg-&ffmpeg-version; &&
+cp -v doc/*.txt /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
+ <para>The tests, if desired, need to be run after installation.
+ To test the package, run <command>make check</command>.</para>
+
<para>
The <application>FFmpeg</application> source contains a tool called
<command>qt-faststart</command> that can modify QuickTime formatted
movies
@@ -188,8 +205,8 @@
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>mkdir -p
/usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
-cp -v doxy/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api</userinput></screen>
+<screen role="root"><userinput>mkdir -p
/usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
+cp -av doxy/*
/usr/share/doc/ffmpeg-&ffmpeg-version;/api</userinput></screen>
</sect2>
<sect2 role="commands">
@@ -222,16 +239,6 @@
from linking FFmpeg to another library.
</para>
- <para>
- <command>sed -i '/@top/d;/ignore$/d' *.texi</command> and
- <command>sed -i '/@include avoptions/d'
avtools-common-opts.texi</command>:
- these seds work around problems with the .texi files.
- </para>
-
- <para>
- <command>makeinfo --html --no-split -o ${DOC%texi}html ${DOC}</command>:
- this converts the .texi files into html.
- </para>
</sect2>
<sect2 role="configuration">
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
