Index: archive/agg.xml
===================================================================
--- archive/agg.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
+++ archive/agg.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -0,0 +1,206 @@
+<?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 agg-download-http
+    "http://www.antigrain.com/agg-&agg-version;.tar.gz">-->
+  <!ENTITY agg-download-http
+    "http://pkgs.fedoraproject.org/repo/pkgs/agg/agg-&agg-version;.tar.gz/&agg-md5sum;/agg-&agg-version;.tar.gz">
+  <!ENTITY agg-download-ftp  " ">
+  <!ENTITY agg-md5sum        "0229a488bc47be10a2fee6cf0b2febd6">
+  <!ENTITY agg-size          "552 KB">
+  <!ENTITY agg-buildsize     "122 MB">
+  <!ENTITY agg-time          "1.2 SBU">
+]>
+
+<sect1 id="agg" xreflabel="agg-&agg-version;">
+  <?dbhtml filename="agg.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>agg-&agg-version;</title>
+
+  <indexterm zone="agg">
+    <primary sortas="a-agg">agg</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to agg</title>
+
+    <para>
+      The Anti-Grain Geometry (AGG) package contains a general purpose C++
+      graphical toolkit. It can be used in many areas of computer programming
+      where high quality 2D graphics is an essential part of the project.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&agg-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&agg-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &agg-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &agg-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &agg-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &agg-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">agg Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="sdl"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/agg"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of agg</title>
+
+    <para>
+      Install <application>agg</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>sed -i 's:  -L@x_libraries@::' src/platform/X11/Makefile.am &amp;&amp;
+sed -i '/^AM_C_PROTOTYPES/d'   configure.in                 &amp;&amp;
+
+bash autogen.sh --prefix=/usr --disable-static &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="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i 's:  -L@x_libraries@::'
+      src/platform/X11/Makefile.am</command>: This fixes compiling with the
+      current Xorg Libraries.
+    </para>
+
+    <para>
+      <command>sed -i '/^AM_C_PROTOTYPES/d' configure.in</command>: this fixes
+      reconfiguring with the current version of <command>automake</command>.
+    </para>
+
+    <para>
+      <command>bash autogen.sh</command>: This script uses autotools to create
+      the configure script, then it runs configure with the given arguments.
+    </para>
+
+    <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 Directory</segtitle>
+
+      <seglistitem>
+	<seg>
+	  None
+	</seg>
+        <seg>
+          libagg.so,
+          libaggfontfreetype.so,
+          libaggplatformsdl.so, and
+          libaggplatformX11.so
+        </seg>
+        <seg>/usr/include/agg2</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libagg">
+        <term><filename class="libraryfile">libagg.so</filename></term>
+        <listitem>
+          <para>contains the AGG API functions.</para>
+          <indexterm zone="agg libagg">
+            <primary sortas="c-libagg">libagg.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libaggfontfreetype">
+        <term><filename class="libraryfile">libaggfontfreetype.so</filename></term>
+        <listitem>
+          <para>contains the AGG freetype font API functions.</para>
+          <indexterm zone="agg libaggfontfreetype">
+            <primary sortas="c-libaggfontfreetype">libaggfontfreetype.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libaggplatformsdl">
+        <term><filename class="libraryfile">libaggplatformsdl.so</filename></term>
+        <listitem>
+          <para>contains the AGG SDL API functions that.</para>
+          <indexterm zone="agg libaggplatformsdl">
+            <primary sortas="c-libaggplatformsdl">libaggplatformsdl.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libaggplatformX11">
+        <term><filename class="libraryfile">libaggplatformX11.so</filename></term>
+        <listitem>
+          <para>contains the AGG LibX11 API functions.</para>
+          <indexterm zone="agg libaggplatformX11">
+            <primary sortas="c-libaggplatformX11">libaggplatformX11.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ general.ent	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -72,5 +72,5 @@
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20150209">
+<!ENTITY blfs-bootscripts-version     "20150304">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ general/genlib/ptlib.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -94,12 +94,12 @@
     <para role="optional">
       <xref linkend="cyrus-sasl"/>,
-      <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
-      <ulink url="http://www.linux1394.org/">libraw1394</ulink>,
       <xref linkend="lua"/>,
       <xref linkend="openldap"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="sdl"/>,
