Index: general.ent
===================================================================
--- general.ent	(revision 5e9008a215f95265504affd6116ff74e7e4e3fab)
+++ general.ent	(revision f7ae70fa486dba895e0491d1d08de9f2ae54bb42)
@@ -1,3 +1,3 @@
-<!ENTITY day          "10">
+<!ENTITY day          "11">
 <!ENTITY month        "01">
 <!ENTITY year         "2006">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5e9008a215f95265504affd6116ff74e7e4e3fab)
+++ introduction/welcome/changelog.xml	(revision f7ae70fa486dba895e0491d1d08de9f2ae54bb42)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>January 11, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updates to MPlayer: added an x264 patch, added new
+          dependencies, updated the version of the Skins file.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 10th, 2006</para>
       <itemizedlist>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 5e9008a215f95265504affd6116ff74e7e4e3fab)
+++ multimedia/videoutils/mplayer.xml	(revision f7ae70fa486dba895e0491d1d08de9f2ae54bb42)
@@ -15,4 +15,5 @@
   <!ENTITY mplayer-codec-md5sum  "5fe89bb095bdf9b4f9cda5479dbde906">
   <!ENTITY mplayer-codec-size    "9.3 MB">
+  <!ENTITY mplayer-alt-codec     "all-20050412.tar.bz2">
 
   <!ENTITY mplayer-skin          "Blue-1.4.tar.bz2">
@@ -90,4 +91,8 @@
       </listitem>
       <listitem>
+        <para>Required Patch: <ulink
+        url="&patch-root;/MPlayer-&mplayer-version;-x264_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>
@@ -106,4 +111,9 @@
       <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
@@ -158,13 +168,14 @@
     <para role="optional"><xref linkend="cdparanoia"/>,
     <xref linkend="libdv"/>,
-    <xref linkend="libdvdread"/>,
+    <xref linkend="libdvdread"/> (must disable internal mpdvdkit support),
     <xref linkend="samba3"/>,
     <ulink url="http://www.live555.com/mplayer/">LIVE555 Streaming Media</ulink>,
     <ulink url="http://armory.nicewarrior.org/projects/vstream-client/">TiVo vstream client</ulink>,
+    <!-- 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>
+    <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>
@@ -175,8 +186,8 @@
     <xref linkend="sdl"/> (also used for video output),
     <xref linkend="xmms"/>,
-    <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
     <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink>,
     <ulink url="http://bio2jack.sourceforge.net/">bio2jack</ulink> (requires
-    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>)</para>
+    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>), and
+    <ulink url="http://www.ladspa.org/">LADSPA</ulink></para>
 
     <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
@@ -195,8 +206,5 @@
     <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>,
-    <ulink url="http://dxr2.sourceforge.net/">Dxr2</ulink>,
-    <ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>,
-    <ulink url="http://prdownloads.sourceforge.net/zapping/">MP1E</ulink> and
+    <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>, and
     <ulink url="http://trific.ath.cx/software/enca/">Enca</ulink></para>
 
@@ -204,17 +212,74 @@
     <para role="optional"><xref linkend="libvorbis"/>,
     <xref linkend="xvid"/>,
-    <xref linkend="LZO"/>,
+    <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"/>,
     <xref linkend="lame"/>,
     <xref linkend="libfame"/>,
     <ulink url="http://www.theora.org/">Theora</ulink>,
-    <ulink url="http://www.xiph.org/ogg/vorbis/index.html">Tremor</ulink>,
-    <ulink url="http://sourceforge.net/projects/faac">FAAD2</ulink>,
-    <ulink url="http://www.divx.com/divx/linux/">DivX4Linux</ulink>,
+    <ulink url="http://www.xiph.org/ogg/vorbis/index.html">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>,
+    <ulink url="http://www.divx.com/divx/linux/">DivX</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://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink>
-    and <ulink url="http://www.lirc.org/">LIRC</ulink></para>
+    <ulink url="http://www.videolan.org/libdca.html">libdts</ulink>,
+    <ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink>, and
+    <ulink url="http://www.lirc.org/">LIRC</ulink></para>
+
+    <bridgehead renderas="sect4">Optional Hardware Specific Options</bridgehead>
+    <para>There is hardware specific packages (or vendor supplied software) you
+    can install to improve the performance of your video card when using
+    <application>MPlayer</application>. Some of the packages and/or vendor
+    supplied software and the <application>MPlayer</application> specific
+    driver created if it is found is shown here.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>mga: Matrox G200/G400/G450/G550 hardware YUV overlay via the
+        mga_vid device</para>
+      </listitem>
+      <listitem>
+        <para>xmga: Matrox G200/G400/G450/G550 overlay (mga_vid) in X11
+        window</para>
+      </listitem>
+      <listitem>
+        <para>syncfb: Matrox G400 YUV support on framebuffer</para>
+      </listitem>
+      <listitem>
+        <para>3dfx: Voodoo 3/Banshee hardware YUV support (/dev/3dfx)</para>
+      </listitem>
+      <listitem>
+        <para>tdfxfb: Voodoo 3/Banshee hardware YUV support on tdfx
+        framebuffer</para>
+      </listitem>
+      <listitem>
+        <para>mpegpes: support for Siemens DVB hardware MPEG-1/2 decoder boards
+        (or MPEG-PES file output)</para>
+      </listitem>
+      <listitem>
+        <para>dxr2: support for DXR2 hardware MPEG-1/2 decoder boards
+        <ulink url="http://dxr2.sourceforge.net/">Dxr2</ulink></para>
+      </listitem>
+      <listitem>
+        <para>dxr3: support for DXR3/Hollywood+ hardware MPEG-1/2 decoder
+        boards <ulink
+        url="http://dxr3.sourceforge.net/">libdxr3</ulink></para>
+      </listitem>
+      <listitem>
+        <para>zr: support for Zoran360[56]7 based hardware MJPEG cards</para>
+      </listitem>
+    </itemizedlist>
 
   </sect2>
