Index: archive/qt.xml
===================================================================
--- archive/qt.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
+++ archive/qt.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
@@ -0,0 +1,563 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY qt-download-http "&trinity-repo-http;/qt3-3.3.8.d.tar.gz">
+  <!ENTITY qt-download-ftp  "&trinity-repo-ftp;/qt3-3.3.8.d.tar.gz ">
+  <!ENTITY qt-md5sum        "78dc675e84aed595375449818cbb589a">
+  <!ENTITY qt-size          "16.8 MB">
+  <!ENTITY qt-buildsize     "801 MB">
+  <!ENTITY qt-time          "8.6 SBU">
+]>
+
+<sect1 id="qt" xreflabel="Qt-&qt-version;">
+  <?dbhtml filename="qt.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Qt-&qt-version;</title>
+
+  <indexterm zone="qt">
+    <primary sortas="a-qt">Qt</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Qt</title>
+
+    <para>The <application>Qt</application> package contains a
+    <application>C++</application> GUI library. This is useful for creating
+    graphical applications or executing graphical applications that are
+    dynamically linked to the <application>Qt</application> library. Two of
+    the major users of <application>Qt</application> are
+    <application>KDE</application> and its follow on project,
+    <application>Trinity</application>.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&qt-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&qt-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &qt-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &qt-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &qt-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &qt-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch: <ulink
+          url="&patch-root;/qt-3.3.8.d-libpng15-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="x-window-system"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libjpeg"/> and
+      <xref linkend="libmng"/>
+    </para>
+
+    <para>Note: if for whatever reason you do not have the recommended
+    libraries installed on your system, you must remove the corresponding
+    <parameter>-system-<replaceable>&lt;library&gt;</replaceable></parameter> and
+    <parameter>-plugin-imgfmt-<replaceable>&lt;library&gt;</replaceable></parameter>
+    parameters from the <command>configure</command> commands shown in the
+    instructions below.</para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="cups"/>,
+      <xref linkend="mysql"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="unixodbc"/>,
+      <xref linkend="sqlite"/>, and
+      <ulink url="http://firebird.sourceforge.net/">Firebird</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/qt"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Qt</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
+    <para>There are several ways to install a complicated package such as
+    <application>Qt</application>. The files are not completely position
+    independent. Installation procedures execute the program
+    <command>pkg-config</command> to determine the location of package
+    executables, libraries, headers, and other files. For
+    <application>Qt</application>, <command>pkg-config</command> will look
+    for the file <filename>lib/pkgconfig/qt-mt.pc</filename> which must be
+    modified if relocating the package. This file is set up correctly by
+    the build process.</para>
+
+    <para>The default installation places the files in
+    <filename class='directory'>/usr/local/qt/</filename>. Many commercial
+    distributions place the files in the system's
+    <filename class='directory'>/usr</filename> hierarchy. The package can
+    also be installed in an arbitrary directory.</para>
+
+    <para>This section will demonstrate two different methods.</para>
+
+    <warning>
+      <para>Building <application>Qt</application> in a
+      <command>chroot</command> environment may fail.</para>
+    </warning>
+
+    <note>
+      <para>The build time for <application>Qt</application> is quite long. If
+      you want to save some time and don't want the tutorials and examples,
+      change the first <command>make</command> command to:</para>
+
+<screen><userinput>make sub-tools</userinput></screen>
+
+    </note>
+
+    <sect3>
+      <title>Method 1 - Installing in the '/usr' Hierarchy</title>
+
+      <para>The advantage of this method is that no updates to the
+      <filename>/etc/ld.so.conf</filename> or
+      <filename>/etc/man_db.conf</filename> files are required. The package
+      files are distributed within several subdirectories of the
+      <filename class='directory'>/usr</filename> hierarchy.
+      This is the method that most commercial distributions use.</para>
+
+      <note>
+        <para>If <application>Qt</application> is being reinstalled, run the
+        following commands from a console or non-Qt based window manager.
+        It overwrites <application>Qt</application> libraries that should not
+        be in use during the install process.</para>
+      </note>
+
+<screen><userinput>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf &amp;&amp;
+
+bash
+export PATH=$PWD/bin:$PATH                       &amp;&amp;
+export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
+
+patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch    &amp;&amp;
+
+./configure -prefix     /usr                \
+            -docdir     /usr/share/doc/qt   \
+            -headerdir  /usr/include/qt     \
+            -plugindir  /usr/lib/qt/plugins \
+            -datadir    /usr/share/qt       \
+            -sysconfdir /etc/qt             \
+            -translationdir /usr/share/qt/translations \
+            -qt-gif                         \
+            -system-zlib                    \
+            -system-libpng                  \
+            -system-libjpeg                 \
+            -system-libmng                  \
+            -plugin-imgfmt-png              \
+            -plugin-imgfmt-jpeg             \
+            -plugin-imgfmt-mng              \
+            -no-exceptions                  \
+            -thread                         \
+            -tablet &amp;&amp;
+
+make &amp;&amp;
+exit</userinput></screen>
+
+      <para>This package does not come with a test suite.</para>
+
+      <para>Now, as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+ln -v -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
+ln -v -snf ../../bin /usr/share/qt/bin &amp;&amp;
+ln -v -snf ../../include/qt /usr/share/qt/include &amp;&amp;
+ln -v -snf ../../lib /usr/share/qt/lib &amp;&amp;
+cp -v -r doc/man /usr/share &amp;&amp;
+cp -v -r examples /usr/share/doc/qt</userinput></screen>
+
+    </sect3>
+
+    <sect3>
+      <title>Method 2 - Installing in '/opt'</title>
+
+      <para>This is the method recommended by the <application>Qt</application>
+      developers. It has the advantage of keeping all the package files
+      consolidated in a dedicated directory hierarchy. By using this method,
+      an update can be made without overwriting a previous installation and
+      users can easily revert to a previous version by changing one symbolic
+      link.</para>
+
+      <para>The <application>Qt</application> developers use a default location
+      of <filename class='directory'>/usr/local/qt/</filename>, however this
+      procedure puts the files in <filename
+      class='directory'>/opt/qt-&qt-version;/</filename>
+      and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
+
+<screen><userinput>bash
+export QTDIR=$PWD                                &amp;&amp;
+export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
+export PATH=$PWD/bin:$PATH                       &amp;&amp;
+
+patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch    &amp;&amp;
+
+./configure -prefix /opt/qt-&qt-version; \
+            -sysconfdir /etc/qt   \
+            -qt-gif               \
+            -system-zlib          \
+            -system-libpng        \
+            -system-libjpeg       \
+            -system-libmng        \
+            -plugin-imgfmt-png    \
+            -plugin-imgfmt-jpeg   \
+            -plugin-imgfmt-mng    \
+            -no-exceptions        \
+            -thread               \
+            -tablet &amp;&amp;
+
+make &amp;&amp;
+exit</userinput></screen>
+
+      <para>This package does not come with a test suite.</para>
+
+      <para>Now, as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+ln -v -sfn qt-&qt-version; /opt/qt &amp;&amp;
+ln -v -s libqt-mt.so /opt/qt/lib/libqt.so &amp;&amp;
+cp -v -r doc/man examples /opt/qt/doc</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf</command>:
+    In Method 1, <application>Qt</application> is being installed into
+    the standard system directories. The runtime library search path does not
+    need to be set in this case.</para>
+
+    <para><command>bash</command>: This command enters a sub-shell to isolate
+    environment changes.</para>
+
+    <para><command>export QTDIR=$PWD</command>: This command defines where
+    the root of the <application>Qt</application> directory is located.</para>
+
+    <para><command>export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH</command>:
+    This command allows the not yet installed <application>Qt</application>
+    libraries to be used by the not yet installed <application>Qt</application>
+    programs.</para>
+
+    <para><command>export PATH=$PWD/bin:$PATH</command>: This command
+    allows the build process to find supporting executables.</para>
+
+    <para><parameter>-qt-gif</parameter>: This switch adds support for
+    <filename>gif</filename> files to the libraries.</para>
+
+    <para><parameter>-system-zlib -system-libpng -system-libjpeg
+    -system-mng</parameter>: These switches force the build instructions to use
+    the shared libraries that are on your system instead of creating a custom
+    set of support libraries for these functions.</para>
+
+    <para><parameter>-plugin-imgfmt-png -plugin-imgfmt-jpeg
+    -plugin-imgfmt-mng</parameter>: These switches enable run-time linking of
+    the referenced libraries.</para>
+
+    <para>If you pass the
+    <option>-plugin-sql-<replaceable>&lt;driver&gt;</replaceable></option> or
+    <option>-qt-sql-<replaceable>&lt;driver&gt;</replaceable></option> switch
+    to the <command>configure</command> command, you must also pass
+    <option>-I<replaceable>&lt;/path/to/sql/headers&gt;</replaceable></option>
+    so <command>make</command> can find the appropriate header files.  For
+    instance, building in <application>MySQL</application> support (as opposed
+    to building the plugin) will need to use <option>-I/usr/include/mysql
+    -qt-sql-mysql</option>.</para>
+
+    <note>
+      <para>To check if <application>mysql</application> is autotetected
+      properly, examine the output of <command>./configure -I/usr/include/mysql
+      -help</command>. Other database support will require similar
+      <command>configure</command> parameters.</para>
+    </note>
+
+    <para><parameter>-no-exceptions</parameter>: This switch disables
+    the exceptions coding generated by the <application>C++</application>
+    compiler.</para>
+
+    <para><parameter>-thread</parameter>: This switch adds
+    support for multi-threading.</para>
+
+    <para><command>ln -v -sf libqt-mt.so /usr/lib/libqt.so</command>: This
+    command allows <command>configure</command> scripts to find a working
+    <application>Qt</application> installation.</para>
+
+    <para><command>ln -v -snf ../../bin /usr/share/qt/bin</command>: This
+    command and the following two allow the
+    <filename class="directory">/usr</filename> style installation to mimic
+    the <filename class="directory">/opt</filename> style installation by
+    making all binaries, headers and libraries available from a single
+    directory, <filename class="directory">/usr/share/qt</filename>.</para>
+
+    <para><command>cp -v -r doc/man examples /usr/share (or
+    /opt/qt/doc)</command>:
+    This command installs the man pages and examples which are missed by
+    <command>make install</command>.</para>
+
+    <para><command>exit</command>: This command returns to the parent shell
+    and eliminates the environment variables set earlier.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Qt</title>
+
+    <sect3 id='qt-config'>
+      <title>Configuration Information</title>
+
+      <para>The <envar>QTDIR</envar> environment variable needs to be set when
+      building packages that depend on <application>Qt</application>. Add the
+      following to the <filename>.bash_profile</filename> initialization script
+      for each user that builds packages using the <application>Qt</application>
+      libraries. Alternatively, the variable can be set in the system wide
+      <filename>/etc/profile</filename> file.</para>
+
+      <para>For Method 1 (This is optional, only set this if an application is
+      unable to find the installed libraries or headers):</para>
+
+<screen><literal>export QTDIR=/usr/share/qt</literal></screen>
+
+      <para>or for Method 2:</para>
+
+<screen><literal>export QTDIR=/opt/qt</literal></screen>
+
+      <para>If you installed <application>Qt</application> using Method 2,
+      you also need to update the following configuration files so that
+      <application>Qt</application> is correctly found by other packages
+      and system processes.</para>
+
+      <para>Update the <filename>/etc/ld.so.conf</filename> and
+      <filename>/etc/man_db.conf</filename> files:</para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF" &amp;&amp;
+<literal># Begin qt addition to /etc/ld.so.conf
+
+/opt/qt/lib
+
+# End qt addition</literal>
+EOF
+ldconfig &amp;&amp;
+cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
+<literal># Begin qt addition to man_db.conf
+
+MANDATORY_MANPATH /opt/qt/doc/man
+MANPATH_MAP       /opt/qt/bin         /opt/qt/doc/man
+MANDB_MAP         /opt/qt/doc/man     /var/cache/man/qt
+
+# End qt addition to man_db.conf</literal>
+EOF</userinput></screen>
+
+      <indexterm zone="qt qt-config">
+        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+      </indexterm>
+
+      <indexterm zone="qt qt-config">
+        <primary sortas="e-etc-man_db.conf">/etc/man_db.conf</primary>
+      </indexterm>
+
+      <indexterm zone="qt qt-config">
+        <primary sortas="e-etc-profile">/etc/profile</primary>
+      </indexterm>
+
+      <indexterm zone="qt qt-config">
+        <primary sortas="e-AA.bash_profile">~/.bash_profile</primary>
+      </indexterm>
+
+      <para>Update the <envar>PKG_CONFIG_PATH</envar> environment variable
+      in your <filename>~/.bash_profile</filename> or
+      <filename>/etc/profile</filename> with the following:</para>
+
+<screen><literal>PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig</literal></screen>
+
+      <para>If you want the <application>Qt</application> executables in your
+      shell search path, update the <envar>PATH</envar> environment variable
+      in your <filename>~/.bash_profile</filename> or
+      <filename>/etc/profile</filename> to include
+      <filename class='directory'>/opt/qt/bin</filename>.</para>
+
+      <tip><para>The PATH, MANPATH, and PKG_CONFIG_PATH can be updated in
+      the extrapaths.sh (or other script) in the /etc/profile.d directory
+      if you set up the startup files as recommended in
+      <xref linkend='postlfs-config-profile'/>.</para></tip>
+
+      <para>As with most libraries, there is no explicit configuration to do.
+      After updating <filename>/etc/ld.so.conf</filename> as explained above,
+      run <command>/sbin/ldconfig</command> so that <command>ldd</command>
+      can find the shared libraries.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>assistant, designer, linguist, lrelease, lupdate, moc,
+        qm2ts, qmake, qtconfig, and uic</seg>
+        <seg>libqt-mt.so, libqt.so libqui.so, libdesignercore.a,
+        libeditor.a, and libqassistantclient.a</seg>
+        <seg>/opt/qt-&qt-version; or /usr/lib/qt, /usr/share/qt,
+        /usr/share/doc/qt, /usr/include/qt, and /etc/qt</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="assistant">
+        <term><command>assistant</command></term>
+        <listitem>
+          <para>is a tool for presenting on-line documentation.</para>
+          <indexterm zone="qt assistant">
+            <primary sortas="b-assistant">assistant</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="designer">
+        <term><command>designer</command></term>
+        <listitem>
+          <para>is a full-fledged GUI builder. It includes
+          powerful features such as preview mode, automatic widget
+          layout, support for custom widgets, and an advanced
+          property editor.</para>
+          <indexterm zone="qt designer">
+            <primary sortas="b-designer">designer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="linguist">
+        <term><command>linguist</command></term>
+        <listitem>
+          <para>provides support for translating applications into
+          local languages. </para>
+          <indexterm zone="qt linguist">
+            <primary sortas="b-linguist">linguist</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lrelease">
+        <term><command>lrelease</command></term>
+        <listitem>
+          <para>is a simple command line tool. It reads a Qt project
+          file and produces message files used by the application.</para>
+          <indexterm zone="qt lrelease">
+            <primary sortas="b-lrelease">lrelease</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lupdate">
+        <term><command>lupdate</command></term>
+        <listitem>
+          <para>reads a Qt project file, finds the translatable
+          strings in the specified source, header and Qt Designer
+          interface files, and produces or updates the translation
+          files listed in the project file.</para>
+          <indexterm zone="qt lupdate">
+            <primary sortas="b-lupdate">lupdate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="moc">
+        <term><command>moc</command></term>
+        <listitem>
+          <para>generates Qt meta object support code.</para>
+          <indexterm zone="qt moc">
+            <primary sortas="b-moc">moc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qm2ts">
+        <term><command>qm2ts</command></term>
+        <listitem>
+          <para>is a tool for converting Qt message file formats.</para>
+          <indexterm zone="qt qm2ts">
+            <primary sortas="b-qm2ts">qm2ts</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmake">
+        <term><command>qmake</command></term>
+        <listitem>
+          <para>qmake uses information stored in project files to
+          determine what should go in the makefiles it generates.</para>
+          <indexterm zone="qt qmake">
+            <primary sortas="b-qmake">qmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtconfig">
+        <term><command>qtconfig</command></term>
+        <listitem>
+          <para>is used to customize the appearance of Qt applications.</para>
+          <indexterm zone="qt qtconfig">
+            <primary sortas="b-qtconfig">qtconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="uic">
+        <term><command>uic</command></term>
+        <listitem>
+          <para>is a Qt user interface compiler.</para>
+          <indexterm zone="qt uic">
+            <primary sortas="b-uic">uic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: chive/qt4.xml
===================================================================
--- archive/qt4.xml	(revision 779ed51fa86b508399e46c024d252a787986e197)
+++ 	(revision )
@@ -1,563 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY qt-download-http "&trinity-repo-http;/qt3-3.3.8.d.tar.gz">
-  <!ENTITY qt-download-ftp  "&trinity-repo-ftp;/qt3-3.3.8.d.tar.gz ">
-  <!ENTITY qt-md5sum        "78dc675e84aed595375449818cbb589a">
-  <!ENTITY qt-size          "16.8 MB">
-  <!ENTITY qt-buildsize     "801 MB">
-  <!ENTITY qt-time          "8.6 SBU">
-]>
-
-<sect1 id="qt" xreflabel="Qt-&qt-version;">
-  <?dbhtml filename="qt.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Qt-&qt-version;</title>
-
-  <indexterm zone="qt">
-    <primary sortas="a-qt">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt</title>
-
-    <para>The <application>Qt</application> package contains a
-    <application>C++</application> GUI library. This is useful for creating
-    graphical applications or executing graphical applications that are
-    dynamically linked to the <application>Qt</application> library. Two of
-    the major users of <application>Qt</application> are
-    <application>KDE</application> and its follow on project,
-    <application>Trinity</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&qt-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&qt-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &qt-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &qt-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &qt-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &qt-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-          url="&patch-root;/qt-3.3.8.d-libpng15-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libmng"/>
-    </para>
-
-    <para>Note: if for whatever reason you do not have the recommended
-    libraries installed on your system, you must remove the corresponding
-    <parameter>-system-<replaceable>&lt;library&gt;</replaceable></parameter> and
-    <parameter>-plugin-imgfmt-<replaceable>&lt;library&gt;</replaceable></parameter>
-    parameters from the <command>configure</command> commands shown in the
-    instructions below.</para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/>,
-      <xref linkend="mysql"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="unixodbc"/>,
-      <xref linkend="sqlite"/>, and
-      <ulink url="http://firebird.sourceforge.net/">Firebird</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/qt"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/X11R6_symlink.xml"/>
-
-    <para>There are several ways to install a complicated package such as
-    <application>Qt</application>. The files are not completely position
-    independent. Installation procedures execute the program
-    <command>pkg-config</command> to determine the location of package
-    executables, libraries, headers, and other files. For
-    <application>Qt</application>, <command>pkg-config</command> will look
-    for the file <filename>lib/pkgconfig/qt-mt.pc</filename> which must be
-    modified if relocating the package. This file is set up correctly by
-    the build process.</para>
-
-    <para>The default installation places the files in
-    <filename class='directory'>/usr/local/qt/</filename>. Many commercial
-    distributions place the files in the system's
-    <filename class='directory'>/usr</filename> hierarchy. The package can
-    also be installed in an arbitrary directory.</para>
-
-    <para>This section will demonstrate two different methods.</para>
-
-    <warning>
-      <para>Building <application>Qt</application> in a
-      <command>chroot</command> environment may fail.</para>
-    </warning>
-
-    <note>
-      <para>The build time for <application>Qt</application> is quite long. If
-      you want to save some time and don't want the tutorials and examples,
-      change the first <command>make</command> command to:</para>
-
-<screen><userinput>make sub-tools</userinput></screen>
-
-    </note>
-
-    <sect3>
-      <title>Method 1 - Installing in the '/usr' Hierarchy</title>
-
-      <para>The advantage of this method is that no updates to the
-      <filename>/etc/ld.so.conf</filename> or
-      <filename>/etc/man_db.conf</filename> files are required. The package
-      files are distributed within several subdirectories of the
-      <filename class='directory'>/usr</filename> hierarchy.
-      This is the method that most commercial distributions use.</para>
-
-      <note>
-        <para>If <application>Qt</application> is being reinstalled, run the
-        following commands from a console or non-Qt based window manager.
-        It overwrites <application>Qt</application> libraries that should not
-        be in use during the install process.</para>
-      </note>
-
-<screen><userinput>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf &amp;&amp;
-
-bash
-export PATH=$PWD/bin:$PATH                       &amp;&amp;
-export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
-
-patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch    &amp;&amp;
-
-./configure -prefix     /usr                \
-            -docdir     /usr/share/doc/qt   \
-            -headerdir  /usr/include/qt     \
-            -plugindir  /usr/lib/qt/plugins \
-            -datadir    /usr/share/qt       \
-            -sysconfdir /etc/qt             \
-            -translationdir /usr/share/qt/translations \
-            -qt-gif                         \
-            -system-zlib                    \
-            -system-libpng                  \
-            -system-libjpeg                 \
-            -system-libmng                  \
-            -plugin-imgfmt-png              \
-            -plugin-imgfmt-jpeg             \
-            -plugin-imgfmt-mng              \
-            -no-exceptions                  \
-            -thread                         \
-            -tablet &amp;&amp;
-
-make &amp;&amp;
-exit</userinput></screen>
-
-      <para>This package does not come with a test suite.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -v -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
-ln -v -snf ../../bin /usr/share/qt/bin &amp;&amp;
-ln -v -snf ../../include/qt /usr/share/qt/include &amp;&amp;
-ln -v -snf ../../lib /usr/share/qt/lib &amp;&amp;
-cp -v -r doc/man /usr/share &amp;&amp;
-cp -v -r examples /usr/share/doc/qt</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Method 2 - Installing in '/opt'</title>
-
-      <para>This is the method recommended by the <application>Qt</application>
-      developers. It has the advantage of keeping all the package files
-      consolidated in a dedicated directory hierarchy. By using this method,
-      an update can be made without overwriting a previous installation and
-      users can easily revert to a previous version by changing one symbolic
-      link.</para>
-
-      <para>The <application>Qt</application> developers use a default location
-      of <filename class='directory'>/usr/local/qt/</filename>, however this
-      procedure puts the files in <filename
-      class='directory'>/opt/qt-&qt-version;/</filename>
-      and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
-
-<screen><userinput>bash
-export QTDIR=$PWD                                &amp;&amp;
-export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
-export PATH=$PWD/bin:$PATH                       &amp;&amp;
-
-patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch    &amp;&amp;
-
-./configure -prefix /opt/qt-&qt-version; \
-            -sysconfdir /etc/qt   \
-            -qt-gif               \
-            -system-zlib          \
-            -system-libpng        \
-            -system-libjpeg       \
-            -system-libmng        \
-            -plugin-imgfmt-png    \
-            -plugin-imgfmt-jpeg   \
-            -plugin-imgfmt-mng    \
-            -no-exceptions        \
-            -thread               \
-            -tablet &amp;&amp;
-
-make &amp;&amp;
-exit</userinput></screen>
-
-      <para>This package does not come with a test suite.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -v -sfn qt-&qt-version; /opt/qt &amp;&amp;
-ln -v -s libqt-mt.so /opt/qt/lib/libqt.so &amp;&amp;
-cp -v -r doc/man examples /opt/qt/doc</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf</command>:
-    In Method 1, <application>Qt</application> is being installed into
-    the standard system directories. The runtime library search path does not
-    need to be set in this case.</para>
-
-    <para><command>bash</command>: This command enters a sub-shell to isolate
-    environment changes.</para>
-
-    <para><command>export QTDIR=$PWD</command>: This command defines where
-    the root of the <application>Qt</application> directory is located.</para>
-
-    <para><command>export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH</command>:
-    This command allows the not yet installed <application>Qt</application>
-    libraries to be used by the not yet installed <application>Qt</application>
-    programs.</para>
-
-    <para><command>export PATH=$PWD/bin:$PATH</command>: This command
-    allows the build process to find supporting executables.</para>
-
-    <para><parameter>-qt-gif</parameter>: This switch adds support for
-    <filename>gif</filename> files to the libraries.</para>
-
-    <para><parameter>-system-zlib -system-libpng -system-libjpeg
-    -system-mng</parameter>: These switches force the build instructions to use
-    the shared libraries that are on your system instead of creating a custom
-    set of support libraries for these functions.</para>
-
-    <para><parameter>-plugin-imgfmt-png -plugin-imgfmt-jpeg
-    -plugin-imgfmt-mng</parameter>: These switches enable run-time linking of
-    the referenced libraries.</para>
-
-    <para>If you pass the
-    <option>-plugin-sql-<replaceable>&lt;driver&gt;</replaceable></option> or
-    <option>-qt-sql-<replaceable>&lt;driver&gt;</replaceable></option> switch
-    to the <command>configure</command> command, you must also pass
-    <option>-I<replaceable>&lt;/path/to/sql/headers&gt;</replaceable></option>
-    so <command>make</command> can find the appropriate header files.  For
-    instance, building in <application>MySQL</application> support (as opposed
-    to building the plugin) will need to use <option>-I/usr/include/mysql
-    -qt-sql-mysql</option>.</para>
-
-    <note>
-      <para>To check if <application>mysql</application> is autotetected
-      properly, examine the output of <command>./configure -I/usr/include/mysql
-      -help</command>. Other database support will require similar
-      <command>configure</command> parameters.</para>
-    </note>
-
-    <para><parameter>-no-exceptions</parameter>: This switch disables
-    the exceptions coding generated by the <application>C++</application>
-    compiler.</para>
-
-    <para><parameter>-thread</parameter>: This switch adds
-    support for multi-threading.</para>
-
-    <para><command>ln -v -sf libqt-mt.so /usr/lib/libqt.so</command>: This
-    command allows <command>configure</command> scripts to find a working
-    <application>Qt</application> installation.</para>
-
-    <para><command>ln -v -snf ../../bin /usr/share/qt/bin</command>: This
-    command and the following two allow the
-    <filename class="directory">/usr</filename> style installation to mimic
-    the <filename class="directory">/opt</filename> style installation by
-    making all binaries, headers and libraries available from a single
-    directory, <filename class="directory">/usr/share/qt</filename>.</para>
-
-    <para><command>cp -v -r doc/man examples /usr/share (or
-    /opt/qt/doc)</command>:
-    This command installs the man pages and examples which are missed by
-    <command>make install</command>.</para>
-
-    <para><command>exit</command>: This command returns to the parent shell
-    and eliminates the environment variables set earlier.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt</title>
-
-    <sect3 id='qt-config'>
-      <title>Configuration Information</title>
-
-      <para>The <envar>QTDIR</envar> environment variable needs to be set when
-      building packages that depend on <application>Qt</application>. Add the
-      following to the <filename>.bash_profile</filename> initialization script
-      for each user that builds packages using the <application>Qt</application>
-      libraries. Alternatively, the variable can be set in the system wide
-      <filename>/etc/profile</filename> file.</para>
-
-      <para>For Method 1 (This is optional, only set this if an application is
-      unable to find the installed libraries or headers):</para>
-
-<screen><literal>export QTDIR=/usr/share/qt</literal></screen>
-
-      <para>or for Method 2:</para>
-
-<screen><literal>export QTDIR=/opt/qt</literal></screen>
-
-      <para>If you installed <application>Qt</application> using Method 2,
-      you also need to update the following configuration files so that
-      <application>Qt</application> is correctly found by other packages
-      and system processes.</para>
-
-      <para>Update the <filename>/etc/ld.so.conf</filename> and
-      <filename>/etc/man_db.conf</filename> files:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin qt addition to /etc/ld.so.conf
-
-/opt/qt/lib
-
-# End qt addition</literal>
-EOF
-ldconfig &amp;&amp;
-cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
-<literal># Begin qt addition to man_db.conf
-
-MANDATORY_MANPATH /opt/qt/doc/man
-MANPATH_MAP       /opt/qt/bin         /opt/qt/doc/man
-MANDB_MAP         /opt/qt/doc/man     /var/cache/man/qt
-
-# End qt addition to man_db.conf</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-etc-man_db.conf">/etc/man_db.conf</primary>
-      </indexterm>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-etc-profile">/etc/profile</primary>
-      </indexterm>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-AA.bash_profile">~/.bash_profile</primary>
-      </indexterm>
-
-      <para>Update the <envar>PKG_CONFIG_PATH</envar> environment variable
-      in your <filename>~/.bash_profile</filename> or
-      <filename>/etc/profile</filename> with the following:</para>
-
-<screen><literal>PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig</literal></screen>
-
-      <para>If you want the <application>Qt</application> executables in your
-      shell search path, update the <envar>PATH</envar> environment variable
-      in your <filename>~/.bash_profile</filename> or
-      <filename>/etc/profile</filename> to include
-      <filename class='directory'>/opt/qt/bin</filename>.</para>
-
-      <tip><para>The PATH, MANPATH, and PKG_CONFIG_PATH can be updated in
-      the extrapaths.sh (or other script) in the /etc/profile.d directory
-      if you set up the startup files as recommended in
-      <xref linkend='postlfs-config-profile'/>.</para></tip>
-
-      <para>As with most libraries, there is no explicit configuration to do.
-      After updating <filename>/etc/ld.so.conf</filename> as explained above,
-      run <command>/sbin/ldconfig</command> so that <command>ldd</command>
-      can find the shared libraries.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>assistant, designer, linguist, lrelease, lupdate, moc,
-        qm2ts, qmake, qtconfig, and uic</seg>
-        <seg>libqt-mt.so, libqt.so libqui.so, libdesignercore.a,
-        libeditor.a, and libqassistantclient.a</seg>
-        <seg>/opt/qt-&qt-version; or /usr/lib/qt, /usr/share/qt,
-        /usr/share/doc/qt, /usr/include/qt, and /etc/qt</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>is a tool for presenting on-line documentation.</para>
-          <indexterm zone="qt assistant">
-            <primary sortas="b-assistant">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>is a full-fledged GUI builder. It includes
-          powerful features such as preview mode, automatic widget
-          layout, support for custom widgets, and an advanced
-          property editor.</para>
-          <indexterm zone="qt designer">
-            <primary sortas="b-designer">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>provides support for translating applications into
-          local languages. </para>
-          <indexterm zone="qt linguist">
-            <primary sortas="b-linguist">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>is a simple command line tool. It reads a Qt project
-          file and produces message files used by the application.</para>
-          <indexterm zone="qt lrelease">
-            <primary sortas="b-lrelease">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>reads a Qt project file, finds the translatable
-          strings in the specified source, header and Qt Designer
-          interface files, and produces or updates the translation
-          files listed in the project file.</para>
-          <indexterm zone="qt lupdate">
-            <primary sortas="b-lupdate">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="moc">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>generates Qt meta object support code.</para>
-          <indexterm zone="qt moc">
-            <primary sortas="b-moc">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qm2ts">
-        <term><command>qm2ts</command></term>
-        <listitem>
-          <para>is a tool for converting Qt message file formats.</para>
-          <indexterm zone="qt qm2ts">
-            <primary sortas="b-qm2ts">qm2ts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>qmake uses information stored in project files to
-          determine what should go in the makefiles it generates.</para>
-          <indexterm zone="qt qmake">
-            <primary sortas="b-qmake">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtconfig">
-        <term><command>qtconfig</command></term>
-        <listitem>
-          <para>is used to customize the appearance of Qt applications.</para>
-          <indexterm zone="qt qtconfig">
-            <primary sortas="b-qtconfig">qtconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>is a Qt user interface compiler.</para>
-          <indexterm zone="qt uic">
-            <primary sortas="b-uic">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/hwaccel/hwaccel.xml
===================================================================
--- multimedia/hwaccel/hwaccel.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
+++ multimedia/hwaccel/hwaccel.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<chapter id="multimedia-hwaccel">
+  <?dbhtml filename="hwaccel.html"?>
+
+  <title>Hardware Accelerated Video Decoding Libraries and Drivers</title>
+
+  <para>
+    This chapter contains libraries and hardware specific drivers which
+    provide interfaces to hardware video decoders. They enable hardware
+    accelerated video decoding in apps that support it.
+  </para>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libva.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau.xml"/>
+
+</chapter>
Index: multimedia/hwaccel/libva.xml
===================================================================
--- multimedia/hwaccel/libva.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
+++ multimedia/hwaccel/libva.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libva-http "http://www.freedesktop.org/software/vaapi/releases">
+
+  <!ENTITY libva-download-http "&libva-http;/libva/libva-&libva-version;.tar.bz2">
+  <!ENTITY libva-download-ftp  " ">
+  <!ENTITY libva-md5sum        "ca95b343050cf8feaf98dfe08ce0191b">
+  <!ENTITY libva-size          "896 KB">
+  <!ENTITY libva-buildsize     "20 MB">
+  <!ENTITY libva-time          "0.2 SBU">
+
+  <!ENTITY libva-intel-driver-download-http "&libva-http;/libva-intel-driver/libva-intel-driver-&libva-intel-driver-version;.tar.bz2">
+  <!ENTITY libva-intel-driver-download-ftp  " ">
+  <!ENTITY libva-intel-driver-md5sum        "afdd4c91ac552a14b4d0ce93b75c88bb">
+  <!ENTITY libva-intel-driver-size          "840 KB">
+  <!ENTITY libva-intel-driver-buildsize     "22 MB">
+  <!ENTITY libva-intel-driver-time          "0.1 SBU">
+]>
+
+<sect1 id="libva" xreflabel="libva-&libva-version;">
+  <?dbhtml filename="libva.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libva-&libva-version;</title>
+
+  <indexterm zone="libva">
+    <primary sortas="a-libva">libva</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libva</title>
+
+    <para>
+      The <application>libva</application> package contains a library which
+      provides access to hardware accelerated video processing, using hardware
+      to accelerate video processing in order to offload the central processing
+      unit (CPU) to decode and encode compressed digital video.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libva-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libva-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libva-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libva-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libva-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libva-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Intel Driver Download (HTTP): <ulink url="&libva-intel-driver-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Intel Driver Download (FTP): <ulink url="&libva-intel-driver-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Intel Driver Download MD5 sum: &libva-intel-driver-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Intel Driver Download size: &libva-intel-driver-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libva-intel-driver-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libva-intel-driver-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libva Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="mesalib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/> and
+      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libva"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libva</title>
+
+    <para>
+      Install <application>libva</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libva-intel-driver</title>
+
+    <para>
+      Install <application>libva-intel-driver</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Drivers</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          avcenc, h264encode, loadjpeg, mpeg2vaenc, mpeg2vldemo,
+          putsurface, putsurface_wayland and vainfo
+        </seg>
+        <seg>
+          libva-drm.so, libva-egl.so, libva-glx.so, libva.so,
+          libva-tpi.so, libva-wayland.so and libva-x11.so
+        </seg>
+        <seg>
+          dummy_drv_video.so and i965_drv_video.so
+        </seg>
+        <seg>
+          /usr/include/va
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libva-lib">
+        <term><filename class="libraryfile">libva.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions which provide access to hardware
+            accelerated video processing.
+          </para>
+          <indexterm zone="libva libva-lib">
+            <primary sortas="c-libva">libva.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/hwaccel/libvdpau.xml
===================================================================
--- multimedia/hwaccel/libvdpau.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
+++ multimedia/hwaccel/libvdpau.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libvdpau-download-http "http://people.freedesktop.org/~aplattner/vdpau/libvdpau-&libvdpau-version;.tar.gz">
+  <!ENTITY libvdpau-download-ftp  " ">
+  <!ENTITY libvdpau-md5sum        "cb81b0c3b7d32b2b2a51894ef05b95ce">
+  <!ENTITY libvdpau-size          "476 KB">
+  <!ENTITY libvdpau-buildsize     "4.0 MB">
+  <!ENTITY libvdpau-time          "0.1 SBU">
+]>
+
+<sect1 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;">
+  <?dbhtml filename="libvdpau.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libvdpau-&libvdpau-version;</title>
+
+  <indexterm zone="libvdpau">
+    <primary sortas="a-libvdpau">libvdpau</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libvdpau</title>
+
+    <para>
+      The <application>libvdpau</application> package contains a library which
+      allows video programs to offload portions of the video decoding process
+      and video post-processing to the GPU video-hardware.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libvdpau-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libvdpau-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libvdpau-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libvdpau-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libvdpau-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libvdpau-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libvdpau Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>,
+      <xref linkend="graphviz"/> and
+      <xref linkend="texlive"/>
+    </para>
+
+    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
+    <para role="optional">
+      <xref linkend="mesalib"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libvdpau"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libvdpau</title>
+
+    <para>
+      Install <application>libvdpau</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libvdpau.so
+        </seg>
+        <seg>
+          /usr/include/libvdpau and
+          /usr/lib/libvdpau
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libvdpau-lib">
+        <term><filename class="libraryfile">libvdpau.so</filename></term>
+        <listitem>
+          <para>
+            contains functions to offload portions of the video decoding
+            process and video post-processing to the GPU video-hardware.
+          </para>
+          <indexterm zone="libvdpau libvdpau-lib">
+            <primary sortas="c-libvdpau">libvdpau.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/multimedia.xml
===================================================================
--- multimedia/multimedia.xml	(revision 779ed51fa86b508399e46c024d252a787986e197)
+++ multimedia/multimedia.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
@@ -17,4 +17,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdriv/libdriv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hwaccel/hwaccel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audioutils/audioutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="videoutils/videoutils.xml"/>
Index: installing/libva.xml
===================================================================
--- x/installing/libva.xml	(revision 779ed51fa86b508399e46c024d252a787986e197)
+++ 	(revision )
@@ -1,237 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libva-http "http://www.freedesktop.org/software/vaapi/releases">
-
-  <!ENTITY libva-download-http "&libva-http;/libva/libva-&libva-version;.tar.bz2">
-  <!ENTITY libva-download-ftp  " ">
-  <!ENTITY libva-md5sum        "ca95b343050cf8feaf98dfe08ce0191b">
-  <!ENTITY libva-size          "896 KB">
-  <!ENTITY libva-buildsize     "20 MB">
-  <!ENTITY libva-time          "0.2 SBU">
-
-  <!ENTITY libva-intel-driver-download-http "&libva-http;/libva-intel-driver/libva-intel-driver-&libva-intel-driver-version;.tar.bz2">
-  <!ENTITY libva-intel-driver-download-ftp  " ">
-  <!ENTITY libva-intel-driver-md5sum        "afdd4c91ac552a14b4d0ce93b75c88bb">
-  <!ENTITY libva-intel-driver-size          "840 KB">
-  <!ENTITY libva-intel-driver-buildsize     "22 MB">
-  <!ENTITY libva-intel-driver-time          "0.1 SBU">
-]>
-
-<sect2 id="libva" xreflabel="libva-&libva-version;">
-
-  <sect2info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect2info>
-
-  <title>libva-&libva-version;</title>
-
-  <indexterm zone="libva">
-    <primary sortas="a-libva">libva</primary>
-  </indexterm>
-
-  <sect3 role="package">
-    <title>Introduction to libva</title>
-
-    <para> 
-       The <application>libva</application> package contains a library which
-       provides access to hardware accelerated video processing, using hardware
-       to accelerate video processing in order to offload the central
-       processing unit (CPU) to decode and encode compressed digital video.  VA
-       API video decode/encode interface is platform and window system
-       independent targeted at Direct Rendering Infrastructure (DRI) in the X
-       Window System however it can potentially also be used with direct
-       framebuffer and graphics sub-systems for video output. Accelerated
-       processing includes support for video decoding, video encoding,
-       subpicture blending, and rendering.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect4">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libva-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libva-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libva-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libva-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libva-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libva-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Intel Driver Download (HTTP): <ulink url="&libva-intel-driver-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Intel Driver Download (FTP): <ulink url="&libva-intel-driver-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Intel Driver Download MD5 sum: &libva-intel-driver-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Intel Driver Download size: &libva-intel-driver-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libva-intel-driver-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libva-intel-driver-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">libva Dependencies</bridgehead>
-
-    <bridgehead renderas="sect5">Required</bridgehead>
-    <para role="required">
-      <xref linkend="mesalib"/>
-    </para>
-
-    <bridgehead renderas="sect5">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libva"/>
-    </para>
-  </sect3>
-
-  <sect3 role="installation">
-    <title>Installation of libva</title>
-
-    <para>
-      Install <application>libva</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect3>
-
-  <sect3 role="installation">
-    <title>Installation of libva-intel-driver</title>
-
-    <para>
-      The <application>libva-intel-driver</application> is designed 
-      specifically for video cards based on an Intel GPU.  
-      Install the driver by running the following commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect3>
-
-  <sect3 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Drivers</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          avcenc, h264encode, loadjpeg, mpeg2vaenc, mpeg2vldemo,
-          putsurface, putsurface_wayland and vainfo
-        </seg>
-        <seg>
-          libva-drm.so, libva-egl.so, libva-glx.so, libva.so,
-          libva-tpi.so, libva-wayland.so and libva-x11.so
-        </seg>
-        <seg>
-          dummy_drv_video.so and i965_drv_video.so
-        </seg>
-        <seg>
-          /usr/include/va
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libva-lib">
-        <term><filename class="libraryfile">libva.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions which provide access to hardware
-            accelerated video processing.
-          </para>
-          <indexterm zone="libva libva-lib">
-            <primary sortas="c-libva">libva.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect3>
-
-</sect2>
Index: installing/libvdpau.xml
===================================================================
--- x/installing/libvdpau.xml	(revision 779ed51fa86b508399e46c024d252a787986e197)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libvdpau-download-http "http://people.freedesktop.org/~aplattner/vdpau/libvdpau-&libvdpau-version;.tar.gz">
-  <!ENTITY libvdpau-download-ftp  " ">
-  <!ENTITY libvdpau-md5sum        "cb81b0c3b7d32b2b2a51894ef05b95ce">
-  <!ENTITY libvdpau-size          "476 KB">
-  <!ENTITY libvdpau-buildsize     "4.0 MB">
-  <!ENTITY libvdpau-time          "0.1 SBU">
-]>
-
-<sect2 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;">
-
-  <sect2info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect2info>
-
-  <title>libvdpau-&libvdpau-version;</title>
-
-  <indexterm zone="libvdpau">
-    <primary sortas="a-libvdpau">libvdpau</primary>
-  </indexterm>
-
-  <sect3 role="package">
-    <title>Introduction to libvdpau</title>
-
-    <para>
-      The <application>libvdpau</application> package contains a library which
-      implements the VDPAU library.
-    </para>
-      
-    <para>
-      VDPAU (Video Decode and Presentation API for Unix) is an open source
-      library (libvdpau) and API originally designed by Nvidia for its GeForce
-      8 series and later GPU hardware,[1][2] targeted at the X Window System
-      This VDPAU API allows video programs to offload portions of the video
-      decoding process and video post-processing to the GPU video-hardware.
-   </para>
-
-   <para>
-      Currently, the portions capable of being offloaded by VDPAU onto the GPU
-      are motion compensation (mo comp), inverse discrete cosine transform
-      (iDCT), VLD (variable-length decoding) and deblocking for MPEG-1, MPEG-2,
-      MPEG-4 ASP (MPEG-4 Part 2), H.264/MPEG-4 AVC and VC-1, WMV3/WMV9 encoded
-      videos.  Which specific codecs of these that can be offloaded to the
-      GPU depends on the version of the GPU hardware; specifically,
-      to also decode MPEG-4 ASP (MPEG-4 Part 2), Xvid/OpenDivX (DivX 4), and
-      DivX 5 formats, a GeForce 200M (2xxM) Series (the eleventh generation of
-      Nvidia's GeForce graphics processing units) or newer GPU hardware is
-      required.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect4">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libvdpau-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libvdpau-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libvdpau-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libvdpau-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libvdpau-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libvdpau-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">libvdpau Dependencies</bridgehead>
-
-    <bridgehead renderas="sect5">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect5">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/> and
-      <xref linkend="texlive"/>
-    </para>
-
-    <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
-    <para role="optional">
-      <xref linkend="mesalib"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libvdpau"/>
-    </para>
-  </sect3>
-
-  <sect3 role="installation">
-    <title>Installation of libvdpau</title>
-
-    <para>
-      Install <application>libvdpau</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect3>
-
-  <sect3 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libvdpau.so
-        </seg>
-        <seg>
-          /usr/include/libvdpau and
-          /usr/lib/libvdpau
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libvdpau-lib">
-        <term><filename class="libraryfile">libvdpau.so</filename></term>
-        <listitem>
-          <para>
-            contains functions to offload portions of the video decoding
-            process and video post-processing to the GPU video-hardware.
-          </para>
-          <indexterm zone="libvdpau libvdpau-lib">
-            <primary sortas="c-libvdpau">libvdpau.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect3>
-
-</sect2>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 779ed51fa86b508399e46c024d252a787986e197)
+++ x/installing/x7driver.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
@@ -161,22 +161,4 @@
     </sect3>
 
