r7041 - in trunk/BOOK: . introduction/welcome multimedia/videoutils

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Aug 11 06:37:47 PDT 2007


Author: randy
Date: 2007-08-11 07:37:47 -0600 (Sat, 11 Aug 2007)
New Revision: 7041

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/videoutils/mplayer.xml
Log:
Updated to MPlayer-1.0rc1

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2007-08-11 03:02:17 UTC (rev 7040)
+++ trunk/BOOK/general.ent	2007-08-11 13:37:47 UTC (rev 7041)
@@ -654,7 +654,7 @@
 <!-- Chapter 40 -->
 <!ENTITY ffmpeg-version               "svn_20070606">
 <!ENTITY avifile-version              "0.7.45">
-<!ENTITY mplayer-version              "1.0pre7try2">
+<!ENTITY mplayer-version              "1.0rc1">
 <!ENTITY xine-ui-version              "0.99.4">
 <!ENTITY transcode-version            "1.0.2">
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2007-08-11 03:02:17 UTC (rev 7040)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2007-08-11 13:37:47 UTC (rev 7041)
@@ -45,6 +45,9 @@
       <para>August 11th, 2007</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to MPlayer-1.0rc1.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to FFmpeg-svn_20070606 (svn checkout).</para>
         </listitem>
       </itemizedlist>

Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml	2007-08-11 03:02:17 UTC (rev 7040)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml	2007-08-11 13:37:47 UTC (rev 7041)
@@ -6,10 +6,10 @@
 
   <!ENTITY mplayer-download-http "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.bz2">
   <!ENTITY mplayer-download-ftp  "ftp://ftp1.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.bz2">
-  <!ENTITY mplayer-md5sum        "aaca4fd327176c1afb463f0f047ef6f4">
-  <!ENTITY mplayer-size          "6.6 MB">
-  <!ENTITY mplayer-buildsize     "97 MB (additional 22 MB for essential CODECs)">
-  <!ENTITY mplayer-time          "2.0 SBU">
+  <!ENTITY mplayer-md5sum        "18c05d88e22c3b815a43ca8d7152ccdc">
+  <!ENTITY mplayer-size          "8.3 MB">
+  <!ENTITY mplayer-buildsize     "133-250 MB (additional 22 MB for essential CODECs)">
+  <!ENTITY mplayer-time          "1.2-2.5 SBU (depends on how FFmpeg is linked in)">
 
   <!ENTITY mplayer-codec         "essential-20061022.tar.bz2">
   <!ENTITY mplayer-codec-md5sum  "abcf4a3abc16cf88c9df7e0a77e9b941">
@@ -42,12 +42,13 @@
   <sect2 role="package">
     <title>Introduction to MPlayer</title>
 
-    <para>The <application>MPlayer</application> package contains an audio/video
-    player controlled via the command line or a graphical interface which is able
-    to play almost every popular audio and video file format and CODEC
-    (COder/DECoder, also COmpressor/DECompressor). With supported video
-    hardware and additional drivers, <application>MPlayer</application> can play
-    video files without an <application>X Window System</application> installed.</para>
+    <para>The <application>MPlayer</application> package contains an
+    audio/video player controlled via the command line or graphical interface
+    which is able to play almost every popular audio and video file format and
+    CODEC (COder/DECoder, also COmpressor/DECompressor). With supported video
+    hardware and additional drivers, <application>MPlayer</application> can
+    play video files without an <application>X Window System</application>
+    installed.</para>
 
     <para>For <application>MPlayer</application> general information and
     available features, including a full list of file formats, CODECs and
@@ -83,24 +84,12 @@
       <title>Patches</title>
       <listitem>
         <para>Required Patch: <ulink
-        url="&patch-root;/MPlayer-&mplayer-version;-gcc4-1.patch"/></para>
+        url="http://www.mplayerhq.hu/MPlayer/patches/cddb_fix_20070605.diff"/></para>
       </listitem>
       <listitem>
         <para>Required Patch: <ulink
-        url="&patch-root;/MPlayer-&mplayer-version;-round_function_fix-1.patch"/></para>
+        url="&patch-root;/MPlayer-&mplayer-version;-ext_ffmpeg-1.patch"/></para>
       </listitem>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/MPlayer-&mplayer-version;-x264_fixes-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/MPlayer-&mplayer-version;-jack_fixes-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required Patch (for fbdev driver support): <ulink
