[blfs-book] r11741 - in trunk/BOOK: general/genlib multimedia/audioutils multimedia/cdwriteutils multimedia/libdriv multimedia/videoutils networking/netlibs

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Sun Sep 1 15:01:22 PDT 2013


Author: bdubbs
Date: Sun Sep  1 15:01:22 2013
New Revision: 11741

Log:
Tags for remaining multimedia sections of the book

Modified:
   trunk/BOOK/general/genlib/ptlib.xml
   trunk/BOOK/multimedia/audioutils/amarok.xml
   trunk/BOOK/multimedia/audioutils/freetts.xml
   trunk/BOOK/multimedia/cdwriteutils/dvd+rw-tools.xml
   trunk/BOOK/multimedia/cdwriteutils/k3b.xml
   trunk/BOOK/multimedia/libdriv/alsa-firmware.xml
   trunk/BOOK/multimedia/libdriv/alsa-oss.xml
   trunk/BOOK/multimedia/libdriv/alsa-tools.xml
   trunk/BOOK/multimedia/libdriv/farstream.xml
   trunk/BOOK/multimedia/libdriv/libao.xml
   trunk/BOOK/multimedia/libdriv/libdiscid.xml
   trunk/BOOK/multimedia/libdriv/libdvdcss.xml
   trunk/BOOK/multimedia/libdriv/libmpeg3.xml
   trunk/BOOK/multimedia/libdriv/libmusicbrainz.xml
   trunk/BOOK/multimedia/libdriv/libquicktime.xml
   trunk/BOOK/multimedia/libdriv/opal.xml
   trunk/BOOK/multimedia/libdriv/soundtouch.xml
   trunk/BOOK/multimedia/libdriv/xine-lib.xml
   trunk/BOOK/multimedia/videoutils/mplayer.xml
   trunk/BOOK/multimedia/videoutils/transcode.xml
   trunk/BOOK/multimedia/videoutils/xine-ui.xml
   trunk/BOOK/networking/netlibs/libnice.xml

Modified: trunk/BOOK/general/genlib/ptlib.xml
==============================================================================
--- trunk/BOOK/general/genlib/ptlib.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/general/genlib/ptlib.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -36,7 +36,7 @@
       various platforms.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -92,7 +92,7 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="alsa-lib"/>,
-      <xref linkend="expat"/> and
+      <xref linkend="expat"/>, and
       <xref linkend="openssl"/>
     </para>
 
@@ -105,7 +105,7 @@
       <xref linkend="openldap"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="sdl"/>,
-      <xref linkend="unixodbc"/> and
+      <xref linkend="unixodbc"/>, and
       <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>
     </para>
 
@@ -122,12 +122,8 @@
       commands:
     </para>
 
-<screen><userinput><!-- sed -i -e "/SDWORD/s:^://:" \ 
-       -e "/UDWORD/s:^://:" include/ptlib/unix/ptlib/contain.h &&
+<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-1.patch &&
 
-What does this do anyways? Builds fine without it.
-
--->patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-1.patch &&
 ./configure --prefix=/usr &&
 make</userinput></screen>
 
@@ -162,7 +158,7 @@
         <seg>
           /usr/include/ptclib,
           /usr/include/ptlib,
-          /usr/lib/ptlib-&ptlib-version; and
+          /usr/lib/ptlib-&ptlib-version;, and
           /usr/share/ptlib
         </seg>
       </seglistitem>

Modified: trunk/BOOK/multimedia/audioutils/amarok.xml
==============================================================================
--- trunk/BOOK/multimedia/audioutils/amarok.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/audioutils/amarok.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -36,7 +36,7 @@
       several digital music players including Apple's iPod.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -77,13 +77,13 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="kdelibs"/>,
-      <xref linkend="mysql"/> and
+      <xref linkend="mysql"/>, and
       <xref linkend="taglib"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="ffmpeg"/> and