-      <xref linkend="unixodbc"/>, and
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>
+      <xref linkend="unixodbc"/>, 
+      <xref linkend="v4l-utils"/>, 
+      <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>, and
+      <ulink url="http://www.linux1394.org/">libraw1394</ulink>,
     </para>
 
Index: gnome/applications/cheese.xml
===================================================================
--- gnome/applications/cheese.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ gnome/applications/cheese.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -80,6 +80,5 @@
       <xref linkend="gnome-video-effects"/>,
       <xref linkend="gst10-plugins-bad"/>,
-      <xref linkend="gst10-plugins-good"/> (built with 
-         <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>),
+      <xref linkend="gst10-plugins-good"/> (built with <xref linkend="v4l-utils"/>),
       <xref linkend="itstool"/>,
       <xref linkend="libcanberra"/>,
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ introduction/welcome/changelog.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -46,6 +46,12 @@
 
     <listitem>
-      <para>March 4th, 2015</para>
-      <itemizedlist>
+      <para>March 4rd, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Archive unneeded agg library.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cups-filters-1.0.66.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Split the JAVA environment configuration from
@@ -63,5 +69,4 @@
       <para>March 3rd, 2015</para>
       <itemizedlist>
-
         <listitem>
           <para>[bdubbs] - Add a sed to elfutils to fix a potential
Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -111,4 +111,5 @@
       <xref linkend="speex"/>,
       <xref linkend="taglib"/>,
+      <xref linkend="v4l-utils"/>,
       <ulink url="http://www.jackaudio.org">JACK</ulink>,
       <ulink url="http://sourceforge.net/projects/libavc1394/">libavc1394</ulink>
@@ -119,6 +120,5 @@
       <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/">libiec61883</ulink>,
       <ulink url="http://downloads.us.xiph.org/releases/libshout/">libshout</ulink>,
-      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink> and
+      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>, and
       <ulink url="http://www.wavpack.com/">WavPack</ulink>
     </para>
Index: multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ multimedia/libdriv/gst10-plugins-good.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -113,4 +113,5 @@
       <xref linkend="udev-extras"/> (for GUdev),
       <xref linkend="valgrind"/>,
+      <xref linkend='v4l-utils'/>,
       <ulink url="http://jackaudio.org/">JACK</ulink>,
       <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>,
@@ -118,6 +119,5 @@
       <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
       <ulink url="http://www.icecast.org/download.php">libshout</ulink>,
-      <ulink url="http://code.entropywave.com/orc/">ORC</ulink>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>, and
+      <ulink url="http://code.entropywave.com/orc/">ORC</ulink>, and
       <ulink url="http://wavpack.com/">WavPack</ulink>
     </para>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ multimedia/libdriv/libdriv.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -77,4 +77,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="speex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="taglib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="v4l-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x264.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xine-lib.xml"/>