-        url="&patch-root;/MPlayer-&mplayer-version;-kernel_2.6-1.patch"/></para>
-      </listitem>
     </itemizedlist>
 
     <itemizedlist spacing='compact'>
@@ -161,92 +150,88 @@
       </listitem>
     </itemizedlist>
 
-    <note>
-      <para>The CODECs, skins and fonts are not required to
-      build and use <application>MPlayer</application>.</para>
-    </note>
+    <para>The CODECs, skins and fonts are not required to
+    build and use <application>MPlayer</application>.</para>
 
     <bridgehead renderas="sect3">MPlayer Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional Input Drivers and Libraries</bridgehead>
     <para role="optional"><xref linkend="cdparanoia"/>,
+    <ulink url="http://www.metzlerbros.org/dvb/">DVB</ulink>,
+    <ulink url="http://www.linuxtv.org/">DVB drivers</ulink>,
+    <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
     <xref linkend="libdv"/>,
-    <xref linkend="libdvdread"/> (must disable internal mpdvdkit support),
-    <xref linkend="samba3"/>,
+    <xref linkend="libdvdread"/>,
     <ulink url="http://www.live555.com/mplayer/">LIVE555 Streaming Media</ulink>,
-    <ulink url="http://armory.nicewarrior.org/projects/vstream-client/">TiVo vstream client</ulink>,
+    <xref linkend="samba3"/>, and
+    <ulink url="http://armory.nicewarrior.org/projects/vstream-client/">TiVo vstream client</ulink></para>
     <!-- Disabling for now as only internal Matroska support is available
     <ulink url="http://www.matroska.org/downloads/linux.html">libmatroska</ulink>
     (requires
     <ulink url="http://dl.matroska.org/downloads/libebml/">libebml</ulink>), -->
-    <ulink url="http://www.linuxtv.org/">DVB drivers</ulink>, and
-    <ulink url="http://www.metzlerbros.org/dvb/">DVB</ulink></para>
 
     <bridgehead renderas="sect4">Optional Audio Output Drivers and Libraries</bridgehead>
     <para role="optional"><xref linkend="alsa"/>,
     <xref linkend="arts"/>,
     <xref linkend="esound"/>,
+    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>,
+    <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
     <xref linkend="nas"/>,
-    <xref linkend="sdl"/> (also used for video output),
-    <xref linkend="xmms"/>,
-    <!-- MPlayer is not yet converted from PolyPAudio
+    <ulink url="http://openal.org/">OpenAL</ulink>,
     <ulink url="http://pulseaudio.org/">PulseAudio</ulink>,
-    -->
-    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>,
-    <ulink url="http://openal.org/">OpenAL</ulink>, and
-    <ulink url="http://www.ladspa.org/">LADSPA</ulink></para>
+    <xref linkend="sdl"/> (also used for video output), and
+    <xref linkend="xmms"/></para>
 
     <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
-    <para role="optional"><xref linkend="x-window-system"/>,
-    <xref linkend="libpng"/>,
-    <xref linkend="libjpeg"/>,
-    <!-- <xref linkend="libungif"/> or -->
-    <xref linkend="giflib"/>,
-    <xref linkend="GTK"/>,
-    <xref linkend="gtk2"/>,
-    <xref linkend="freetype2"/>,
+    <para role="optional"><xref linkend="aalib"/>,
+    <ulink url="http://www.directfb.org/">DirectFB</ulink>,
+    <ulink url="http://trific.ath.cx/software/enca/">Enca</ulink>,
     <xref linkend="fontconfig"/>,
-    <xref linkend="aalib"/>,
+    <xref linkend="freetype2"/>,
     <xref linkend="fribidi"/>,
-    <ulink url="http://sourceforge.net/projects/unichrome/">XvMC Wrapper</ulink>
-    (only if you have XFree86 installed),
-    <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-    <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
     <ulink url="http://www.ggi-project.org/">GGI</ulink>,
