Changeset 442bf14

Timestamp:

03/18/2012 01:15:04 PM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

6ad29d3

Parents:

53412367

Message:

MPlayer improvements

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9726 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/mplayer.xml (modified) (12 diffs)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "17">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10 +10 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 16th, &year;">
+<!ENTITY releasedate  "March 18th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[rthomsen] - improved MPlayer instructions.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - usbutils 005.</para>
         </listitem>

multimedia/videoutils/mplayer.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY mplayer-download-http "http://anduin.linuxfromscratch.org/sources/BLFS/svn/m/mplayer-15-03-12.tar.xz">
+  <!ENTITY mplayer-download-http "http://anduin.linuxfromscratch.org/sources/BLFS/svn/m/mplayer-svn_20120315.tar.xz">
   <!ENTITY mplayer-download-ftp  " ">
-  <!ENTITY mplayer-md5sum        "775fcefab99004de09d0fae2c52dc06b">
+  <!ENTITY mplayer-md5sum        "bcd0f9986a4f14a89ea9fb5ffb15d857">
   <!ENTITY mplayer-size          "9.9 MB">
   <!ENTITY mplayer-buildsize     "137 MB">
   <!ENTITY mplayer-time          "4.7 SBU">
-
-  <!ENTITY mplayer-codec         "essential-20071007.tar.bz2">
-  <!ENTITY mplayer-codec-md5sum  "4ea9c2dbd0945c83af1a8d0dd363993c">
-  <!ENTITY mplayer-codec-size    "9.5 MB">
 
   <!ENTITY mplayer-skin          "Blue-1.8.tar.bz2">
@@ -46 +42 @@
 
     <para>For <application>MPlayer</application> general information and
-    available features, including a full list of file formats, CODECs and
+    available features, including a full list of file formats, codecs and
     output devices supported by <application>MPlayer</application>, visit the
     <ulink url="http://www.mplayerhq.hu/">
@@ -93 +89 @@
     </itemizedlist>
 -->
-    <itemizedlist spacing='compact'>
-      <title>CODECs</title>
-      <para>Although MPlayer has built-in support for playing most popular video 
-      and audio formats, packages with proprietary binary CODECs that enable support 
-      for playing some rare formats are available. Most people don't need the binary 
-      CODECs.</para>
-      <listitem>
-        <para>Essential binary CODECs: <ulink
-        url="http://www.mplayerhq.hu/MPlayer/releases/codecs/&mplayer-codec;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &mplayer-codec-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &mplayer-codec-size;</para>
-      </listitem>
-<!--
-      <listitem>
-        <para>Alternate CODECs (provides additional functionality and is a
-        larger file): <ulink
-        url="http://www.mplayerhq.hu/MPlayer/releases/codecs/&mplayer-alt-codec;"/></para>
-      </listitem>
-        <listitem><para>Additional CODECs: <ulink
-        url="http://www.mplayerhq.hu/MPlayer/releases/codecs/"/></para>
-      </listitem>
--->
-    </itemizedlist>
-    
+
     <itemizedlist spacing='compact'>
       <title>Skins</title>
@@ -157 +126 @@
     </itemizedlist>
 -->
-    <para>The CODECs and skins are not required to
-    build and use <application>MPlayer</application>.</para>
+    <para>Skins are not required to build and use <application>MPlayer
+    </application>.</para>
 
     <bridgehead renderas="sect3">MPlayer Dependencies</bridgehead>
 
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+    <xref linkend="yasm"/>
+    </para>    
+    
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -177 +151 @@
     <ulink url="http://code.google.com/p/vstream-client/">TiVo vstream client</ulink> and
     <ulink url="http://www.xmms.org/">XMMS</ulink>
-    <!-- Mplayer uses internal versions of these:
+    <!-- Mplayer can only use internal versions of these at the moment:
     <xref linkend="libdvdread"/>,
     <xref linkend="libdvdnav"/>,
@@ -235 +209 @@
     <ulink url="http://wiki.multimedia.cx/index.php?title=NUT">libnut</ulink>
     
-    <!-- Internal <xref linkend="ffmpeg"/>, -->
+    <!-- MPlayer can only use an internal version of this at the moment
+    <xref linkend="ffmpeg"/> -->
     
     </para>
@@ -250 +225 @@
       <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>
+      <ulink url="http://www.dolda2000.com/~fredrik/lirccd/">LIRC Client Daemon</ulink>, 
+      <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)
     </para>
     
@@ -261 +239 @@
     <title>Installation of MPlayer</title>
 
+<!-- MPlayer can play most filetypes without this
     <sect3>
       <title>CODEC Installation (Optional)</title>
@@ -271 +250 @@
 <screen role="root"><userinput>install -v -d -m755 /usr/lib/mplayer/codecs &amp;&amp;
 tar -xvf ../&mplayer-codec; \
-    -C /usr/lib/mplayer/codecs --strip-components=1 &amp;&amp;
+    -C /usr/lib/mplayer/codecs -strip-components=1 &amp;&amp;
 chown -v -R root:root /usr/lib/mplayer/codecs</userinput></screen>
 
       <para>If you installed any CODECs, ensure you add
-      <option>--codecsdir=/usr/lib/mplayer/codecs</option>
+      <option>-codecsdir=/usr/lib/mplayer/codecs</option>
       to the <command>configure</command> script.</para>
 
     </sect3>
-
-<!--
+-->
+<!-- No longer needed
     <sect3>
       <title>Installing OSD and Subtitles Support (Optional)</title>
@@ -298 +277 @@
         optimizations.</para>
       </note>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/X11R6_symlink.xml"/>
 
       <para>You may wish to examine the output from
@@ -321 +297 @@
 
 <screen role="root"><userinput>make install &amp;&amp;</userinput></screen>
-<!--
-install -v -m755 -d /usr/share/doc/mplayer-&mplayer-version; &amp;&amp;
-cp -v -R DOCS/*     /usr/share/doc/mplayer-&mplayer-version;</userinput></screen>
--->
+
+<para>To build and install the HTML documentation, run as 
+<systemitem class="username">root</systemitem>:</para>
+
+<screen role="root"><userinput>make doc &amp;&amp;
+install -d /usr/share/doc/mplayer-&mplayer-version; &amp;&amp;
+cp DOCS/HTML/en/* /usr/share/doc/mplayer-&mplayer-version;</userinput></screen>
+
       <para>You will need <filename>codecs.conf</filename> only if you want to
       change its properties, as the main binary contains an internal copy of
@@ -424 +404 @@
     <para><parameter>--enable-menu</parameter>: This option is set to enable the
     on-screen-display.</para>
-    <para><parameter>--codecsdir=/usr/lib/mplayer/codecs</parameter>: Use this option 
+    <!--
+    <para><parameter>-codecsdir=/usr/lib/mplayer/codecs</parameter>: Use this option 
     if you installed the binary codecs.</para>
+    -->
     
   </sect2>