Index: multimedia/libdriv/v4l-utils.xml
===================================================================
--- multimedia/libdriv/v4l-utils.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
+++ multimedia/libdriv/v4l-utils.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -0,0 +1,256 @@
+<?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 v4l-download-http "http://www.linuxtv.org/downloads/v4l-utils/v4l-utils-&v4l-utils-version;/.tar.bz2">
+  <!ENTITY v4l-download-ftp  " ">
+  <!ENTITY v4l-md5sum        "9cb3c178f937954e65bf30920af433ef">
+  <!ENTITY v4l-size          "1.1 MB">
+  <!ENTITY v4l-buildsize     "63 MB">
+  <!ENTITY v4l-time          "0.5 SBU">
+]>
+
+<sect1 id="v4l-utils" xreflabel="v4l-utils-&v4l-utils-version;">
+  <?dbhtml filename="atk.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy: bdubbs $</othername>
+    <date>$Date: 2015-02-21 22:09:10 -0600 (Sat, 21 Feb 2015) $</date>
+  </sect1info>
+
+  <title>v4l-utils-&v4l-utils-version;</title>
+
+  <indexterm zone="v4l-utils">
+    <primary sortas="a-v4l-utils">v4l-utils</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to v4l-utils</title>
+
+    <para>
+      <application>v4l-utils</application> provides  a series of utilities for
+      media devices, allowing to handle the proprietary formats available at
+      most webcams (libv4l), and providing tools to test V4L devices. 
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&v4l-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&v4l-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &v4l-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &v4l-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &v4l-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &v4l-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">v4l-utils Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glu"/>,
+      <xref linkend="libjpeg"/>, and
+      <xref linkend="mesalib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="optional">
+      <xref linkend="alsa-lib"/> and
+      <xref linkend="qt4"/> or
+      <xref linkend="qt5"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/v4l-utils"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of v4l-utils</title>
+
+    <para>
+      Install <application>v4l-utils</application> by running
+      the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </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>
+          x18-ctl,
+          decode_tm6000,
+          dvb-fe-tool,
+          dvb-format-convert,
+          dvbv5-scan,
+          dvbv5-zap,
+          ir-keytable,
+          ivtv-ctl,
+          media-ctl,
+          qv4l2,
+          rds-ctl,
+          v4l2-compliance,
+          v4l2-ctl,
+          v4l2-dbg, and
+          v4l2-sysfs-path
+        </seg>
+        <seg>
+          libdvbv5.so,
+          libv4l-mplane.so,
+          libv4l1.so,
+          libv4l2.so,
+          libv4l2rds.so,
+          libv4lconvert.so,
+          v4l1compat.so, and
+          v4l2convert.so
+        </seg>
+        <seg>
+          /lib/udev/rc_keymaps
+          /usr/include/libdvbv5, 
+          /usr/lib/libv4l, and 
+          /usr/lib/libv4l/plugins 
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="dvb-fe-tool">
+        <term><command>dvb-fe-tool</command></term>
+        <listitem>
+          <para>
+            is a command line tool for digital TV services.
+          </para>
+          <indexterm zone="v4l-utils dvb-fe-tool">
+            <primary sortas="b-dvb-fe-tool">dvb-fe-tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dvb-format-convert">
+        <term><command>dvb-format-convert</command></term>
+        <listitem>
+          <para>
+            is a tool meant to convert among different file formats.  It is
+            compliant with version 5 of the DVB API.
+          </para>
+          <indexterm zone="v4l-utils dvb-format-convert">
+            <primary sortas="b-dvb-format-convert">dvb-format-convert</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dvbv5-scan">
+        <term><command>dvbv5-scan</command></term>
+        <listitem>
+          <para>
+            is  command line frequency scanning tool for digital TV 
+            services that are compliant with version 5 of the DVB API.
+          </para>
+          <indexterm zone="v4l-utils dvbv5-scan">
+            <primary sortas="b-dvbv5-scan">dvbv5-scan</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dvbv5-zap">
+        <term><command>dvbv5-zap</command></term>
+        <listitem>
+          <para>
+            is a command line tuning tool for digital TV services 
+            that is compliant with version 5 of the DVB API.
+          </para>
+          <indexterm zone="v4l-utils dvbv5-zap">
+            <primary sortas="b-dvbv5-zap">dvbv5-zap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ir-keytable">
+        <term><command>ir-keytable</command></term>
+        <listitem>
+          <para>
+            is a tool that lists the Remote Controller devices, allows one 
+            to get/set IR keycode/scancode tables, test events generated by 
+            IR, and to adjust other Remote Controller options.
+          </para>
+          <indexterm zone="v4l-utils ir-keytable">
+            <primary sortas="b-ir-keytable">ir-keytable</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qv4l2">
+        <term><command>qv4l2</command></term>
+        <listitem>
+          <para>
+            is  used  to  test video4linux capture devices.
+          </para>
+          <indexterm zone="v4l-utils qv4l2">
+            <primary sortas="b-qv4l2">qv4l2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ multimedia/libdriv/xine-lib.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -100,4 +100,5 @@
       <xref linkend="speex"/>,
       <xref linkend="doxygen"/> (to create the API documentation),
+      <xref linkend="v4l-utils"/>
       <ulink url="http://www.directfb.org">DirectFB</ulink>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
@@ -107,6 +108,5 @@
       <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
       <ulink url="http://www.musepack.net/">musepack</ulink>,
