Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 3f6492838765aa6ede5b7d48e82feeddbede0df6)
+++ multimedia/libdriv/libdriv.xml	(revision bc07d233abe6e31f34f5960d6d61adda5ffe93b4)
@@ -68,4 +68,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libva-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libva-drivers-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau-va-gl-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvorbis.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvpx.xml"/>
Index: multimedia/libdriv/libva-drivers-systemd.xml
===================================================================
--- multimedia/libdriv/libva-drivers-systemd.xml	(revision 3f6492838765aa6ede5b7d48e82feeddbede0df6)
+++ multimedia/libdriv/libva-drivers-systemd.xml	(revision bc07d233abe6e31f34f5960d6d61adda5ffe93b4)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="libva-drivers" xreflabel="libva Drivers">
+<sect1 id="libva-drivers" xreflabel="libva drivers">
   <?dbhtml filename="libva-drivers.html" ?>
 
@@ -14,12 +14,12 @@
   </sect1info>
 
-  <title>libva Drivers</title>
+  <title>libva drivers</title>
 
   <indexterm zone="libva-drivers">
-    <primary sortas="a-Python-Modules">libva Drivers</primary>
+    <primary sortas="a-Python-Modules">libva drivers</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to libva Drivers</title>
+    <title>Introduction to libva drivers</title>
 
     <para>
Index: multimedia/libdriv/libva-intel-driver-systemd.xml
===================================================================
--- multimedia/libdriv/libva-intel-driver-systemd.xml	(revision 3f6492838765aa6ede5b7d48e82feeddbede0df6)
+++ multimedia/libdriv/libva-intel-driver-systemd.xml	(revision bc07d233abe6e31f34f5960d6d61adda5ffe93b4)
@@ -15,8 +15,8 @@
 ]>
 
-  <!-- Begin libva Intel Driver -->
-  <sect2 id="libva-intel-driver" xreflabel="libva Intel Driver-&libva-intel-driver-version;">
+  <!-- Begin libva Intel driver -->
+  <sect2 id="libva-intel-driver" xreflabel="libva Intel driver-&libva-intel-driver-version;">
 
-    <title>libva Intel Driver-&libva-intel-driver-version;</title>
+    <title>libva Intel driver-&libva-intel-driver-version;</title>
 
     <indexterm zone="libva-intel-driver">
@@ -25,9 +25,9 @@
 
     <sect3 role="package">
-      <title>Introduction to libva Intel Driver</title>
+      <title>Introduction to libva Intel driver</title>
 
       <para>
-        The <application>libva Intel Driver</application> package contains the
-        <application>libva</application> Driver for Intel integrated video cards
+        The <application>libva Intel driver</application> package contains the
+        <application>libva</application> driver for Intel integrated video cards
         including 8xx, 9xx, Gxx, Qxx, and HD graphics processors (SandyBridge,
         IvyBridge, Haswell and Broadwell).
@@ -70,5 +70,5 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect4">libva Intel Driver Dependencies</bridgehead>
+      <bridgehead renderas="sect4">libva Intel driver Dependencies</bridgehead>
 
       <bridgehead renderas="sect5">Required</bridgehead>
@@ -89,8 +89,8 @@
 
     <sect3 role="installation">
-      <title>Installation of libva Intel Driver</title>
+      <title>Installation of libva Intel driver</title>
 
       <para>
-        Install <application>libva Intel Driver</application> by running the following
+        Install <application>libva Intel driver</application> by running the following
         commands:
       </para>
@@ -115,5 +115,5 @@
 
       <segmentedlist>
-        <segtitle>Installed libva Driver</segtitle>
+        <segtitle>Installed libva driver</segtitle>
 
         <seglistitem>
@@ -146,3 +146,3 @@
 
   </sect2>