-    <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>, and
-    <ulink url="http://trific.ath.cx/software/enca/">Enca</ulink></para>
+    <xref linkend="giflib"/>,
+    <xref linkend="gtk2"/> or
+    <xref linkend="GTK"/>,
+    <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
+    <xref linkend="libjpeg"/>,
+    <xref linkend="libpng"/>,
+    <ulink url="http://maemo.org/">maemo</ulink>,
+    <ulink url="http://vidix.sourceforge.net/">VIDIX</ulink>,
+    <xref linkend="x-window-system"/>, and
+    <ulink url="http://sourceforge.net/projects/unichrome/">XvMC Wrapper</ulink>
+      (only needed if you have XFree86 installed)</para>
 
     <bridgehead renderas="sect4">Optional CODECs</bridgehead>
-    <para role="optional"><xref linkend="libvorbis"/>,
-    <xref linkend="xvid"/>,
-    <xref linkend="LZO"/> (requires <ulink
-    url="http://www.oberhumer.com/opensource/lzo/download/LZO-v1/lzo-1.08.tar.gz">
-    Version 1</ulink>),
-    <xref linkend="libmad"/>,
+    <para role="optional"><ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-7/26_series/26104-700.zip">AMR
+      narrowband (floating point)</ulink> or
+    <ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-7/26_series/26073-700.zip">AMR
+      naarrowband (fixed point)</ulink>,
+    <ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-7/26_series/26204-700.zip">
+      AMR wideband</ulink>,
+      <!-- Dead link <ulink url="http://www.divx.com/divx/linux/">DivX</ulink>, i-->
+    <ulink url="http://sourceforge.net/projects/faac">FAAC</ulink>,
+    <ulink url="http://sourceforge.net/projects/faac">FAAD2</ulink> (must disable the internal version),
+    <xref linkend="ffmpeg"/>,
     <xref linkend="lame"/>,
+    <ulink url="http://developers.videolan.org/libdca.html">libdca</ulink>,
     <xref linkend="libfame"/>,
+    <xref linkend="libmad"/>,
+    <ulink url="http://www.musepack.net/">libmpcdec</ulink>,
+    <ulink url="http://svn.mplayerhq.hu/nut/src/trunk/">libnut</ulink> (SVN checkout),
+    <xref linkend="libvorbis"/>,
+    <ulink url="http://www.lirc.org/">LIRC</ulink>,
+    <ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink>,
+    <xref linkend="LZO"/> (requires
+    <ulink url="http://www.oberhumer.com/opensource/lzo/download/LZO-v1/lzo-1.08.tar.gz">Version 1</ulink>),
+    <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
     <ulink url="http://www.theora.org/">Theora</ulink>,
+    <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="http://www.xiph.org/vorbis/">Tremor</ulink> (requires
     <xref linkend="libvorbis"/> and you must disable the internal version),
-    <ulink url="http://sourceforge.net/projects/faac">FAAD2</ulink>
-    (must disable internal version to use the system-installed version),
-    <ulink url="http://developers.videolan.org/x264.html">x264</ulink>,
-<!-- Dead link
-    <ulink url="http://www.divx.com/divx/linux/">DivX</ulink>,
--->
-    <ulink url="http://www.musepack.net/">libmpcdec</ulink>,
-    <ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-540.zip">
-    AMR narrowband (floating point)</ulink> or
-    <ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-530.zip">
-    AMR naarrowband (fixed point)</ulink>,
-    <ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26204-530.zip">
-    AMR wideband</ulink>,
-    <ulink
-    url="ftp://ftp.videolan.org/pub/videolan/vlc/0.8.2/contrib/toolame-02m-beta8.tar.bz2">
-    tooLAME</ulink>,
-    <ulink url="http://developers.videolan.org/libdca.html">libdca</ulink>,
-    <ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink>, and
-    <ulink url="http://www.lirc.org/">LIRC</ulink></para>
+    <ulink url="http://developers.videolan.org/x264.html">x264</ulink>, and
+    <xref linkend="xvid"/></para>
 
     <bridgehead renderas="sect4">Optional Hardware Specific Options</bridgehead>
     <para>There is hardware specific packages (or vendor supplied software) you
@@ -325,11 +310,11 @@
       <title>GUI Installation (Optional)</title>
 
       <para>To enable building the GUI version of