-      <ulink url="http://ftp.gnu.org/gnu/vcdimager/">VCDImager</ulink>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>, and
+      <ulink url="http://ftp.gnu.org/gnu/vcdimager/">VCDImager</ulink>, and
       <ulink url="http://www.wavpack.com/">WavPack</ulink>,
     </para>
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ multimedia/videoutils/ffmpeg.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -114,4 +114,5 @@
       <xref linkend="fontconfig"/>,
       <xref linkend="opus"/>,
+      <xref linkend="v4l-utils"/>,
 <!--  <ulink url="http://www.piksel.org/frei0r">frei0r</ulink>,-->
       <ulink url="https://files.dyne.org/frei0r/snapshots/">frei0r</ulink>,
@@ -138,5 +139,4 @@
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>) for PDF and PS documentation,
       <ulink url="http://www.twolame.org/">TwoLAME</ulink>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>,
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ multimedia/videoutils/transcode.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -114,10 +114,10 @@
       <xref linkend="libxml2"/>,
       <xref linkend="lzo"/>,
-      <ulink url="http://sourceforge.net/projects/mjpeg/">MJPEG Tools</ulink>,
+      <xref linkend="sdl"/>,
+      <xref linkend="v4l-utils"/>,
+      <xref linkend="x264"/>, 
+      <xref linkend="xvid"/>
+      <ulink url="http://sourceforge.net/projects/mjpeg/">MJPEG Tools</ulink>, and
       <ulink url="http://www.netlib.org/pvm3/">PVM3</ulink>,
-      <xref linkend="sdl"/>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
-      <xref linkend="x264"/>, and
-      <xref linkend="xvid"/>
     </para>
 
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ multimedia/videoutils/vlc.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -102,4 +102,5 @@
       <xref linkend="libdvdnav"/>,
       <xref linkend="samba"/>,
+      <xref linkend="v4l-utils"/>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
@@ -107,6 +108,5 @@
       <ulink url="http://code.google.com/p/libproxy/">libproxy</ulink>,
       <ulink url="http://www.live555.com/">Live555</ulink>,
-      <ulink url="http://sourceforge.net/projects/opencvlibrary/">OpenCV</ulink>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>, and
+      <ulink url="http://sourceforge.net/projects/opencvlibrary/">OpenCV</ulink>, and
       <ulink url="http://www.gnu.org/software/vcdimager/">VCDImager</ulink>
       (requires <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>)
Index: packages.ent
===================================================================
--- packages.ent	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ packages.ent	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -677,4 +677,5 @@
 <!ENTITY speexdsp-version             "1.2rc3">
 <!ENTITY taglib-version               "1.9.1">
+<!ENTITY v4l-utils-version            "1.6.2">
 <!ENTITY x264-version                 "20141208-2245">
 <!ENTITY xine-lib-version             "1.2.6">
@@ -717,5 +718,5 @@
 <!-- Chapter 42 -->
 <!ENTITY cups-version                 "2.0.2">
-<!ENTITY cups-filters-version         "1.0.65">
+<!ENTITY cups-filters-version         "1.0.66">
 <!ENTITY gs-version                   "9.15">
 <!ENTITY gutenprint-version           "5.2.10">
Index: pst/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ pst/printing/cups-filters.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -8,7 +8,7 @@
   "https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
   <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "20dea125408bfebd25a58a884a78a13c">
+  <!ENTITY cups-filters-md5sum        "ad594ac06dfbfb02af34deb0805cab00">
   <!ENTITY cups-filters-size          "1.3 MB">
-  <!ENTITY cups-filters-buildsize     "36 MB (additional 2 MB for the tests)">
+  <!ENTITY cups-filters-buildsize     "34 MB (additional 2 MB for the tests)">
   <!ENTITY cups-filters-time          "0.4 SBU">
 ]>
@@ -73,5 +73,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -83,5 +83,5 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">CUPS Filters Dependencies</bridgehead>
 
@@ -128,8 +128,9 @@
       commands:
     </para>
-
-<screen><userinput>patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler_fix-1.patch &amp;&amp;
-
-./configure --prefix=/usr                   \
+<!--
+<userinput>patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler_fix-1.patch &amp;&amp;
+-->
+
+<screen><userinput>./configure --prefix=/usr                   \
             --sysconfdir=/etc               \
             --localstatedir=/var            \
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ pst/scanning/sane.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -137,8 +137,8 @@
       <xref linkend="libtiff"/>,
       <xref linkend="libusb"/>,
