Update to libcanberra-0.28 by merging Wayne's version.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9199 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Ken Moffat 2012-01-25 00:52:39 +00:00
parent 8cd2dc5875
commit 171c0d5b9a
3 changed files with 95 additions and 27 deletions

View File

@ -826,7 +826,7 @@ $Date$
<!ENTITY libao-version "1.1.0">
<!ENTITY libogg-version "1.3.0">
<!ENTITY libvorbis-version "1.3.2">
<!ENTITY libcanberra-version "0.18">
<!ENTITY libcanberra-version "0.28">
<!ENTITY faad2-version "2.7">
<!ENTITY faac-version "1.28">
<!-- <!ENTITY nas-version "1.9.1"> -->

View File

@ -51,7 +51,7 @@
links may be broken in the gnome chapters for the moment.</para>
</listitem>
<listitem>
<para>[ken] - Update to libbonobo-2.32.1.</para>
<para>[ken] - Update to libbonobo-2.32.1, libcanberra-0.28.</para>
</listitem>
</itemizedlist>
</listitem>

View File

@ -6,10 +6,10 @@
<!ENTITY libcanberra-download-http "http://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.gz">
<!ENTITY libcanberra-download-ftp " ">
<!ENTITY libcanberra-md5sum "395e83f7eac48b3ce8372a714026c85d">
<!ENTITY libcanberra-size "448 KB">
<!ENTITY libcanberra-buildsize "5 MB">
<!ENTITY libcanberra-time "0.1 SBU">
<!ENTITY libcanberra-md5sum "c198b4811598c4c161ff505e4531b02c">
<!ENTITY libcanberra-size "476 KB">
<!ENTITY libcanberra-buildsize "6 MB">
<!ENTITY libcanberra-time "0.2 SBU">
]>
<sect1 id="libcanberra" xreflabel="libcanberra-&libcanberra-version;">
@ -33,7 +33,7 @@
XDG Sound Theme and Name Specifications, for generating event sounds on free
desktops, such as <application>GNOME</application>.</para>
&lfs65_checked;
&lfs70_built;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@ -67,6 +67,8 @@
<xref linkend="alsa-lib"/>,
<xref linkend="gstreamer"/>,
<xref linkend="gtk2"/>,
<xref linkend="gtk3"/>,
<xref linkend="gtk-doc"/>,
<xref linkend='pulseaudio'/>,
<xref linkend="xorg7-proto"/>, and
<ulink url="http://tdb.samba.org/">tdb</ulink>
@ -84,7 +86,7 @@
commands:</para>
<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
--with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas &amp;&amp;
--with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas &amp;&amp;
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@ -98,9 +100,12 @@ make</userinput></screen>
<sect2 role="commands">
<title>Command Explanations</title>
<para><option>--with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas</option>:
<para><option>--with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas</option>:
Omit this parameter if you are not installing
<application>libcanberra</application> for a GNOME-2 installation.</para>
<application>libcanberra</application> for a GNOME installation.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gtk-doc-rebuild.xml"/>
</sect2>
@ -113,12 +118,15 @@ make</userinput></screen>
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>canberra-gtk-play</seg>
<seg>libcanberra-gtk.so, libcanberra.so, libcanberra-multi.so,
libcanberra-null.so, libcanberra-oss.so, and
libcanberra-gtk-module.so</seg>
<seg>/usr/{lib/libcanberra-0.12,share/{doc/libcanberra,
gtk-doc/html/libcanberra}}</seg>
<seg>canberra-boot and canberra-gtk-play</seg>
<seg>libcanberra-alsa.so, libcanberra-gstreamer.so,
libcanberra-gtk-module.so, libcanberra-gtk.so,
libcanberra-gtk3-module.so, libcanberra-gtk3.so, libcanberra-multi.so,
libcanberra-null.so, libcanberra-oss.so, libcanberra-pulse.so, and
libcanberra.so</seg>
<seg>/usr/{lib/{gnome-settings-daemon-3.0/gtk-modules,libcanberra-0.28},
share/{doc/libcanberra,gdm/autostart/LoginWindow,gnome/{autostart,
shutdown},gtk-doc/html/libcanberra}}</seg>
</seglistitem>
</segmentedlist>
@ -127,6 +135,16 @@ make</userinput></screen>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
<!--<varlistentry id="canberra-boot">
<term><command>canberra-boot</command></term>
<listitem>
<para>does this .....</para>
<indexterm zone="libcanberra canberra-boot">
<primary sortas="b-canberra-boot">canberra-boot</primary>
</indexterm>
</listitem>
</varlistentry>-->
<varlistentry id="canberra-gtk-play">
<term><command>canberra-gtk-play</command></term>
<listitem>
@ -137,22 +155,62 @@ make</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="libcanberra-alsa">
<term><filename class='libraryfile'>libcanberra-alsa.so</filename></term>
<listitem>
<para>is an <application>ALSA</application> backend.</para>
<indexterm zone="libcanberra libcanberra-alsa">
<primary sortas="c-libcanberra-alsa">libcanberra-alsa.so</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libcanberra-gstreamer">
<term><filename class='libraryfile'>libcanberra-gstreamer.so</filename></term>
<listitem>
<para>is an <application>GStreamer</application> backend.</para>
<indexterm zone="libcanberra libcanberra-gstreamer">
<primary sortas="c-libcanberra-gstreamer">libcanberra-gstreamer.so</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libcanberra-gtk-module">
<term><filename class='libraryfile'>libcanberra-gtk-module.so</filename></term>
<listitem>
<para>contains Gtk+2 module functions.</para>
<indexterm zone="libcanberra libcanberra-gtk-module">
<primary sortas="c-libcanberra-gtk-module">libcanberra-gtk-module.so</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libcanberra-gtk">
<term><filename class='libraryfile'>libcanberra-gtk.so</filename></term>
<listitem>
<para>contains Gtk+ libcanberra bindings functions.</para>
<para>contains Gtk+2 libcanberra bindings functions.</para>
<indexterm zone="libcanberra libcanberra-gtk">
<primary sortas="c-libcanberra-gtk">libcanberra-gtk.so</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libcanberra-lib">
<term><filename class='libraryfile'>libcanberra.so</filename></term>
<varlistentry id="libcanberra-gtk3-module">
<term><filename class='libraryfile'>libcanberra-gtk3-module.so</filename></term>
<listitem>
<para>contains general libcanberra API functions.</para>
<indexterm zone="libcanberra libcanberra-lib">
<primary sortas="c-libcanberra">libcanberra.so</primary>
<para>contains Gtk+3 module functions.</para>
<indexterm zone="libcanberra libcanberra-gtk3-module">
<primary sortas="c-libcanberra-gtk3-module">libcanberra-gtk3-module.so</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libcanberra-gtk3">
<term><filename class='libraryfile'>libcanberra-gtk3.so</filename></term>
<listitem>
<para>contains Gtk+3 libcanberra bindings functions.</para>
<indexterm zone="libcanberra libcanberra-gtk3">
<primary sortas="c-libcanberra-gtk3">libcanberra-gtk3.so</primary>
</indexterm>
</listitem>
</varlistentry>
@ -187,12 +245,22 @@ make</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="libcanberra-gtk-module">
<term><filename class='libraryfile'>libcanberra-gtk-module.so</filename></term>
<varlistentry id="libcanberra-pulse">
<term><filename class='libraryfile'>libcanberra-pulse.so</filename></term>
<listitem>
<para>contains Gtk+ module functions.</para>
<indexterm zone="libcanberra libcanberra-gtk-module">
<primary sortas="c-libcanberra-gtk-module">libcanberra-gtk-module.so</primary>
<para>is an <application>PulseAudio</application> backend.</para>
<indexterm zone="libcanberra libcanberra-pulse">
<primary sortas="c-libcanberra-pulse">libcanberra-pulse.so</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libcanberra-lib">
<term><filename class='libraryfile'>libcanberra.so</filename></term>
<listitem>
<para>contains general libcanberra API functions.</para>
<indexterm zone="libcanberra libcanberra-lib">
<primary sortas="c-libcanberra">libcanberra.so</primary>
</indexterm>
</listitem>
</varlistentry>