+      <xref linkend="ffmpeg"/>, and
       <xref linkend="nepomuk-core"/>
     </para>
 
@@ -101,7 +101,7 @@
       <ulink url="http://wiki.gpodder.org/wiki/Libmygpo-qt">libmygpo-qt</ulink> (for gpodder.net podcast support),
       <ulink url="http://code.google.com/p/musicip-libofa">libofa</ulink> (for MusicDNS support),
       <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink> (for MP3tunes integration),
-      <ulink url="http://code.google.com/p/qtscriptgenerator/">qtscript-qt</ulink> and
+      <ulink url="http://code.google.com/p/qtscriptgenerator/">qtscript-qt</ulink>, and
       <ulink url="http://code.google.com/p/googlemock/">Google Mock</ulink> (for tests)
     </para>
 
@@ -155,12 +155,12 @@
       <seglistitem>
         <seg>
           amarok, amarok_afttagger, amarokcollectionscanner,
-          amarokpkg and amzdownloader
+          amarokpkg, and amzdownloader
         </seg>
         <seg>
           libamarokcore.so, libamaroklib.so, libamarokocsclient.so, libamarokpud.so,
           libamarok_service_lastfm_shared.so, libamarok-sqlcollection.so,
-          libamarok-transcoding.so, libampache_account_login.so and several
+          libamarok-transcoding.so, libampache_account_login.so, and several
           libraries in &kde-dir;/lib/kde4
         </seg>
         <seg>

Modified: trunk/BOOK/multimedia/audioutils/freetts.xml
==============================================================================
--- trunk/BOOK/multimedia/audioutils/freetts.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/audioutils/freetts.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -48,7 +48,7 @@
       to convert text to audible speech through the system audio hardware.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/multimedia/cdwriteutils/dvd+rw-tools.xml
==============================================================================
--- trunk/BOOK/multimedia/cdwriteutils/dvd+rw-tools.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/cdwriteutils/dvd+rw-tools.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -39,7 +39,7 @@
     image on a partially burned DVD.
         </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -101,6 +101,7 @@
 <screen><userinput>sed -i '/stdlib/a #include <limits.h>' transport.hxx &&
 sed -i 's#mkisofs"#xorrisofs"#' growisofs.c &&
 sed -i 's#mkisofs#xorrisofs#;s#MKISOFS#XORRISOFS#' growisofs.1 &&
+
 make all rpl8 btcflash</userinput></screen>
 
     <para>

Modified: trunk/BOOK/multimedia/cdwriteutils/k3b.xml
==============================================================================
--- trunk/BOOK/multimedia/cdwriteutils/k3b.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/cdwriteutils/k3b.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -53,7 +53,7 @@
       <ulink url="http://www.mcmurchy.com/rmlcopydvd/">RMLCopyDVD</ulink> package.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -103,7 +103,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="kde-runtime"/>,
-      <xref linkend="libkcddb"/> and
+      <xref linkend="libkcddb"/>, and
       <xref linkend="libsamplerate"/>
     </para>
 
@@ -123,7 +123,7 @@
     <para role="recommended">
       <xref linkend="ffmpeg"/>,
       <xref linkend="libdvdread"/>,
-      <xref linkend="libjpeg"/> and
+      <xref linkend="libjpeg"/>, and
       <xref linkend="taglib"/>
     </para>
 
@@ -136,7 +136,7 @@
       <xref linkend="libvorbis"/>,
       <ulink url="http://ftp.musicbrainz.org/pub/musicbrainz/">
       libmusicbrainz (version 2)</ulink>,
-      <ulink url="http://www.musepack.net/">Musepack (libmpcdec)</ulink> and
+      <ulink url="http://www.musepack.net/">Musepack (libmpcdec)</ulink>, and
       <ulink url="http://www.vcdimager.org/">VCDImager</ulink>
     </para>
 
@@ -157,6 +157,7 @@
 
 mkdir build &&
 cd    build &&