-      <application>MPlayer</application> (requires <xref linkend="GTK"/>), add
-      <option>--enable-gui</option> to the <command>configure</command>
-      script. You'll also need to extract at least one skin. Extract the desired
-      skin and create the default location (as the <systemitem
-      class="username">root</systemitem> user):</para>
+      <application>MPlayer</application> (requires <xref linkend="gtk2"/> or
+      <xref linkend="GTK"/>), add <option>--enable-gui</option> to the
+      <command>configure</command> script. You'll also need to extract at least
+      one skin. Extract the desired skin and create the default location (as
+      the <systemitem class="username">root</systemitem> user):</para>
 
 <screen role="root"><userinput>install -v -d -m755 /usr/share/mplayer/Skin &&
 tar -xvf ../&mplayer-skin; \
@@ -365,34 +350,34 @@
       <application>MPlayer</application>
       to link dynamically to this library instead of the default statically
       linked method. If you desire to build the shared library, add
-      <option>--enable-shared-pp</option> and
-      <option>--disable-fastmemcpy</option> to the <command>configure</command>
-      script. The <option>--disable-fastmemcpy</option> parameter is required to
-      avoid <computeroutput>undefined reference</computeroutput> errors when
-      other packages link to the shared library.</para>
+      <option>--enable-shared-pp</option> to the <command>configure</command>
+      script. Note that the <application>FFmpeg</application> package can also
+      build this library (which <application>MPlayer</application> can link to
+      instead of building it), ensure you don't overwrite an existing one.</para>
 
       <para>You may wish to examine the output from
       <command>./configure --help</command> to find out what additional
       parameters to <command>configure</command> are needed to include
-      the dependencies you have installed on your system.</para>
+      the dependencies you have installed on your system. To link in existing
+      <application>FFmpeg</application> libraries (and
+      <application>MPlayer</application> won't have to build them), you must
+      pass a total of nine additional options to the
+      <command>configure</command> script. Four to disable building the static
+      <application>FFmpeg</application> libraries, four to enable using the
+      system-installed shared libraries and
+      <option>--with-extraincdir=/usr/include/ffmpeg</option> so the build can
+      locate the <application>FFmpeg</application> interface headers.</para>
 
-      <para>Before beginning the installation, apply an upstream fix to avoid
-      a conflict with the getline() function name:</para>
-
-<screen><userinput>sed -i 's/getline/vobsub_&/' vobsub.c</userinput></screen>
-
       <para>Install <application>MPlayer</application> by running the following
       commands:</para>
 
-<screen><userinput>patch -Np1 -i ../MPlayer-&mplayer-version;-kernel_2.6-1.patch &&
-patch -Np1 -i ../MPlayer-&mplayer-version;-gcc4-1.patch &&
-patch -Np1 -i ../MPlayer-&mplayer-version;-round_function_fix-1.patch &&
-patch -Np1 -i ../MPlayer-&mplayer-version;-jack_fixes-1.patch &&
-patch -Np1 -i ../MPlayer-&mplayer-version;-x264_fixes-1.patch &&
+<screen><userinput>patch -Np0 -i ../cddb_fix_20070605.diff &&
+patch -Np1 -i ../MPlayer-&mplayer-version;-ext_ffmpeg.patch &&
 
 ./configure --prefix=/usr \
             --confdir=/etc/mplayer \
-            --enable-largefiles &&
+            --enable-largefiles \
+            --enable-dynamic-plugins &&
 make</userinput></screen>
 
       <para>This package does not come with a test suite.</para>
@@ -472,7 +457,6 @@
     <!--
       Following section should be removed after BLFS-6.2.
       Current Udev creates persistent cd/dvd links automatically
-    -->
     <sect3>
       <title>Installation for DVD Playback (Optional)</title>
 
@@ -485,6 +469,7 @@
       order to use the device.</para>
 
     </sect3>
+    -->
 
   </sect2>
 
@@ -574,7 +559,8 @@
           <para>For further information, look at the very good documentation
           included with the package in the source tree subdirectory
           <filename class="directory">DOCS</filename> (also installed at
-          <filename class='directory'>/usr/share/doc/mplayer</filename>).</para>
+          <filename class='directory'>/usr/share/doc/mplayer-&mplayer-version;</filename>).</para>
+
           <indexterm zone="mplayer mplayer-prog">
             <primary sortas="b-mplayer">mplayer</primary>
           </indexterm>




More information about the blfs-book mailing list