Author: fernando
Date: Thu Jan 2 05:52:37 2014
New Revision: 12505
Log:
Fix FFmpeg-2.1.1 to build with FreeType-2.5.x.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/videoutils/ffmpeg.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Wed Jan 1 14:22:48 2014 (r12504)
+++ trunk/BOOK/general.ent Thu Jan 2 05:52:37 2014 (r12505)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "01"> <!-- Always 2 digits -->
+<!ENTITY day "02"> <!-- Always 2 digits -->
<!ENTITY month "01"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "January 1st, &year;">
+<!ENTITY releasedate "January 2nd, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!--
version|testing|unstable|development] -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Wed Jan 1 14:22:48
2014 (r12504)
+++ trunk/BOOK/introduction/welcome/changelog.xml Thu Jan 2 05:52:37
2014 (r12505)
@@ -44,6 +44,16 @@
-->
<listitem>
+ <para>January 2nd, 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[fernando] - Fix FFmpeg-2.1.1 to build with FreeType-2.5.x.
+ Fixes <ulink url="&blfs-ticket-root;4512">#4512</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>January 1st, 2014</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml Wed Jan 1 14:22:48 2014
(r12504)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml Thu Jan 2 05:52:37 2014
(r12505)
@@ -80,6 +80,16 @@
</listitem>
</itemizedlist>
+ <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>
+ Required patch (in case you build with freetype support):
+ <ulink url="&patch-root;/ffmpeg-&ffmpeg-version;freetype-1.patch"/>
+ </para>
+ </listitem>
+ </itemizedlist>
+
<bridgehead renderas="sect3">FFmpeg Dependencies</bridgehead>
<bridgehead renderas="sect4">Recommended</bridgehead>
@@ -152,13 +162,20 @@
<sect2 role="installation">
<title>Installation of FFmpeg</title>
- <para>
+<!--<para>
If <application>Xorg</application> is installed in a prefix other
than <filename class='directory'>/usr</filename>, the build will fail.
Fix
this by issuing the following command:
</para>
<screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
+-->
+ <para>
+ In case you are building with freetype support (see "Command
+ Explanations", below), apply this patch:
+ </para>
+
+<screen><userinput>patch -Np1 -i
../ffmpeg-&ffmpeg-version;freetype-1.patch</userinput></screen>
<para>
Install <application>FFmpeg</application> by running the following
@@ -262,6 +279,11 @@
</para>
<para>
+ <option>--enable-libfreetype</option>: Enables
+ <application>Freetype</application> support.
+ </para>
+
+ <para>
<parameter>--enable-gpl</parameter>: Enables the use of GPL code and
permits support for postprocessing, swscale and many other features.
</para>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