+
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
       -DSYSCONF_INSTALL_DIR=/etc/kde     \
       ..  &&

Modified: trunk/BOOK/multimedia/libdriv/alsa-firmware.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/alsa-firmware.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/alsa-firmware.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -33,7 +33,7 @@
       contains firmware for certain sound cards.
     </para>
 
-    &lfs73_checked;
+    &lfs74_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/multimedia/libdriv/alsa-oss.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/alsa-oss.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/alsa-oss.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -35,7 +35,7 @@
       which wish to use the ALSA OSS sound interface.
     </para>
 
-    &lfs73_checked;
+    &lfs74_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -127,7 +127,7 @@
           aoss
         </seg>
         <seg>
-          libalsatoss.so, libaoss.so and libossredir.so
+          libalsatoss.so, libaoss.so, and libossredir.so
         </seg>
         <seg>
           None

Modified: trunk/BOOK/multimedia/libdriv/alsa-tools.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/alsa-tools.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/alsa-tools.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -34,7 +34,7 @@
       contains advanced tools for certain sound cards.
     </para>
 
-    &lfs73_built;
+    &lfs74_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/multimedia/libdriv/farstream.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/farstream.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/farstream.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -36,7 +36,7 @@
       used for video conferencing.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -152,7 +152,7 @@
           /usr/include/farstream-0.2,
           /usr/lib/farstream-0.2,
           /usr/share/farstream,
-          /usr/share/gtk-doc/html/farstream-libs-1.0 and
+          /usr/share/gtk-doc/html/farstream-libs-1.0, and
           /usr/share/gtk-doc/html/farstream-plugins-0.2
         </seg>
       </seglistitem>

Modified: trunk/BOOK/multimedia/libdriv/libao.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libao.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/libao.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -37,7 +37,7 @@
     Synthesizer and PulseAudio (next generation
     <application>GNOME</application> sound architecture).</para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -67,8 +67,7 @@
     <para role="optional">
       <xref linkend="x-window-system"/>,
       <xref linkend="esound"/>,
-      <xref linkend="alsa"/>,
-      <!-- <xref linkend="arts"/>, --> and
+      <xref linkend="alsa"/>, and
       <xref linkend='pulseaudio'/> (requires <xref linkend='libatomic_ops'/>
       on x86)
     </para>

Modified: trunk/BOOK/multimedia/libdriv/libdiscid.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libdiscid.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/libdiscid.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -37,7 +37,7 @@
       provides a submission URL for adding the DiscID to the database.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/multimedia/libdriv/libdvdcss.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libdvdcss.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/libdvdcss.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -35,7 +35,7 @@
       bother about the decryption.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/multimedia/libdriv/libmpeg3.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libmpeg3.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/libmpeg3.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -34,7 +34,7 @@
       editing and manipulation of MPEG streams.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/multimedia/libdriv/libmusicbrainz.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libmusicbrainz.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/libmusicbrainz.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -41,7 +41,7 @@
     identify CDs and provide information about the CD, about the artist or
     other related information.</para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/multimedia/libdriv/libquicktime.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libquicktime.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/libquicktime.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -39,7 +39,7 @@
       <application>Quicktime 4 Linux</application> library.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -80,6 +80,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="alsa-lib"/>,
+      <xref linkend="doxygen"/>,
       <xref linkend="faac"/>,
       <xref linkend="faad2"/>,
       <xref linkend="ffmpeg"/>,
@@ -90,7 +91,7 @@
       <xref linkend="libpng"/>,
       <xref linkend="libvorbis"/>,
       <ulink url="http://www.diracvideo.org">Schroedinger</ulink>,
-      <ulink url="http://developers.videolan.org/x264.html">x264</ulink> and
+      <ulink url="http://developers.videolan.org/x264.html">x264</ulink>, and
       <xref linkend="xorg7-lib"/>
     </para>
 