-  <!-- End libva Intel Driver -->
+  <!-- End libva Intel driver -->
Index: multimedia/libdriv/libva-vdpau-driver-systemd.xml
===================================================================
--- multimedia/libdriv/libva-vdpau-driver-systemd.xml	(revision 3f6492838765aa6ede5b7d48e82feeddbede0df6)
+++ multimedia/libdriv/libva-vdpau-driver-systemd.xml	(revision bc07d233abe6e31f34f5960d6d61adda5ffe93b4)
@@ -15,8 +15,8 @@
 ]>
 
-  <!-- Begin libva VDPAU Driver -->
-  <sect2 id="libva-vdpau-driver" xreflabel="libva VDPAU Driver-&libva-vdpau-driver-version;">
+  <!-- Begin libva VDPAU driver -->
+  <sect2 id="libva-vdpau-driver" xreflabel="libva VDPAU driver-&libva-vdpau-driver-version;">
 
-    <title>libva VDPAU Driver-&libva-vdpau-driver-version;</title>
+    <title>libva VDPAU driver-&libva-vdpau-driver-version;</title>
 
     <indexterm zone="libva-vdpau-driver">
@@ -25,9 +25,9 @@
 
     <sect3 role="package">
-      <title>Introduction to libva VDPAU Driver</title>
+      <title>Introduction to libva VDPAU driver</title>
 
       <para>
-        The <application>libva VDPAU Driver</application> package contains the
-        <application>libva</application> Driver for hardware that supports
+        The <application>libva VDPAU driver</application> package contains the
+        <application>libva</application> driver for hardware that supports
         VDPAU.
       </para>
@@ -79,5 +79,5 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect4">libva VDPAU Driver Dependencies</bridgehead>
+      <bridgehead renderas="sect4">libva VDPAU driver Dependencies</bridgehead>
 
       <bridgehead renderas="sect5">Required</bridgehead>
@@ -93,8 +93,8 @@
 
     <sect3 role="installation">
-      <title>Installation of libva VDPAU Driver</title>
+      <title>Installation of libva VDPAU driver</title>
 
       <para>
-        Install <application>libva VDPAU Driver</application> by running the following
+        Install <application>libva VDPAU driver</application> by running the following
         commands:
       </para>
@@ -120,5 +120,5 @@
 
       <segmentedlist>
-        <segtitle>Installed libva Drivers</segtitle>
+        <segtitle>Installed libva drivers</segtitle>
 
         <seglistitem>
@@ -151,3 +151,3 @@
 
   </sect2>
