Changeset 12cb8c2d for multimedia/videoutils/ffmpeg.xml

Timestamp:

08/24/2014 01:24:04 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

528112b

Parents:

13832d9

Message:

Checks and fixes.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14029 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• multimedia/videoutils/ffmpeg.xml (modified) (7 diffs)

multimedia/videoutils/ffmpeg.xml

@@ -42 +42 @@
     </para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82 +82 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="yasm"/>,
-      <xref linkend="libass"/>,
       <xref linkend="fdk-aac"/>,
       <xref linkend="lame"/>,
+      <xref linkend="libass"/>,
       <xref linkend="libtheora"/>,
       <xref linkend="libvorbis"/>,
-      <xref linkend="libvpx"/>, and
+      <xref linkend="libvpx"/>,
+      <xref linkend="yasm"/>, and
       <xref linkend="x264"/>
     </para>
@@ -94 +94 @@
     <bridgehead renderas="sect4">Recommended for desktop use</bridgehead>
     <para>
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="libva"/>,
+      <xref linkend="libvdpau"/> (with the corresponding driver package),
+      <xref linkend="sdl"/>, and
       <xref linkend="x-window-system"/>,
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="sdl"/>,
-      <xref linkend="libva"/> and
-      <xref linkend="libvdpau"/> (with the corresponding driver package)
     </para>
 
@@ -105 +105 @@
       <xref linkend="faac"/>,
       <xref linkend="freetype2"/>,
+      <xref linkend="fontconfig"/>,
+      <xref linkend="gnutls"/>,
       <xref linkend="libwebp"/>,
       <xref linkend="openjpeg"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="opus"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="speex"/>,
       <xref linkend="xvid"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="fontconfig"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="opus"/>,
-<!--  <ulink url="http://www.piksel.org/frei0r">frei0r</ulink>,-->
+      <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
       <ulink url="https://files.dyne.org/frei0r/snapshots/">frei0r</ulink>,
-      <ulink url="http://xhevc.com/en/hevc/decoder/download.jsp">HEVC/H.265</ulink>,
+      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
       <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
-      <ulink url="http://www.libssh.org/">libssh</ulink>,
-      <ulink url="http://zapping.sourceforge.net/ZVBI/">ZVBI</ulink>,
       <ulink url="http://tipok.org.ua/node/17">libaacplus</ulink>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://caca.zoy.org/">libcaca</ulink>,
+      <ulink url="http://ftp.gnu.org/pub/gnu/libcdio/">libcdio</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/libdc1394">libdc1394</ulink>,
-      <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
-      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
       <ulink url="https://ieee1394.wiki.kernel.org/index.php/Libraries">libiec61883</ulink>,
       <ulink url="https://github.com/dekkers/libilbc">libilbc</ulink>,
       <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
       <ulink url="https://github.com/Distrotech/libnut">libnut</ulink> (Git checkout),
+      <ulink url="http://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
+      <ulink url="http://www.libssh.org/">libssh</ulink>,
+      <ulink url="http://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),
+      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
       <ulink url="http://opencv.org/">OpenCV</ulink>,
-      <ulink url="http://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
       <ulink url="http://diracvideo.org/">Schroedinger</ulink>,
+      <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink> (to build HTML documentation),
       <ulink url="http://www.twolame.org/">TwoLAME</ulink>,
       <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
       <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://www.videolan.org/developers/x265.html">x265 (H.265/MPEG-H HEVC)</ulink>
+      <ulink url="http://www.videolan.org/developers/x265.html">x265 (H.265/MPEG-H HEVC)</ulink>, and
+      <ulink url="http://zapping.sourceforge.net/ZVBI/">ZVBI</ulink>
     </para>
 
@@ -154 +152 @@
     <title>Installation of FFmpeg</title>
 
-<!--<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>
       Install <application>FFmpeg</application> by running the following
@@ -185 +175 @@
 make &amp;&amp;
 gcc tools/qt-faststart.c -o tools/qt-faststart</userinput></screen>
-<!--
-unset LIBRARY_PATH</userinput></screen>-->
 
     <para>
@@ -293 +281 @@
       <command>find ... ";"</command>: Fix permissions of documentation files
       and directories.
-    </para>
-
-    <para>
-      <option>--enable-libfreetype</option>: Enables 
-      <application>Freetype</application> support.
     </para>