Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f44c9d57d8cdaca8392a019b32900fada5520d9d)
+++ introduction/welcome/changelog.xml	(revision 36ec89cb17fbb1bec966f2c3bc1f32132a860824)
@@ -46,4 +46,11 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Several fixes to the MPlayer instructions: added a 
+          sed command to fix the getline function name issue, added a patch to
+          fix the round function issue, fixed the creation of the font symlink
+          to point to /usr/share/fonts, commented out the command and text that
+          created a /dev/dvd device file as this is now done in LFS.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Modified the way the GLUT library dependency is
           described in the LibTIFF instructions.</para>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision f44c9d57d8cdaca8392a019b32900fada5520d9d)
+++ multimedia/videoutils/mplayer.xml	(revision 36ec89cb17fbb1bec966f2c3bc1f32132a860824)
@@ -89,4 +89,8 @@
         <para>Required Patch: <ulink
         url="&patch-root;/MPlayer-&mplayer-version;-gcc4-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para>Required Patch: <ulink
+        url="&patch-root;/MPlayer-&mplayer-version;-round_function_fix-1.patch"/></para>
       </listitem>
       <listitem>
@@ -373,4 +377,9 @@
       the dependencies you have installed on your system.</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_&amp;/' vobsub.c</userinput></screen>
+
       <para>Install <application>MPlayer</application> by running the following
       commands:</para>
@@ -378,8 +387,11 @@
 <screen><userinput>patch -Np1 -i ../MPlayer-&mplayer-version;-kernel_2.6-1.patch &amp;&amp;
 patch -Np1 -i ../MPlayer-&mplayer-version;-gcc4-1.patch &amp;&amp;
+patch -Np1 -i ../MPlayer-&mplayer-version;-round_function_fix-1.patch &amp;&amp;
 patch -Np1 -i ../MPlayer-&mplayer-version;-jack_fixes-1.patch &amp;&amp;
 patch -Np1 -i ../MPlayer-&mplayer-version;-x264_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr --confdir=/etc/mplayer \
-    --enable-largefiles &amp;&amp;
+
+./configure --prefix=/usr \
+            --confdir=/etc/mplayer \
+            --enable-largefiles &amp;&amp;
 make</userinput></screen>
 
@@ -389,14 +401,15 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+
 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>Passing parameters to <command>configure</command> may result
-      in the creation of <filename class='libraryfile'>libdha.so.1.0</filename>.
-      If so, you may wish to create a symlink to this library in case other
-      packages link to <filename class='libraryfile'>libdha.so</filename>. Use
-      the following command as the
-      <systemitem class="username">root</systemitem> user to create the
-      symlink:</para>
+cp -v -R DOCS/*     /usr/share/doc/mplayer-&mplayer-version;</userinput></screen>
+
+      <para>Passing certain parameters to <command>configure</command> may
+      result in the creation of
+      <filename class='libraryfile'>libdha.so.1.0</filename>. If so, you may
+      wish to create a symlink to this library in case other packages link to
+      <filename class='libraryfile'>libdha.so</filename>. Use the following
+      command as the <systemitem class="username">root</systemitem> user to
+      create the symbolic link:</para>
 
 <screen role="root"><userinput>ln -v -s libdha.so.1.0 /usr/lib/libdha.so</userinput></screen>
@@ -436,5 +449,5 @@
 
 <screen><userinput>install -v -m750 -d ~/.mplayer &amp;&amp;
-ln -v -sf /usr/X11R6/lib/X11/fonts/TTF/luxisri.ttf \
+ln -v -sf /usr/share/fonts/X11-TTF/luxisri.ttf \
     ~/.mplayer/subfont.ttf</userinput></screen>
 
@@ -457,4 +470,5 @@
     </sect3>
 
+    <!--
     <sect3>
       <title>Installation for DVD Playback (Optional)</title>
@@ -485,4 +499,5 @@
 
     </sect3>
+    -->
 
   </sect2>