-  <!-- End libva VDPAU Driver -->
+  <!-- End libva VDPAU driver -->
Index: multimedia/libdriv/libvdpau-systemd.xml
===================================================================
--- multimedia/libdriv/libvdpau-systemd.xml	(revision bc07d233abe6e31f34f5960d6d61adda5ffe93b4)
+++ multimedia/libdriv/libvdpau-systemd.xml	(revision bc07d233abe6e31f34f5960d6d61adda5ffe93b4)
@@ -0,0 +1,194 @@
+<?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        "acf68adc8b8ff4f72be6e8679abc284e">
+  <!ENTITY libvdpau-size          "476 KB">
+  <!ENTITY libvdpau-buildsize     "8.9 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
+      implements VDPAU.
+    </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 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>
+
+    &lfs75_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="sect5">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"/> (with the corresponding VDPAU driver) or
+      <xref linkend="libvdpau-va-gl"/>
+    </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 --disable-static &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="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</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/libdriv/libvdpau-va-gl-systemd.xml
===================================================================
--- multimedia/libdriv/libvdpau-va-gl-systemd.xml	(revision bc07d233abe6e31f34f5960d6d61adda5ffe93b4)
+++ multimedia/libdriv/libvdpau-va-gl-systemd.xml	(revision bc07d233abe6e31f34f5960d6d61adda5ffe93b4)
@@ -0,0 +1,191 @@
+<?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-va-gl-download-http "https://github.com/i-rinat/libvdpau-va-gl/archive/v&libvdpau-va-gl-version;.tar.gz">
+  <!ENTITY libvdpau-va-gl-download-ftp  " ">
+  <!ENTITY libvdpau-va-gl-md5sum        "09ceb2f75eafccc9b002d35ede0de6a5">
+  <!ENTITY libvdpau-va-gl-size          "100 KB">
+  <!ENTITY libvdpau-va-gl-buildsize     "4.0 MB">
+  <!ENTITY libvdpau-va-gl-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libvdpau-va-gl" xreflabel="libvdpau-va-gl-&libvdpau-va-gl-version;">
+  <?dbhtml filename="libvdpau-va-gl.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libvdpau-va-gl-&libvdpau-va-gl-version;</title>
+
+  <indexterm zone="libvdpau-va-gl">
+    <primary sortas="a-libvdpau-va-gl">libvdpau-va-gl</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libvdpau-va-gl</title>
+
+    <para>
+      The <application>libvdpau-va-gl</application> package contains
+      the VDPAU driver for hardware that supports VAAPI.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libvdpau-va-gl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libvdpau-va-gl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libvdpau-va-gl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libvdpau-va-gl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libvdpau-va-gl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libvdpau-va-gl-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>
+        The tarball name for libvdpau-va-gl does not include
+        the package name, although it does expand to
+        libvdpau-va-gl-&libvdpau-va-gl-version;.
+        The file should be renamed after downloading:
+      </para>
+
+<screen><command>mv v&libvdpau-va-gl-version;.tar.gz libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz</command></screen>
+    </note>
+
+    <bridgehead renderas="sect3">libvdpau-va-gl Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>,
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="glu"/>,
+      <xref linkend="libva"/>, and
+      <xref linkend="libvdpau"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libvdpau-va-gl"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libvdpau-va-gl</title>
+
+    <para>
+      Install <application>libvdpau-va-gl</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command> from an X terminal.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
+
+  </sect2>
+
+  <sect2 role="using">
+    <title>Using libvdpau-va-gl</title>
+
+    <para>
+      To use this driver with VDPAU apps, you need to set the <envar>VDPAU_DRIVER</envar>
+      environment variable to <parameter>va_gl</parameter>.
+    </para>
+
+    <para>
+      You can permanently set the environment variable by expanding the system
+      wide configuration. Run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/libvdpau-va-gl.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/libvdpau-va-gl.sh
+
+export VDPAU_DRIVER=va_gl
+
+# End /etc/profile.d/libvdpau-va-gl.sh</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed VDPAU Driver</segtitle>
+
+      <seglistitem>
+        <seg>
+          libvdpau_va_gl.so
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libvdpau_va_gl">
+        <term><filename class="libraryfile">libvdpau_va_gl.so</filename></term>
+        <listitem>
+          <para>
+            is a VDPAU driver for hardware that supports VAAPI.
+          </para>
+          <indexterm zone="libvdpau-va-gl libvdpau_va_gl">
+            <primary sortas="c-libvdpau_va_gl">libvdpau_va_gl.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 3f6492838765aa6ede5b7d48e82feeddbede0df6)
+++ x/installing/x7driver.xml	(revision bc07d233abe6e31f34f5960d6d61adda5ffe93b4)
@@ -166,13 +166,14 @@
     </sect3>
 
+<!--
     <sect3 id="hw-video-acceleration">
       <title>Hardware Video Acceleration</title>
 
       <itemizedlist spacing="compact">
-<!--        <listitem>
+        <listitem>
           <para>
             <xref linkend="libva"/>
           </para>
-        </listitem> -->
+        </listitem>
         <listitem>
           <para>
@@ -183,4 +184,5 @@
 
     </sect3>
+-->
 
   </sect2>
@@ -247,8 +249,8 @@
 
   <!-- <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"/>
+    href="libva.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="libvdpau.xml"/> -->
 
 </sect1>