+      <xref linkend="v4l-utils"/>,
       <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
       <ulink url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>,
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>, and
+      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>, and
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
     </para>
Index: lib/agg.xml
===================================================================
--- x/lib/agg.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ 	(revision )
@@ -1,206 +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 agg-download-http
-    "http://www.antigrain.com/agg-&agg-version;.tar.gz">-->
-  <!ENTITY agg-download-http
-    "http://pkgs.fedoraproject.org/repo/pkgs/agg/agg-&agg-version;.tar.gz/&agg-md5sum;/agg-&agg-version;.tar.gz">
-  <!ENTITY agg-download-ftp  " ">
-  <!ENTITY agg-md5sum        "0229a488bc47be10a2fee6cf0b2febd6">
-  <!ENTITY agg-size          "552 KB">
-  <!ENTITY agg-buildsize     "122 MB">
-  <!ENTITY agg-time          "1.2 SBU">
-]>
-
-<sect1 id="agg" xreflabel="agg-&agg-version;">
-  <?dbhtml filename="agg.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>agg-&agg-version;</title>
-
-  <indexterm zone="agg">
-    <primary sortas="a-agg">agg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to agg</title>
-
-    <para>
-      The Anti-Grain Geometry (AGG) package contains a general purpose C++
-      graphical toolkit. It can be used in many areas of computer programming
-      where high quality 2D graphics is an essential part of the project.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&agg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&agg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &agg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &agg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &agg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &agg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">agg Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sdl"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/agg"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of agg</title>
-
-    <para>
-      Install <application>agg</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's:  -L@x_libraries@::' src/platform/X11/Makefile.am &amp;&amp;
-sed -i '/^AM_C_PROTOTYPES/d'   configure.in                 &amp;&amp;
-
-bash autogen.sh --prefix=/usr --disable-static &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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's:  -L@x_libraries@::'
-      src/platform/X11/Makefile.am</command>: This fixes compiling with the
-      current Xorg Libraries.
-    </para>
-
-    <para>
-      <command>sed -i '/^AM_C_PROTOTYPES/d' configure.in</command>: this fixes
-      reconfiguring with the current version of <command>automake</command>.
-    </para>
-
-    <para>
-      <command>bash autogen.sh</command>: This script uses autotools to create
-      the configure script, then it runs configure with the given arguments.
-    </para>
-
-    <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 Directory</segtitle>
-
-      <seglistitem>
-	<seg>
-	  None
-	</seg>
-        <seg>
-          libagg.so,
-          libaggfontfreetype.so,
-          libaggplatformsdl.so, and
-          libaggplatformX11.so
-        </seg>
-        <seg>/usr/include/agg2</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libagg">
-        <term><filename class="libraryfile">libagg.so</filename></term>
-        <listitem>
-          <para>contains the AGG API functions.</para>
-          <indexterm zone="agg libagg">
-            <primary sortas="c-libagg">libagg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaggfontfreetype">
-        <term><filename class="libraryfile">libaggfontfreetype.so</filename></term>
-        <listitem>
-          <para>contains the AGG freetype font API functions.</para>
-          <indexterm zone="agg libaggfontfreetype">
-            <primary sortas="c-libaggfontfreetype">libaggfontfreetype.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaggplatformsdl">
-        <term><filename class="libraryfile">libaggplatformsdl.so</filename></term>
-        <listitem>
-          <para>contains the AGG SDL API functions that.</para>
-          <indexterm zone="agg libaggplatformsdl">
-            <primary sortas="c-libaggplatformsdl">libaggplatformsdl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaggplatformX11">
-        <term><filename class="libraryfile">libaggplatformX11.so</filename></term>
-        <listitem>
-          <para>contains the AGG LibX11 API functions.</para>
-          <indexterm zone="agg libaggplatformX11">
-            <primary sortas="c-libaggplatformX11">libaggplatformX11.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 58cba7f0df711f0ad067a21458a0de53b0c1f682)
+++ x/lib/lib.xml	(revision 80dbc4c897ff97f7b3aa0c035e4525f60fad9b7b)
@@ -25,5 +25,4 @@
   assist programmers by supplying common elements.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="agg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atkmm.xml"/>