-    <sect3 id="hw-video-acceleration">
-      <title>Hardware Video Acceleration</title>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            <xref linkend="libva"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <xref linkend="libvdpau"/>
-          </para>
-        </listitem> 
-      </itemizedlist>
-
-    </sect3>
-
   </sect2>
 
@@ -238,9 +220,3 @@
     href="x7driver-vmware.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libva.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libvdpau.xml"/>
-
 </sect1>
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision 779ed51fa86b508399e46c024d252a787986e197)
+++ x/lib/qt4.xml	(revision a7eaa89c1e3239a7f9fab40704e68bfdbecccbf8)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs74_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80,6 +80,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="alsa-lib"/> and
-      <xref linkend="mesalib"/> 
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="mesalib"/> and
+      <xref linkend="qtchooser"/>
     </para>
 
@@ -94,5 +95,5 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
-      <xref linkend="openssl"/>, and
+      <xref linkend="openssl"/> and
       <xref linkend="sqlite"/>
     </para>
@@ -105,6 +106,5 @@
       <xref linkend="mysql"/>,
       <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="qtchooser"/> (if also installing Qt5), and
+      <xref linkend="pulseaudio"/> and
       <xref linkend="unixodbc"/>
     </para>
@@ -118,49 +118,5 @@
     <title>Installation of Qt</title>
 