@@ -107,10 +108,10 @@
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --docdir=/usr/share/doc/libquicktime-&libquicktime-version; \
-            --enable-gpl \
-            --without-doxygen &&
+<screen><userinput>./configure --prefix=/usr     \
+            --enable-gpl      \
+            --without-doxygen \
+            --docdir=/usr/share/doc/libquicktime-&libquicktime-version; **
 make</userinput></screen>
 
     <para>
@@ -159,7 +160,7 @@
       <seglistitem>
         <seg>
           libquicktime_config, lqtplay, lqtremux, lqt_transcode,
-          qt2text, qtdechunk, qtdump, qtinfo, qtrechunk, qtstreamize and
+          qt2text, qtdechunk, qtdump, qtinfo, qtrechunk, qtstreamize, and
           qtyuv4toyuv
         </seg>
         <seg>
@@ -167,7 +168,7 @@
         </seg>
         <seg>
           /usr/include/lqt,
-          /usr/lib/libquicktime and
+          /usr/lib/libquicktime, and
           /usr/share/doc/libquicktime-&libquicktime-version;
         </seg>
       </seglistitem>

Modified: trunk/BOOK/multimedia/libdriv/opal.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/opal.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/opal.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -35,7 +35,7 @@
       model.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -98,7 +98,7 @@
       <xref linkend="openjdk"/>,
       <xref linkend="ruby"/>,
       <ulink url="www.soft-switch.org/">Spandsp</ulink>,
-      <xref linkend="speex"/> and
+      <xref linkend="speex"/>, and
       <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>
     </para>
 
@@ -114,6 +114,7 @@
     commands:</para>
 
 <screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg-1.patch &&
+
 ./configure --prefix=/usr &&
 make</userinput></screen>
 

Modified: trunk/BOOK/multimedia/libdriv/soundtouch.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/soundtouch.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/soundtouch.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -35,7 +35,7 @@
       rate parameters independently from each other.
     </para>
 
-    &lfs73_built;
+    &lfs74_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -86,6 +86,7 @@
 
 <screen><userinput>sed "s at AM_CONFIG_HEADER@AC_CONFIG_HEADERS at g" -i configure.ac &&
 ./bootstrap &&
+
 ./configure --prefix=/usr &&
 make</userinput></screen>
 

Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -38,7 +38,7 @@
       hardware.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -129,6 +129,7 @@
     </para>
 
 <screen><userinput>patch -Np1 -i ../xine-lib-&xine-lib-version;-missing_include-1.patch &&
+
 ./configure --prefix=/usr     \
             --disable-vcd     \
             --disable-modplug \
@@ -148,6 +149,14 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <note><para>
+      When installing, the Makefile does some additional
+      linking.  If you do not have Xorg in /usr, the LIBRARY_PATH
+      variable needs to be defined for the root user.  If
+      using sudo to assume root, use the -E option to pass
+      your current envronment variables for the install process.
+    </para></note>
+
     <para>If you built the API documentation, issue the following commands as
     the <systemitem class="username">root</systemitem> user to install it:</para>
 

Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -48,7 +48,7 @@
       installed.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -162,7 +162,7 @@
       <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
       <ulink url="http://www.live555.com/">LIVE555 Streaming Media</ulink>,
       <ulink url="http://rtmpdump.mplayerhq.hu/">RTMPDump</ulink>,
-      <ulink url="http://code.google.com/p/vstream-client/">TiVo vstream client</ulink> and
+      <ulink url="http://code.google.com/p/vstream-client/">TiVo vstream client</ulink>, and
       <ulink url="http://www.xmms.org/">XMMS</ulink>
     </para>
 
@@ -173,7 +173,7 @@
       <xref linkend="pulseaudio"/>,
       <xref linkend="sdl"/>,
       <ulink url="http://jackaudio.org/">JACK</ulink>,
-      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink> and
+      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>, and
       <ulink url="http://www.radscan.com/nas.html">NAS</ulink>
     </para>
 
