Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 0a07e657fb8f0ef38b8ea004caf436d9a29e5661)
+++ multimedia/libdriv/libdriv.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,94 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-]>
+<chapter id="multimedia-libdriv">
+<?dbhtml filename="libdriv.html" dir="multimedia"?>
+<title>Multimedia Libraries and Drivers</title>
 
-<chapter id="multimedia-libdriv">
-  <?dbhtml filename="libdriv.html"?>
+<para>Many multimedia programs require libraries and/or drivers in order 
+to function properly.  The packages in this section fall into this category.
+Generally you only need to install these if you are installing a program
+which has the library listed as either a requirement, or as an option to
+enable it to support certain functionality.</para>
 
-  <title>Multimedia Libraries and Drivers</title>
-
-  <para>
-    Many multimedia programs require libraries and/or drivers in order
-    to function properly.  The packages in this section fall into this category.
-    Generally you only need to install these if you are installing a program
-    which has the library listed as either a requirement, or as an option to
-    enable it to support certain functionality.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-plugins.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-firmware.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-oss.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audiofile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faac.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faad2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fdk-aac.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flac.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="frei0r.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gavl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer10.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-base.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-good.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-bad.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-ugly.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-libav.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer10-vaapi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="id3lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intel-media.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intel-vaapi-driver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liba52.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libao.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libaom.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libass.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcanberra.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcddb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcdio.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdiscid.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdcss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdread.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdnav.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmad.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmpeg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libogg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libplacebo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libquicktime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsamplerate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsndfile.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtheora.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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau-va-gl.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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mlt.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opal.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pipewire.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pulseaudio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sbc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sdl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sdl2.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sound-theme-freedesktop.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soundtouch.xml"/>
-  <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="wireplumber.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="x265.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xine-lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xvid.xml"/>
+&alsa;
+&arts;
+&audiofile;
+&esound;
+&SDL;
+&libao;
+&libogg;
+&libvorbis;
 
 </chapter>