-    <para>
-
-       There are several ways to install a complicated package such as
-       <application>Qt</application>. The files are not completely position
-       independent. Installation procedures execute the program
-       <command>pkg-config</command> to determine the location of package
-       executables, libraries, headers, and other files. For
-       <application>Qt</application>, <command>pkg-config</command> will look
-       for the appropriate <filename>lib/pkgconfig/Qt*.pc</filename> files
-       which must be modified if relocating the package. These files are set up
-       correctly by the build process.
-    </para>
-    
-    <para>
-       The default installation places the files in <filename
-       class='directory'>/usr/local/qt/</filename>. Many commercial
-       distributions place the files in the system's <filename
-       class='directory'>/usr</filename> hierarchy. The package can also be
-       installed in an arbitrary directory.
-    </para>
-    
-    <para>
-       The advantage of installing in <filename
-       class='directory'>/usr</filename> is that no updates to the
-       <filename>/etc/ld.so.conf</filename> or
-       <filename>/etc/man_db.conf</filename> files are required. The package
-       files are distributed within several subdirectories of the <filename
-       class='directory'>/usr</filename> hierarchy.  This is the method that
-       most commercial distributions use.  It is also supported by the 
-       optional <application>qtchooser</application> application.
-    </para>
-
-    <para>
-       The advantage of installing <application>Qt4</application> in a custom
-       directory such as <filename
-       class='directory'>/opt/qt-&qt4-version;</filename> is that it keeps all
-       the package files consolidated in a dedicated directory hierarchy. By
-       using this method, an update can be made without overwriting a previous
-       installation and users can easily revert to a previous version by
-       changing one symbolic link or merely changing the PATH variable.  It
-       also allows a developer to maintain multiple versions of 
-       <application>Qt4</application> for testing.
-    </para>
-
-    <warning>
+   <warning>
       <para>
         If you did not install some of the recommended dependencies, examine