@@ -186,7 +186,7 @@
       <xref linkend="libjpeg"/>,
       <xref linkend="libmng"/>,
       <xref linkend="libpng"/>,
-      <xref linkend="openjpeg"/> and
+      <xref linkend="openjpeg"/>, and
       <ulink url="http://www.svgalib.org/">SVGAlib</ulink>
     </para>
 
@@ -214,7 +214,7 @@
       <ulink url="http://www.broadcom.com/support/crystal_hd/">CrystalHD</ulink>,
       <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>,
       <ulink url="http://diracvideo.org/download/dirac-research/">Dirac</ulink>,
-      <ulink url="http://diracvideo.org/download/schroedinger/">Schroedinger</ulink> and
+      <ulink url="http://diracvideo.org/download/schroedinger/">Schroedinger</ulink>, and
       <ulink url="http://wiki.multimedia.cx/index.php?title=NUT">libnut</ulink>
     </para>
 
@@ -267,6 +267,7 @@
 <screen><userinput>patch -Np1 -i ../MPlayer-&mplayer-version;-giflib_fixes-1.patch &&
 patch -Np1 -i ../MPlayer-&mplayer-version;-live_fixes-1.patch &&
 sed -i 's:libsmbclient.h:samba-4.0/&:' configure stream/stream_smb.c &&
+
 ./configure --prefix=/usr            \
             --confdir=/etc/mplayer   \
             --enable-dynamic-plugins \

Modified: trunk/BOOK/multimedia/videoutils/transcode.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/transcode.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/videoutils/transcode.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -37,7 +37,7 @@
       <ulink url="http://www.transcoding.org/"/>.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -94,7 +94,7 @@
     <para role="recommended">
       <xref linkend="alsa-lib"/>,
       <xref linkend="lame"/>,
-      <xref linkend="libmpeg2"/> and
+      <xref linkend="libmpeg2"/>, and
       <xref linkend="xorg7-lib"/>
     </para>
 
@@ -117,7 +117,7 @@
       <ulink url="http://www.netlib.org/pvm3/">PVM3</ulink>,
       <xref linkend="sdl"/>,
       <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
-      <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink> and
+      <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>, and
       <xref linkend="xvid"/>
     </para>
 
@@ -202,7 +202,7 @@
         <seg>
           avifix, aviindex, avimerge, avisplit, avisync, tccat, tcdecode,
           tcdemux, tcextract, tcmodinfo, tcmp3cut, tcprobe, tcscan, tcxmlcheck,
-          tcxpm2rgb, tcyait and transcode
+          tcxpm2rgb, tcyait, and transcode
         </seg>
         <seg>
           None

Modified: trunk/BOOK/multimedia/videoutils/xine-ui.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/xine-ui.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/multimedia/videoutils/xine-ui.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -38,7 +38,7 @@
       and displays multimedia streamed over the Internet.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -98,7 +98,7 @@
       <xref linkend="pkgconfig"/>,
       <xref linkend="curl"/>,
       <xref linkend="aalib"/>,
-      <ulink url="http://www.lirc.org">LIRC</ulink> and
+      <ulink url="http://www.lirc.org">LIRC</ulink>, and
       <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>
     </para>
 
@@ -201,7 +201,7 @@
       <seglistitem>
         <seg>
           aaxine, cacaxine, fbxine, xine,
-          xine-bugreport, xine-check and
+          xine-bugreport, xine-check, and
           xine-remote
         </seg>
         <seg>

Modified: trunk/BOOK/networking/netlibs/libnice.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/libnice.xml	Sun Sep  1 13:59:10 2013	(r11740)
+++ trunk/BOOK/networking/netlibs/libnice.xml	Sun Sep  1 15:01:22 2013	(r11741)
@@ -38,7 +38,7 @@
       elements.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">



More information about the blfs-book mailing list