@@ -258,5 +323,5 @@
     -C /usr/share/mplayer/Skin &amp;&amp;
 chown -v -R root:root /usr/share/mplayer/Skin/Blue &amp;&amp;
-chmod -v 0755 /usr/share/mplayer/Skin/Blue{,/icons} &amp;&amp;
+chmod -v 755 /usr/share/mplayer/Skin/Blue{,/icons} &amp;&amp;
 ln -sfv Blue /usr/share/mplayer/Skin/default</userinput></screen>
 
@@ -268,6 +333,6 @@
       <para>To enable OSD (On Screen Display) and subtitles support, add
       <option>--enable-menu</option> to the <command>configure</command>
-      script. You'll also need to set up at least one font (see font installation
-      instructions a little later).</para>
+      script. You'll also need to set up at least one font (see font
+      installation instructions a little later).</para>
 
     </sect3>
@@ -281,13 +346,16 @@
       </note>
 
-      <para><application>MPlayer</application> can build a shared post-processing
-      library from the internal <application>FFmpeg</application> package which
-      other packages can link to. This requires <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>
+      <para><application>MPlayer</application> can build a shared
+      post-processing library from the internal
+      <application>FFmpeg</application> package which
+      other packages can link to. This requires
+      <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>
+      avoid <computeroutput>undefined reference</computeroutput> errors when
+      other packages link to the shared library.</para>
 
       <para>You may wish to examine the output from
@@ -301,4 +369,5 @@
 <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;-x264_fixes-1.patch &amp;&amp;
 ./configure --prefix=/usr --confdir=/etc/mplayer \
     --enable-largefiles &amp;&amp;
@@ -314,9 +383,10 @@
 
       <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>
+      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>
 
 <screen role="root"><userinput>ln -v -s libdha.so.1.0 /usr/lib/libdha.so</userinput></screen>
@@ -324,14 +394,14 @@
       <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
-      it. Ensure any changes you make to <filename>codecs.conf</filename> achieve
-      the desired results, as incorrect entries in this file have been known to
-      cause errors and render the player unusable. If necessary, create the file
-      using the following command.</para>
+      it. Ensure any changes you make to <filename>codecs.conf</filename>
+      achieve the desired results, as incorrect entries in this file have been
+      known to cause errors and render the player unusable. If necessary,
+      create the file using the following command.</para>
 
 <screen role="root"><userinput>install -m644 etc/codecs.conf /etc/mplayer</userinput></screen>
 
       <para>You may also want to copy all the default configuration files to
-      <filename class='directory'>/etc/mplayer</filename> for future reference or
-      more customization ability.</para>
+      <filename class='directory'>/etc/mplayer</filename> for future reference
+      or more customization ability.</para>
 
 <screen role="root"><userinput>install -m644 etc/*.conf /etc/mplayer</userinput></screen>
@@ -430,9 +500,9 @@
       <title>Configuration Information</title>
 
-      <para>Typically, there's no configuration required for the system-wide files
-      in <filename class='directory'>/etc/mplayer</filename> (in fact, this
-      directory is empty unless you copied the default files as mentioned above).
-      Configuration can be accomplished by choosing the configuration button located
-      on the <application>MPlayer</application> GUI. Any
+      <para>Typically, there's no configuration required for the system-wide
+      files in <filename class='directory'>/etc/mplayer</filename> (in fact,
+      this directory is empty unless you copied the default files as mentioned
+      above). Configuration can be accomplished by choosing the configuration
+      button located on the <application>MPlayer</application> GUI. Any
       configuration changes made here will be copied to the user's
       <filename class='directory'>~/.mplayer</filename> directory.</para>
@@ -492,6 +562,6 @@
 http://www.students.uni-marburg.de/~Klossa/hapkidofight_lo.mpg</userinput></screen>
 
-          <para>For further information, look at the very good documentation included
-          with the package in the source tree subdirectory
+          <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>