@@ -172,6 +128,5 @@
     <caution>
       <para>
-        If <application>Qt</application> is being reinstalled into the
-        same directory as an existing instance, run the
+        If <application>Qt</application> is being reinstalled, run the
         following commands from a console or non-Qt based window manager.
         It overwrites <application>Qt</application> libraries that should
@@ -189,6 +144,4 @@
     </note>
 
-    <bridgehead renderas="sect3">Method 1: Installing in /usr</bridgehead>
-
     <para>
       Install <application>Qt</application> by running the
@@ -199,29 +152,28 @@
      config.tests/unix/libmng/libmng.cpp &amp;&amp;
 
-./configure -prefix         /usr                 \
-            -bindir         /usr/lib/qt4/bin     \
-            -plugindir      /usr/lib/qt4/plugins \
-            -importdir      /usr/lib/qt4/imports \
-            -headerdir      /usr/include/qt4     \
-            -datadir        /usr/share/qt4       \
-            -sysconfdir     /etc/xdg             \
-            -docdir         /usr/share/doc/qt4   \
-            -demosdir       /usr/share/doc/qt4/demos    \
-            -examplesdir    /usr/share/doc/qt4/examples \
+./configure -confirm-license \
+            -opensource \
+            -release \
+            -prefix /usr \
+            -bindir /usr/lib/qt4/bin \
+            -headerdir /usr/include/qt4 \
+            -datadir /usr/share/qt4 \
+            -plugindir /usr/lib/qt4/plugins \
+            -importdir /usr/lib/qt4/imports \
             -translationdir /usr/share/qt4/translations \
