Index: general.ent
===================================================================
--- general.ent	(revision 831caa1ff1199fcec9761a8bcd450dde6766152b)
+++ general.ent	(revision b1a0a05b95cf3311fc188344d3297711f05749ce)
@@ -4,11 +4,11 @@
 -->
 
-<!ENTITY day          "29">                   <!-- Always 2 digits -->
-<!ENTITY month        "01">                   <!-- Always 2 digits -->
+<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 29th, &year;">
+<!ENTITY releasedate  "February 2nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 831caa1ff1199fcec9761a8bcd450dde6766152b)
+++ introduction/welcome/changelog.xml	(revision b1a0a05b95cf3311fc188344d3297711f05749ce)
@@ -46,4 +46,14 @@
 
     <listitem>
+      <para>February 2nd, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Modified the build commands and dependencies in the
+          VLC instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 29th, 2013</para>
       <itemizedlist>
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 831caa1ff1199fcec9761a8bcd450dde6766152b)
+++ multimedia/videoutils/vlc.xml	(revision b1a0a05b95cf3311fc188344d3297711f05749ce)
@@ -11,5 +11,5 @@
   <!ENTITY vlc-md5sum        "4f959c0766ada8cea5a72c65fce94ebe">
   <!ENTITY vlc-size          "18 MB">
-  <!ENTITY vlc-buildsize     "600 MB">
+  <!ENTITY vlc-buildsize     "as much as 600 MB, but likely around 500">
   <!ENTITY vlc-time          "4.0 SBU">
 ]>
@@ -73,4 +73,14 @@
         <para>
           Estimated build time: &vlc-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/vlc-&vlc-version;-opencv_fixes-1.patch"/>
         </para>
       </listitem>
@@ -93,10 +103,12 @@
       <xref linkend="libmad"/> and
       <xref linkend="qt"/> (<application>Qt</application> is required for the
-      graphical user interface. Without Qt you will only be able to use the
-      command line or <application>ncurses</application> interface)
+      graphical user interface; without <application>Qt</application> you will
+      only be able to use the command line or <application>ncurses</application>
+      interface)
     </para>
 
     <bridgehead renderas="sect4">Optional input drivers and libraries</bridgehead>
     <para role="optional">
+      <ulink url="http://www.mcmurchy.com/minizip/minizip-1.2.7.tar.gz">Minizip</ulink>,
       <ulink url="http://code.google.com/p/libproxy/">Libproxy</ulink>,
       <ulink url="http://www.live555.com/">Live555</ulink>,
@@ -108,14 +120,21 @@
       <ulink url="http://opencv.willowgarage.com/wiki/">OpenCV</ulink>,
       <xref linkend="samba3"/>,
-      <xref linkend="gvfs"/>,
-      <ulink url="http://www.gnu.org/software/vcdimager/">VCDImager</ulink> and
-      <ulink url="http://libcddb.sourceforge.net/">libcddb</ulink>
+      <!-- <xref linkend="gvfs"/>, -->
+      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
+      <ulink url="http://www.gnu.org/software/vcdimager/">VCDImager</ulink>
+      (requires <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>)
+      and <ulink url="http://libcddb.sourceforge.net/">libcddb</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional mux/demux plugins</bridgehead>
     <para role="optional">
+      <ulink url="http://www.videolan.org/developers/libdvbpsi.html">libdvbpsi</ulink>,
       <ulink url="http://code.google.com/p/game-music-emu/">Game Music Emu</ulink>,
+      <ulink url="http://sourceforge.net/projects/sidplay2/files/sidplay2/">sidplay-libs</ulink>
+      (with patches located in contrib/src/sidplay2 subdirectory),
       <xref linkend="libogg"/>,
       <ulink url="http://directory.fsf.org/wiki/Libshout">libshout</ulink>,
+      <ulink url="http://matroska.org/">libmatroska</ulink>
+      (requires <ulink url="http://matroska.org/">libebml</ulink>),
       <ulink url="http://modplug-xmms.sourceforge.net/">libmodplug</ulink> and
       <ulink url="http://www.musepack.net/index.php?pg=home">Musepack</ulink>
@@ -124,7 +143,7 @@
     <bridgehead renderas="sect4">Optional codec plugins</bridgehead>
     <para role="optional">
-      <ulink url="http://sourceforge.net/projects/libshine-fxp/">Shine</ulink>,
+      <ulink url="http://www.splitted-desktop.com/static/libva/">libva</ulink>,
+      <!-- <ulink url="http://sourceforge.net/projects/libshine-fxp/">Shine</ulink>, -->
       <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
-      <ulink url="http://www.splitted-desktop.com/static/libva/">libva</ulink>,
       <xref linkend="faad2"/>,
       <ulink url="http://www.twolame.org/">Twolame</ulink>,
@@ -133,5 +152,7 @@
       <xref linkend="libmpeg2"/>,
       <xref linkend="libvorbis"/>,
+      <ulink url="http://wiki.xiph.org/Tremor">Tremor</ulink>,
       <xref linkend="speex"/>,
