Author: bdubbs
Date: 2011-12-12 17:02:58 -0700 (Mon, 12 Dec 2011)
New Revision: 9106
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/graphlib/giflib.xml
trunk/BOOK/general/graphlib/imlib2.xml
trunk/BOOK/gnome/add/gnome-media.xml
trunk/BOOK/gnome/core/gnome-settings-daemon.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/kde/add/kdemultimedia.xml
trunk/BOOK/kde4/core/phonon.xml
trunk/BOOK/kde4/core/qimageblitz.xml
trunk/BOOK/kde4/core/shrdesktopontologies.xml
trunk/BOOK/multimedia/audioutils/audacious.xml
trunk/BOOK/multimedia/audioutils/mpg123.xml
trunk/BOOK/multimedia/libdriv/alsa-plugins.xml
trunk/BOOK/multimedia/libdriv/libao.xml
trunk/BOOK/multimedia/libdriv/libcanberra.xml
trunk/BOOK/multimedia/libdriv/sdl.xml
trunk/BOOK/multimedia/libdriv/xine-lib.xml
trunk/BOOK/multimedia/videoutils/mplayer.xml
trunk/BOOK/x/lib/qt4.xml
trunk/BOOK/x/wm/fluxbox.xml
Log:
Update to internal pulseaudio links
Modified: trunk/BOOK/general/graphlib/giflib.xml
===================================================================
--- trunk/BOOK/general/graphlib/giflib.xml 2011-12-12 21:18:46 UTC (rev
9105)
+++ trunk/BOOK/general/graphlib/giflib.xml 2011-12-13 00:02:58 UTC (rev
9106)
@@ -37,7 +37,7 @@
wishing to deal with GIF files while the programs are useful for conversion
purposes as well as cleaning up images.</para>
- &lfs67_checked;
+ &lfs70_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/graphlib/imlib2.xml
===================================================================
--- trunk/BOOK/general/graphlib/imlib2.xml 2011-12-12 21:18:46 UTC (rev
9105)
+++ trunk/BOOK/general/graphlib/imlib2.xml 2011-12-13 00:02:58 UTC (rev
9106)
@@ -6,10 +6,10 @@
<!ENTITY imlib2-download-http
"&sourceforge-repo;/enlightenment/imlib2-&imlib2-version;.tar.bz2">
<!ENTITY imlib2-download-ftp " ">
- <!ENTITY imlib2-md5sum "b6de51879502e857d5b1f7622267a0300">
- <!ENTITY imlib2-size "888 KB">
+ <!ENTITY imlib2-md5sum "859e5fede51ec819f4314eee11da3ea5">
+ <!ENTITY imlib2-size "880 KB">
<!ENTITY imlib2-buildsize "14 MB">
- <!ENTITY imlib2-time "0.4 SBU">
+ <!ENTITY imlib2-time "0.3 SBU">
]>
<sect1 id="imlib2" xreflabel="Imlib2-&imlib2-version;">
@@ -32,6 +32,8 @@
<para><application>Imlib2</application> is a graphics library for fast file
loading, saving, rendering and manipulation.</para>
+ &lfs70_checked;
+
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
@@ -54,14 +56,6 @@
</listitem>
</itemizedlist>
- <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing='compact'>
- <listitem>
- <para>Required Patch: <ulink
-
url="&patch-root;/imlib2-&imlib2-version;-CVE-2008-5187.patch"/></para>
- </listitem>
- </itemizedlist> -->
-
<bridgehead renderas="sect3">Imlib2 Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2011-12-12 21:18:46 UTC (rev 9105)
+++ trunk/BOOK/general.ent 2011-12-13 00:02:58 UTC (rev 9106)
@@ -237,7 +237,7 @@
<!ENTITY libart_lgpl-version "2.3.21">
<!ENTITY librsvg-version "2.26.3">
<!ENTITY aalib-version "1.4rc5">
-<!ENTITY imlib2-version "1.4.4">
+<!ENTITY imlib2-version "1.4.5">
<!ENTITY libexif-version "0.6.19">
<!ENTITY exiv2-version "0.21">
<!ENTITY fribidi-version "0.10.9">
@@ -580,7 +580,7 @@
<!-- Chapter 27 -->
<!ENTITY sawfish-version "1.6.1">
-<!ENTITY fluxbox-version "1.1.1">
+<!ENTITY fluxbox-version "1.3.2">
<!ENTITY metacity-version "2.30.1">
<!-- Unmaintained
Modified: trunk/BOOK/gnome/add/gnome-media.xml
===================================================================
--- trunk/BOOK/gnome/add/gnome-media.xml 2011-12-12 21:18:46 UTC (rev
9105)
+++ trunk/BOOK/gnome/add/gnome-media.xml 2011-12-13 00:02:58 UTC (rev
9106)
@@ -59,20 +59,23 @@
<bridgehead renderas="sect3">GNOME Media Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required"><xref linkend="GConf"/>,
- <xref linkend="gnome-doc-utils"/>
- <xref linkend="gstreamer"/>,
- <xref linkend="gtk2"/>, and
- <xref linkend="which"/></para>
+ <para role="required">
+ <xref linkend="GConf"/>,
+ <xref linkend="gnome-doc-utils"/>
+ <xref linkend="gstreamer"/>,
+ <xref linkend="gtk2"/>, and
+ <xref linkend="which"/>
+ </para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="gst-plugins-base"/> (required to build the sound mixer and
- recorder),
- <xref linkend="libcanberra"/>,
- <xref linkend="libunique"/>,
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink>, and
- <xref linkend="rarian"/></para>
+ <xref linkend="gst-plugins-base"/> (required to build the sound mixer and
+ recorder),
+ <xref linkend="libcanberra"/>,
+ <xref linkend="libunique"/>,
+ <xref linkend="pulseaudio"/>, and
+ <xref linkend="rarian"/>
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/gnome-media"/></para>
Modified: trunk/BOOK/gnome/core/gnome-settings-daemon.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-settings-daemon.xml 2011-12-12 21:18:46 UTC
(rev 9105)
+++ trunk/BOOK/gnome/core/gnome-settings-daemon.xml 2011-12-13 00:02:58 UTC
(rev 9106)
@@ -64,9 +64,11 @@
<xref linkend="libgnomekbd"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><xref linkend="libcanberra"/>, and
- <xref linkend="libnotify"/>, and
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink></para>
+ <para role="optional">
+ <xref linkend="libcanberra"/>, and
+ <xref linkend="libnotify"/>,
+ <xref linkend="pulseaudio"/>
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/gnome-settings-daemon"/></para>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2011-12-12 21:18:46 UTC
(rev 9105)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2011-12-13 00:02:58 UTC
(rev 9106)
@@ -45,6 +45,12 @@
<para>December 12th, 2011</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Updated to fluxbox-1.3.2.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Updated to inlib2-1.4.5.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Updated to sawfish-1.6.1.</para>
</listitem>
<listitem>
Modified: trunk/BOOK/kde/add/kdemultimedia.xml
===================================================================
--- trunk/BOOK/kde/add/kdemultimedia.xml 2011-12-12 21:18:46 UTC (rev
9105)
+++ trunk/BOOK/kde/add/kdemultimedia.xml 2011-12-13 00:02:58 UTC (rev
9106)
@@ -94,17 +94,19 @@
<bridgehead renderas="sect3">Akode Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><!-- <xref linkend="pkgconfig"/>, -->
- <xref linkend="flac"/>,
- <xref linkend="speex"/>,
- <xref linkend="libmad"/>,
- <xref linkend="alsa"/>,
- <xref linkend="libvorbis"/>,
- <ulink url="http://www.mega-nerd.com/libsamplerate/";>Secret Rabbit
- Code</ulink> (a.k.a. libsamplerate),
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink>,
- <ulink url="http://jackit.sourceforge.net/";>JACK</ulink>, and
- <xref linkend="ffmpeg"/> (support is experimental)</para>
+ <para role="optional">
+ <!-- <xref linkend="pkgconfig"/>, -->
+ <xref linkend="flac"/>,
+ <xref linkend="speex"/>,
+ <xref linkend="libmad"/>,
+ <xref linkend="alsa"/>,
+ <xref linkend="libvorbis"/>,
+ <xref linkend="pulseaudio"/>,
+ <xref linkend="ffmpeg"/> (support is experimental),
+ <ulink url="http://www.mega-nerd.com/libsamplerate/";>Secret Rabbit
+ Code</ulink> (a.k.a. libsamplerate), and
+ <ulink url="http://jackit.sourceforge.net/";>JACK</ulink>
+ </para>
<bridgehead renderas="sect3">Installation of Akode</bridgehead>
Modified: trunk/BOOK/kde4/core/phonon.xml
===================================================================
--- trunk/BOOK/kde4/core/phonon.xml 2011-12-12 21:18:46 UTC (rev 9105)
+++ trunk/BOOK/kde4/core/phonon.xml 2011-12-13 00:02:58 UTC (rev 9106)
@@ -83,7 +83,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink>
+ <xref linkend='pulseaudio'/>
</para>
<para condition="html" role="usernotes">User Notes:
Modified: trunk/BOOK/kde4/core/qimageblitz.xml
===================================================================
--- trunk/BOOK/kde4/core/qimageblitz.xml 2011-12-12 21:18:46 UTC (rev
9105)
+++ trunk/BOOK/kde4/core/qimageblitz.xml 2011-12-13 00:02:58 UTC (rev
9106)
@@ -82,7 +82,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink>
+ <xref linkend='pulseaudio'/>
</para>
<para condition="html" role="usernotes">User Notes:
Modified: trunk/BOOK/kde4/core/shrdesktopontologies.xml
===================================================================
--- trunk/BOOK/kde4/core/shrdesktopontologies.xml 2011-12-12 21:18:46 UTC
(rev 9105)
+++ trunk/BOOK/kde4/core/shrdesktopontologies.xml 2011-12-13 00:02:58 UTC
(rev 9106)
@@ -82,7 +82,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink>
+ <xref linkend='pulseaudio'/>
</para>
-->
<para condition="html" role="usernotes">User Notes:
Modified: trunk/BOOK/multimedia/audioutils/audacious.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/audacious.xml 2011-12-12 21:18:46 UTC
(rev 9105)
+++ trunk/BOOK/multimedia/audioutils/audacious.xml 2011-12-13 00:02:58 UTC
(rev 9106)
@@ -95,31 +95,33 @@
<bridgehead renderas="sect4">Optional (for Plugins)</bridgehead>
- <para role="optional"><xref linkend="alsa"/>,
- <xref linkend="curl"/>,
- <xref linkend="neon"/> (for online mpg3 and ogg radio),
- <xref linkend="lame"/>,
- <xref linkend="flac"/>,
- <xref linkend="libvorbis"/>,
- <xref linkend="faad2"/>,
- <xref linkend="ffmpeg"/>,
- <xref linkend="sdl"/>,
- <xref linkend="mpg123"/>,
- <xref linkend="libnotify"/>,
- <ulink url="http://adplug.sourceforge.net/";>AdPlug</ulink>,
- <ulink url="http://www.gnu.org/software/libcdio/";>libcdio</ulink>,
- <ulink url="http://sourceforge.net/projects/libmms";>libmms</ulink>,
- <ulink url="http://www.mega-nerd.com/libsndfile/";>libsndfile</ulink>,
- <ulink url="http://jackit.sourceforge.net/";>JACK</ulink>,
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink>,
- <ulink url="http://roaraudio.keep-cool.org/";>libroar</ulink>,
- <ulink
url="http://sourceforge.net/apps/trac/fluidsynth/";>FluidSynth</ulink>,
- <ulink url="http://libmtp.sourceforge.net/";>libmtp</ulink>,
- <ulink url="http://sourceforge.net/projects/libcue/";>libcue</ulink>,
- <ulink url="http://sourceforge.net/projects/bs2b/";>The Bauer
- stereophonic-to-binaural DSP (bs2b) library</ulink>,
- <ulink url="http://sourceforge.net/projects/libbinio/";>libbinio</ulink>
- and <ulink url="http://www.wavpack.com/";>WavPack</ulink>.</para>
+ <para role="optional">
+ <xref linkend="alsa"/>,
+ <xref linkend="curl"/>,
+ <xref linkend="neon"/> (for online mpg3 and ogg radio),
+ <xref linkend="lame"/>,
+ <xref linkend="flac"/>,
+ <xref linkend="libvorbis"/>,
+ <xref linkend="faad2"/>,
+ <xref linkend="ffmpeg"/>,
+ <xref linkend="sdl"/>,
+ <xref linkend="mpg123"/>,
+ <xref linkend="libnotify"/>,
+ <xref linkend='pulseaudio'/>,
+ <ulink url="http://adplug.sourceforge.net/";>AdPlug</ulink>,
+ <ulink url="http://www.gnu.org/software/libcdio/";>libcdio</ulink>,
+ <ulink url="http://sourceforge.net/projects/libmms";>libmms</ulink>,
+ <ulink url="http://www.mega-nerd.com/libsndfile/";>libsndfile</ulink>,
+ <ulink url="http://jackit.sourceforge.net/";>JACK</ulink>,
+ <ulink url="http://roaraudio.keep-cool.org/";>libroar</ulink>,
+ <ulink
url="http://sourceforge.net/apps/trac/fluidsynth/";>FluidSynth</ulink>,
+ <ulink url="http://libmtp.sourceforge.net/";>libmtp</ulink>,
+ <ulink url="http://sourceforge.net/projects/libcue/";>libcue</ulink>,
+ <ulink url="http://sourceforge.net/projects/bs2b/";>The Bauer
+ stereophonic-to-binaural DSP (bs2b) library</ulink>,
+ <ulink url="http://sourceforge.net/projects/libbinio/";>libbinio</ulink>,
and
+ <ulink url="http://www.wavpack.com/";>WavPack</ulink>.
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/audacious"/></para>
Modified: trunk/BOOK/multimedia/audioutils/mpg123.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/mpg123.xml 2011-12-12 21:18:46 UTC (rev
9105)
+++ trunk/BOOK/multimedia/audioutils/mpg123.xml 2011-12-13 00:02:58 UTC (rev
9106)
@@ -66,10 +66,10 @@
<xref linkend="alsa-lib"/>,
<xref linkend="arts"/>,
<xref linkend="esound"/>,
+ <xref linkend='pulseaudio'/>,
<ulink url="http://jackaudio.org";>JACK</ulink>,
<!-- <xref linkend="nas"/>, -->
<ulink url="http://www.portaudio.com";>PortAudio</ulink>,
- <ulink url="http://pulseaudio.org";>PulseAudio</ulink>,
<xref linkend="sdl"/></para>
<para condition="html" role="usernotes">User Notes:
Modified: trunk/BOOK/multimedia/libdriv/alsa-plugins.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/alsa-plugins.xml 2011-12-12 21:18:46 UTC
(rev 9105)
+++ trunk/BOOK/multimedia/libdriv/alsa-plugins.xml 2011-12-13 00:02:58 UTC
(rev 9106)
@@ -69,12 +69,14 @@
<xref linkend="alsa-lib"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><xref linkend="ffmpeg"/>,
- <xref linkend="speex"/>,
- <ulink url="http://jackaudio.org/";>JACK</ulink>,
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink>, and
- <ulink url="http://www.mega-nerd.com/libsamplerate/";>Secret Rabbit
- Code</ulink> (a.k.a. libsamplerate)</para>
+ <para role="optional">
+ <xref linkend="ffmpeg"/>,
+ <xref linkend="speex"/>,
+ <xref linkend='pulseaudio'/>,
+ <ulink url="http://jackaudio.org/";>JACK</ulink>, and
+ <ulink url="http://www.mega-nerd.com/libsamplerate/";>Secret Rabbit
+ Code</ulink> (a.k.a. libsamplerate)
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/alsa-plugins"/></para>
Modified: trunk/BOOK/multimedia/libdriv/libao.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/libao.xml 2011-12-12 21:18:46 UTC (rev
9105)
+++ trunk/BOOK/multimedia/libdriv/libao.xml 2011-12-13 00:02:58 UTC (rev
9106)
@@ -62,13 +62,13 @@
<bridgehead renderas="sect3">Libao Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><xref linkend="x-window-system"/>,
- <xref linkend="esound"/>,
- <xref linkend="alsa"/>,
- <xref linkend="arts"/>, and
-<!-- <xref linkend="nas"/>, and -->
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink> (requires <ulink
-
url="http://www.hpl.hp.com/research/linux/atomic_ops/";>atomic_ops</ulink>)</para>
+ <para role="optional">
+ <xref linkend="x-window-system"/>,
+ <xref linkend="esound"/>,
+ <xref linkend="alsa"/>,
+ <xref linkend="arts"/>, and
+ <xref linkend='pulseaudio'/> (requires <xref linkend='libatomic_ops'/>)
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/libao"/></para>
Modified: trunk/BOOK/multimedia/libdriv/libcanberra.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/libcanberra.xml 2011-12-12 21:18:46 UTC
(rev 9105)
+++ trunk/BOOK/multimedia/libdriv/libcanberra.xml 2011-12-13 00:02:58 UTC
(rev 9106)
@@ -63,12 +63,14 @@
<para role="required"><xref linkend="libvorbis"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><xref linkend="alsa-lib"/>,
- <xref linkend="gstreamer"/>,
- <xref linkend="gtk2"/>,
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink>,
- <ulink url="http://tdb.samba.org/";>tdb</ulink>,
- <xref linkend="xorg7-proto"/></para>
+ <para role="optional">
+ <xref linkend="alsa-lib"/>,
+ <xref linkend="gstreamer"/>,
+ <xref linkend="gtk2"/>,
+ <xref linkend='pulseaudio'/>,
+ <xref linkend="xorg7-proto"/>, and
+ <ulink url="http://tdb.samba.org/";>tdb</ulink>
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/libcanberra"/></para>
Modified: trunk/BOOK/multimedia/libdriv/sdl.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/sdl.xml 2011-12-12 21:18:46 UTC (rev
9105)
+++ trunk/BOOK/multimedia/libdriv/sdl.xml 2011-12-13 00:02:58 UTC (rev
9106)
@@ -58,22 +58,24 @@
<bridgehead renderas="sect3">SDL Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><xref linkend="alsa"/>,
- <xref linkend="esound"/>,
- <ulink url="http://pulseaudio.org";>PulseAudio</ulink>,
- <xref linkend="arts"/>,
-<!-- <xref linkend="nas"/>, -->
- <xref linkend="NASM"/>,
- <xref linkend="libusb"/>,
- <xref linkend="x-window-system"/>,
- <ulink url="http://www.directfb.org/";>DirectFB</ulink>,
- <ulink url="http://www.ggi-project.org/";>GGI</ulink>,
- <ulink url="http://my.arava.co.il/~matan/svgalib/";>SVGAlib-1.9.5</ulink>
- (<ulink
url="&patch-root;/svgalib-1.9.25-megafixes-1.patch">patched</ulink>),
- <xref linkend="aalib"/>,
- <ulink url="http://caca.zoy.org/wiki/libcaca";>libcaca</ulink>,
- <ulink url="http://picogui.org/";>PicoGUI</ulink>, and
- <xref linkend="pth"/></para>
+ <para role="optional">
+ <xref linkend="alsa"/>,
+ <xref linkend="esound"/>,
+ <xref linkend='pulseaudio'/>
+ <xref linkend="arts"/>,
+ <!--<xref linkend="nas"/>,-->
+ <xref linkend="NASM"/>,
+ <xref linkend="libusb"/>,
+ <xref linkend="x-window-system"/>,
+ <xref linkend="aalib"/>,
+ <xref linkend="pth"/>,
+ <ulink url="http://www.directfb.org/";>DirectFB</ulink>,
+ <ulink url="http://www.ggi-project.org/";>GGI</ulink>,
+ <ulink url="http://my.arava.co.il/~matan/svgalib/";>SVGAlib-1.9.5</ulink>
+ (<ulink
url="&patch-root;/svgalib-1.9.25-megafixes-1.patch">patched</ulink>),
+ <ulink url="http://caca.zoy.org/wiki/libcaca";>libcaca</ulink>, and
+ <ulink url="http://picogui.org/";>PicoGUI</ulink>
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/sdl"/></para>
Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml 2011-12-12 21:18:46 UTC (rev
9105)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml 2011-12-13 00:02:58 UTC (rev
9106)
@@ -61,11 +61,15 @@
<bridgehead renderas="sect3">Xine Libraries Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required"><xref linkend="x-window-system"/> and at least one
of:
- <xref linkend="alsa"/>, <xref linkend="esound"/>, OSS,
- <xref linkend="arts"/>,
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink> or
- <ulink url="http://jackaudio.org/";>JACK</ulink></para>
+ <para role="required">
+ <xref linkend="x-window-system"/> and at least one of:
+ <xref linkend="alsa"/>,
+ <xref linkend="esound"/>,
+ OSS,
+ <xref linkend="arts"/>,
+ <xref linkend='pulseaudio'/> or
+ <ulink url="http://jackaudio.org/";>JACK</ulink>
+ </para>
<!-- <bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended"><xref linkend="pkgconfig"/></para> -->
Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml 2011-12-12 21:18:46 UTC
(rev 9105)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml 2011-12-13 00:02:58 UTC
(rev 9106)
@@ -175,16 +175,18 @@
<ulink url="http://dl.matroska.org/downloads/libebml/";>libebml</ulink>),
-->
<bridgehead renderas="sect4">Optional Audio Output Drivers and
Libraries</bridgehead>
- <para role="optional"><xref linkend="alsa"/>,
- <xref linkend="arts"/>,
- <xref linkend="esound"/>,
- <ulink url="http://jackit.sourceforge.net/";>JACK</ulink>,
- <ulink url="http://www.ladspa.org/";>LADSPA</ulink>,
-<!-- <xref linkend="nas"/>, -->
- <ulink url="http://openal.org/";>OpenAL</ulink>,
- <ulink url="http://pulseaudio.org/";>PulseAudio</ulink>, and
- <xref linkend="sdl"/> (also used for video output)<!--, and
- <xref linkend="xmms"/>--></para>
+ <para role="optional">
+ <xref linkend="alsa"/>,
+ <xref linkend="arts"/>,
+ <xref linkend="esound"/>,
+ <xref linkend='pulseaudio'/>,
+ <xref linkend="sdl"/> (also used for video output),
+ <ulink url="http://jackit.sourceforge.net/";>JACK</ulink>,
+ <ulink url="http://www.ladspa.org/";>LADSPA</ulink>, and
+ <ulink url="http://openal.org/";>OpenAL</ulink>
+ <!--<xref linkend="nas"/>,-->
+ <!--<xref linkend="xmms"/>-->
+ </para>
<bridgehead renderas="sect4">Optional Video Output Drivers and
Libraries</bridgehead>
<para role="optional"><xref linkend="aalib"/>,
Modified: trunk/BOOK/x/lib/qt4.xml
===================================================================
--- trunk/BOOK/x/lib/qt4.xml 2011-12-12 21:18:46 UTC (rev 9105)
+++ trunk/BOOK/x/lib/qt4.xml 2011-12-13 00:02:58 UTC (rev 9106)
@@ -71,10 +71,10 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
-<!-- <xref linkend="nas"/>, -->
+ <!--<xref linkend="nas"/>,-->
<xref linkend="dbus"/>,
<xref linkend="gst-plugins-base"/>,
- <ulink url="http://www.pulseaudio.org/";>PulseAudio</ulink>,
+ <xref linkend='pulseaudio'/>,
<xref linkend="glib2"/>,
<xref linkend="gtk2"/>,
<xref linkend="openssl"/>,
Modified: trunk/BOOK/x/wm/fluxbox.xml
===================================================================
--- trunk/BOOK/x/wm/fluxbox.xml 2011-12-12 21:18:46 UTC (rev 9105)
+++ trunk/BOOK/x/wm/fluxbox.xml 2011-12-13 00:02:58 UTC (rev 9106)
@@ -5,11 +5,11 @@
%general-entities;
<!ENTITY fluxbox-download-http
"&sourceforge-repo;/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
- <!ENTITY fluxbox-download-ftp
"&gentoo-ftp-repo;/fluxbox-&fluxbox-version;.tar.bz2">
- <!ENTITY fluxbox-md5sum "fa9fa8fe9a44f86522de5754f8b285ca">
- <!ENTITY fluxbox-size "760 KB">
- <!ENTITY fluxbox-buildsize "62 MB">
- <!ENTITY fluxbox-time "1 SBU">
+ <!ENTITY fluxbox-download-ftp
"&gentoo-ftp-repo;/fluxbox-&fluxbox-version;.tar.">
+ <!ENTITY fluxbox-md5sum "f95b0bdb9ee41bfac124bd0fc601f248">
+ <!ENTITY fluxbox-size "776 KB">
+ <!ENTITY fluxbox-buildsize "135 MB">
+ <!ENTITY fluxbox-time "1.1 SBU">
]>
<sect1 id="fluxbox" xreflabel="Fluxbox-&fluxbox-version;">
@@ -32,7 +32,7 @@
<para>The <application>Fluxbox</application> package contains a window
manager.</para>
- &lfs65_checked;
+ &lfs70_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -179,10 +179,8 @@
point to the actual image you want to use.</para>
<screen><userinput>cp /usr/share/fluxbox/styles/<theme> ~/.fluxbox/theme
&&
-sed -i 's,\(session.styleFile:\).*,\1 ~/.fluxbox/theme,' \
- ~/.fluxbox/init &&
-echo "background.pixmap: </path/to/nice/image.xpm>" >> ~/.fluxbox/theme
-</userinput></screen>
+sed -i 's,\(session.styleFile:\).*,\1 ~/.fluxbox/theme,' ~/.fluxbox/init
&&
+echo "background.pixmap: </path/to/nice/image.xpm>" >>
~/.fluxbox/theme</userinput></screen>
<para>In some locales the font specified in the theme may not contain the
needed characters. This results in menus with blank items. You can fix
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