-            -confirm-license   \
-            -opensource        \
-            -release           \
-            -dbus-linked       \
-            -openssl-linked    \
-            -system-sqlite     \
-            -no-phonon         \
+            -sysconfdir /etc/xdg \
+            -docdir /usr/share/doc/qt4 \
+            -demosdir /usr/share/doc/qt4/demos \
+            -examplesdir /usr/share/doc/qt4/examples \
+            -dbus-linked \
+            -openssl-linked \
+            -system-sqlite \
+            -no-phonon \
             -no-phonon-backend \
-            -no-nis            \
-            -no-openvg         \
-            -nomake demos      \
-            -nomake examples   \
-            -optimized-qmake   &amp;&amp;
-
+            -no-nis \
+            -no-openvg \
+            -nomake demos \
+            -nomake examples \
+            -optimized-qmake &amp;&amp;
 make</userinput></screen>
 
@@ -237,11 +189,11 @@
 rm -rf /usr/tests &amp;&amp;
 install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
-                  /usr/share/pixmaps/qt4logo.png       &amp;&amp;
+                  /usr/share/pixmaps/qt4logo.png &amp;&amp;
 install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
                   /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
 install -v -Dm644 tools/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
+                  /usr/share/pixmaps/designer-qt4.png &amp;&amp;
 install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