+      <ulink url="http://www.opus-codec.org/">Opus</ulink>,
       <xref linkend="libtheora"/>,
       <ulink url="http://diracvideo.org/download/dirac-research/">Dirac</ulink>,
@@ -148,8 +169,10 @@
     <bridgehead renderas="sect4">Optional video plugins</bridgehead>
     <para role="optional">
-      <xref linkend="sdl"/>,
+      <xref linkend="sdl"/>
+      (with <ulink url="http://www.libsdl.org/projects/SDL_image/">SDL_image</ulink>),
       <xref linkend="freetype2"/>,
+      <xref linkend="fontconfig"/>,
       <xref linkend="fribidi"/>,
-      <xref linkend="fontconfig"/>,
+      <xref linkend="librsvg"/>,
       <xref linkend="aalib"/> and
       <ulink url="http://caca.zoy.org/">libcaca</ulink>
@@ -166,4 +189,5 @@
     <bridgehead renderas="sect4">Optional interface plugins</bridgehead>
     <para role="optional">
+      <ulink url="http://xcb.freedesktop.org/dist/">xcb-util-keysyms</ulink>,
       <ulink url="http://www.lirc.org/">LIRC</ulink> and
       <ulink url="http://www.feep.net/libtar/">libtar</ulink>
@@ -178,4 +202,5 @@
     <bridgehead renderas="sect4">Optional service discovery plugins</bridgehead>
     <para role="optional">
+      <xref linkend="avahi"/>,
       <ulink url="http://libmtp.sourceforge.net/">MTP</ulink> and
       <ulink url="http://pupnp.sourceforge.net/">UPnP</ulink>
@@ -184,8 +209,9 @@
     <bridgehead renderas="sect4">Optional miscellaneous dependencies</bridgehead>
     <para role="optional">
+      <xref linkend="libxml2"/>,
+      <xref linkend="taglib"/>, 
       <xref linkend="libnotify"/>,
-      <xref linkend="taglib"/>, 
-      <ulink url="http://medialibrary.sourceforge.net/">MediaLibrary</ulink>,
-      <xref linkend="sqlite"/> and
+      <ulink url="http://medialibrary.sourceforge.net/">MediaLibrary</ulink>
+      (requires <xref linkend="sqlite"/>) and
       <ulink url="http://www.lua.org/">Lua</ulink>
     </para>
@@ -203,5 +229,10 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-lua &amp;&amp;
+<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-opencv_fixes-1.patch &amp;&amp;
+./bootstrap &amp;&amp;
+sed -i "s|LDFLAGS_sid)|&amp; -L/usr/lib/sidplay/builders|" \
+    modules/demux/Makefile.in &amp;&amp;
+
+./configure --prefix=/usr --disable-lua &amp;&amp;
 make</userinput></screen>
 
@@ -214,9 +245,23 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make docdir=/usr/share/doc/vlc-&vlc-version; install</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/update-icons-and-desktop.xml"/>
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>./bootstrap</command>: This command is required because the patch
+      modifies <application>Autotools</application> files and
+      <application>VLC</application> uses a custom reconfiguration system.
+    </para>
+
+    <para>
+      <command>sed -i ...</command>: This command fixes building against the
+      <application>Sidplay2</application> package.
+    </para>
 
     <para>
@@ -227,22 +272,44 @@
 
     <para>
-      <parameter>--disable-avcodec</parameter>: Use this switch if you don't 
+      <option>--disable-avcodec</option>: Use this switch if you don't 
       have <application>FFmpeg</application> installed.
     </para>
 
     <para>
-      <parameter>--disable-a52</parameter>: Use this switch if you don't have
+      <option>--disable-a52</option>: Use this switch if you don't have
       <application>liba52</application> installed.
     </para>
 
     <para>
-      <parameter>--disable-libgcrypt</parameter>: Use this switch if you don't
+      <option>--disable-libgcrypt</option>: Use this switch if you don't
       have <application>libgcrypt</application> installed.
     </para>
 
-
-    <para>
-      <parameter>--disable-mad</parameter>: Use this switch if you don't 
+    <para>
+      <option>--disable-mad</option>: Use this switch if you don't 
       have <application>libmad</application> installed.
+    </para>
+
+    <para>
+      <option>--enable-shine</option>: Use this option if you wish to build the
+      <application>Shine</application> plugin.
+    </para>
+
+    <para>
+      <option>--enable-faad</option>: Use this option if you have
+      <application>FAAD</application> installed and wish to build the
+      <application>FAAD</application> plugin.
+    </para>
+
+    <para>
+      <option>--enable-tremor</option>: Use this option if you have
+      <application>Tremor</application> installed and wish to build the
+      <application>Tremor</application> plugin.
+    </para>
+
+    <para>
+      <option>--enable-aa</option>: Use this option if you have
+      <application>AAlib</application> installed and wish to build the
+      <application>AAlib</application> plugin.
     </para>
 
@@ -266,8 +333,8 @@
         </seg>
         <seg>
+          /usr/include/vlc,
           /usr/lib/vlc,
-          /usr/include/vlc,
           /usr/share/vlc and
-          /usr/share/doc/vlc 
+          /usr/share/doc/vlc-&vlc-version;
         </seg>
       </seglistitem>
