[blfs-book] r10330 - in trunk/BOOK: multimedia/videoutils networking/textweb

andy at linuxfromscratch.org andy at linuxfromscratch.org
Fri Jun 15 05:01:04 PDT 2012


Author: andy
Date: 2012-06-15 06:00:59 -0600 (Fri, 15 Jun 2012)
New Revision: 10330

Modified:
   trunk/BOOK/multimedia/videoutils/mplayer.xml
   trunk/BOOK/networking/textweb/w3m.xml
Log:
added a note about ffmpeg to the mplayer page

Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml	2012-06-15 11:54:10 UTC (rev 10329)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml	2012-06-15 12:00:59 UTC (rev 10330)
@@ -15,11 +15,11 @@
 
   <!ENTITY mplayer-skin          "clearplayer-0.9">
   <!ENTITY mplayer-skin-download-http
-    "http://www.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
+    "http://www.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.xz">
   <!ENTITY mplayer-skin-download-ftp
-    "ftp://ftp.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
-  <!ENTITY mplayer-skin-md5sum   "df5fd8e51fbc077ddc7b74d83afe1452">
-  <!ENTITY mplayer-skin-size     "64 KB">
+    "ftp://ftp.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.xz">
+  <!ENTITY mplayer-skin-md5sum   "1ebec30229bbf43c0b1353c3c5ceb39b">
+  <!ENTITY mplayer-skin-size     "4 KB">
 ]>
 
 <sect1 id="mplayer" xreflabel="MPlayer-&mplayer-version;">
@@ -143,14 +143,14 @@
     <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
     <para role="optional">
       <xref linkend="aalib"/>,
-      <xref linkend="libpng"/>,
+      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
+      <xref linkend="giflib"/>,
+      <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
       <xref linkend="libjpeg"/>,
       <xref linkend="libmng"/>,
-      <xref linkend="giflib"/>,
-      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-      <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
-      <ulink url="http://www.svgalib.org/">SVGAlib</ulink> and
-      <xref linkend="openjpeg"/>
+      <xref linkend="libpng"/>,
+      <xref linkend="openjpeg"/> and
+      <ulink url="http://www.svgalib.org/">SVGAlib</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional CODECs</bridgehead>
@@ -167,7 +167,6 @@
       <xref linkend="xvid"/>,
       <xref linkend="libvpx"/>,
       <xref linkend="lame"/>,
-      <ulink url="ftp://ftp.videolan.org/pub/videolan/vlc/0.8.2/contrib/toolame-02m-beta8.tar.bz2">tooLAME</ulink>,
       <ulink url="http://sourceforge.net/projects/twolame/">TwoLAME</ulink>,
       <ulink url="https://launchpad.net/libgsm">libgsm</ulink>,
       <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
@@ -177,24 +176,23 @@
       <ulink url="http://www.broadcom.com/support/crystal_hd/">CrystalHD</ulink>,
       <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>,
       <ulink url="http://diracvideo.org/download/dirac-research/">Dirac</ulink>,
-      <ulink url="http://diracvideo.org/download/schroedinger/">Schroedinger</ulink>,
+      <ulink url="http://diracvideo.org/download/schroedinger/">Schroedinger</ulink> and
       <ulink url="http://wiki.multimedia.cx/index.php?title=NUT">libnut</ulink>
-      <!-- MPlayer can only use an internal version of this at the moment
-      <xref linkend="ffmpeg"/> -->
     </para>
 
     <bridgehead renderas="sect4">Optional Miscellaneous Dependencies</bridgehead>
     <para role="optional">
+      <ulink url="http://cihar.com/software/enca/">Enca</ulink>,
+      <xref linkend="ffmpeg"/>,
       <xref linkend="fontconfig"/>,
       <xref linkend="freetype2"/>,
       <xref linkend="fribidi"/>,
-      <xref linkend="unrar"/>,
       <xref linkend="gtk2"/> (required for the GUI),
-      <ulink url="http://cihar.com/software/enca/">Enca</ulink>,
       <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
       <ulink url="http://sourceforge.net/projects/bs2b/">libbs2b</ulink>,
       <ulink url="http://www.lirc.org/">LIRC</ulink> and
       <ulink url="http://www.dolda2000.com/~fredrik/lirccd/">LIRC Client Daemon</ulink>,
+      <xref linkend="unrar"/>,
       <xref linkend="libxslt"/> (required to build the HTML documentation),
       <xref linkend="DocBook"/> (required to build the HTML documentation) and
       <xref linkend="docbook-xsl"/> (required to build the HTML documentation)
@@ -285,7 +283,7 @@
       </para>
 
 <screen role="root"><userinput>tar -xvf ../&mplayer-skin;.tar.xz \
-    -C /usr/share/mplayer/skins &&
+       -C /usr/share/mplayer/skins &&
 ln -sfv clearplayer /usr/share/mplayer/skins/default</userinput></screen>
     </sect3>
   </sect2>
@@ -302,6 +300,17 @@
       <parameter>--enable-menu</parameter>: This option is set to enable the
       on-screen display.
     </para>
+
+    <para>
+      <option>--disable-ffmpeg_a</option>: You can use this option if you have
+      installed <xref linkend="ffmpeg"/>. MPlayer includes a copy of the FFmpeg
+      source and without this option it will statically compile the included
+      version of FFmpeg into itself. Dynamically linking to a system installed
+      FFmpeg makes MPlayer and Mencoder about 9MB smaller. If MPlayer is crashy
+      or unstable linked to a system installed FFmpeg, try recompiling MPlayer
+      without this option (it is always more thoroughly tested with the included
+      FFmpeg).
+    </para>
   </sect2>
 
   <sect2 role="configuration">

Modified: trunk/BOOK/networking/textweb/w3m.xml
===================================================================
--- trunk/BOOK/networking/textweb/w3m.xml	2012-06-15 11:54:10 UTC (rev 10329)
+++ trunk/BOOK/networking/textweb/w3m.xml	2012-06-15 12:00:59 UTC (rev 10330)
@@ -56,6 +56,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/w3m-&w3m-version;-bdwgc72-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">W3m Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -85,7 +95,8 @@
     <para>Install <application>w3m</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -i 's/file_handle/file_foo/' istream.{c,h} &&
+<screen><userinput>patch -p1 < ../w3m-&w3m-version;-bdwgc72-1.patch &&
+sed -i 's/file_handle/file_foo/' istream.{c,h} &&
 sed -i 's#gdk-pixbuf-xlib-2.0#& x11#' configure &&
 ./configure --prefix=/usr --sysconfdir=/etc &&
 make</userinput></screen>
@@ -105,6 +116,11 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>patch -p1 < ../w3m-&w3m-version;-bdwgc72-1.patch</command>:
+      This patch fixes compiling w3m with GC-7.2 installed.
+    </para>
+
     <para><command>sed -i 's/file_handle/file_foo/' istream.{c,h}</command>:
     This sed renames the file_handle function to avoid a clash with a glibc
     function that has the same name, defined in




More information about the blfs-book mailing list