+                  /usr/share/pixmaps/linguist-qt4.png &amp;&amp;
 install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
                   /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen>
@@ -275,69 +227,4 @@
 done</userinput></screen>
 
-    <bridgehead renderas="sect3">Method 2: Installing in /opt/qt-&qt4-version;</bridgehead>
-
-    <para>
-      Install <application>Qt</application> in  /opt/qt-&qt4-version; 
-      by running the following commands:
-    </para>
-
-<screen><userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
-     config.tests/unix/libmng/libmng.cpp &amp;&amp;
-
-export QTDIR=/opt/qt-&qt4-version;
-
-./configure -prefix $QTDIR       \
-            -sysconfdir /etc/xdg \
-            -confirm-license     \
-            -opensource          \
-            -release             \
-            -dbus-linked         \
-            -openssl-linked      \
-            -system-sqlite       \
-            -plugin-sql-sqlite   \
-            -no-phonon           \
-            -no-phonon-backend   \
-            -no-nis              \
-            -no-openvg           \
-            -nomake demos        \
-            -nomake examples     \
-            -optimized-qmake     &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                 &amp;&amp;
-ln -svfn qt-$VERSION /opt/qt &amp;&amp;
-
-install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
-                  /usr/share/pixmaps/qt4logo.png       &amp;&amp;
-install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
-install -v -Dm644 tools/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
-install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
-install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed files by
-      running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
-            Designer Gui Help Multimedia Network OpenGL Script \
-            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml; do
-  sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
-       $QTDIR/lib/libQt${file}.prl
-  perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/Qt${file}.pc
-done
-
-unset file</userinput></screen>
-
   </sect2>
 
@@ -418,6 +305,5 @@
 
       <para>
-        If you installed <application>Qt</application> in /usr,
-        create an environment variable needed by certain packages.
+        Create an environment variable needed by certain packages.
         As the <systemitem class="username">root</systemitem> user:
       </para>
@@ -433,54 +319,10 @@
 EOF</userinput></screen>
 
-   <para>
-      If you installed <application>Qt</application> in a location other
-      than /usr, you need to update the following configuration files so
-      that <application>Qt</application> is correctly found by other packages
-      and system processes.</para>
-   
-      <para>As the <systemitem class="username">root</systemitem> user, update
-      the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-      run-time cache file:
-   </para>
-   
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-   <literal># Begin Qt addition
-   
-/opt/qt/lib
-   
-# End Qt addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-   
-   <indexterm zone="qt4 qtconfig-qt4">
-      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-   </indexterm>
-   
-   <para>
-      As the <systemitem class="username">root</systemitem> user, create
-      the <filename>/etc/profile.d/qt.sh</filename> file:
-   </para>
-   
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; EOF
-   <literal># Begin /etc/profile.d/qt.sh
-   
-QTDIR=/opt/qt
-   
-pathappend /opt/qt/bin           PATH
-pathappend /opt/qt/lib/pkgconfig PKG_CONFIG_PATH
-   
-export QTDIR
-   
-# End /etc/profile.d/qt.sh</literal>
-EOF</userinput></screen>
-
       <para>
-        For all methods, Create the menu entries for installed applications.
+        Create the menu entries for installed applications.
         As the <systemitem class="username">root</systemitem> user:
       </para>
 
 <screen role="root"><userinput>install -dm755 /usr/share/applications
-
 cat &gt; /usr/share/applications/qtconfig-qt4.desktop &lt;&lt; "EOF"
 <literal>[Desktop Entry]
@@ -494,5 +336,4 @@
 Categories=Qt;Settings;</literal>
 EOF
-
 cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; "EOF"
 <literal>[Desktop Entry]
@@ -506,5 +347,4 @@
 Categories=Qt;Development;Documentation;</literal>
 EOF
-
 cat &gt; /usr/share/applications/designer-qt4.desktop &lt;&lt; "EOF"
 <literal>[Desktop Entry]
@@ -519,5 +359,4 @@
 Categories=Qt;Development;</literal>
 EOF
-
 cat &gt; /usr/share/applications/linguist-qt4.desktop &lt;&lt; "EOF"
 <literal>[Desktop Entry]
@@ -532,5 +371,4 @@
 Categories=Qt;Development;</literal>
 EOF
-
 cat &gt; /usr/share/applications/qdbusviewer-qt4.desktop &lt;&lt; "EOF"
 <literal>[Desktop Entry]
@@ -579,6 +417,6 @@
           /usr/include/qt4,
           /usr/lib/qt4,
-          /usr/share/doc/qt4, and
-          /usr/share/qt4 (OR $QTDIR)
+          /usr/share/doc/qt4 and
+          /usr/share/qt4
         </seg>
       </seglistitem>
