Author: andy
Date: 2011-12-03 07:24:46 -0700 (Sat, 03 Dec 2011)
New Revision: 9055

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/xine-lib.xml
Log:
Updated xine-lib to 1.1.20

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2011-12-03 05:42:28 UTC (rev 9054)
+++ trunk/BOOK/general.ent      2011-12-03 14:24:46 UTC (rev 9055)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
 <!ENTITY copyrightdate "2001-&year;">
@@ -831,7 +831,7 @@
 <!ENTITY libdv-version                "1.0.0">
 <!ENTITY liba52-version               "0.7.4">
 <!ENTITY xvid-version                 "1.2.2">
-<!ENTITY xine-lib-version             "1.1.19">
+<!ENTITY xine-lib-version             "1.1.20">
 <!ENTITY libmikmod-version            "3.1.11">
 <!ENTITY gstreamer-version            "0.10.25">
 <!ENTITY gst-plugins-base-version     "0.10.25">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2011-12-03 05:42:28 UTC 
(rev 9054)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2011-12-03 14:24:46 UTC 
(rev 9055)
@@ -42,6 +42,15 @@
 
 -->
     <listitem>
+      <para>December 2rd, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abenton] - Updated xine-lib to 1.1.20.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 2nd, 2011</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml  2011-12-03 05:42:28 UTC (rev 
9054)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml  2011-12-03 14:24:46 UTC (rev 
9055)
@@ -63,51 +63,43 @@
     <bridgehead renderas="sect3">Xine Libraries Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/> and
-    <xref linkend="esound"/> or OSS or
-    <xref linkend="alsa"/> or <xref linkend="arts"/> or
+    <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>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><!-- <xref linkend="pkgconfig"/> and -->
-    <xref linkend="ffmpeg"/> <!--(with <option>postproc</option> 
enabled)--></para>
+    <!-- <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="pkgconfig"/></para> -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="aalib"/>,
-    <xref linkend="libmng"/>,
-    <xref linkend="sdl"/>,
-    <xref linkend="libfame"/>,
-    <xref linkend="libvorbis"/>,
-    <xref linkend="speex"/>,
-    <xref linkend="gnome-vfs"/>,
-    <xref linkend="flac"/>,
-    <xref linkend="samba3"/>,
-    <xref linkend="imagemagick"/>,
-    <ulink url="http://www.directfb.org/";>DirectFB</ulink>,
-    <xref linkend="libtheora"/>,
+    <para role="optional"><xref linkend="ffmpeg"/>, <xref linkend="flac"/>,
+    <xref linkend="libtheora"/>, <xref linkend="libvorbis"/>,
+    <xref linkend="sdl"/>, <xref linkend="speex"/>, <xref linkend="libfame"/>,
+    <xref linkend="libmng"/>, <xref linkend="gnome-vfs"/>,
+    <xref linkend="libmad"/> 
+    <xref linkend="samba3"/>, <xref linkend="imagemagick"/>,
+    <ulink url="http://www.directfb.org/";>DirectFB</ulink>, <ulink
+    url="http://sourceforge.net/projects/dvd/";>libdvdnav</ulink>, 
     <ulink url="http://sam.zoy.org/projects/libcaca/";>libcaca</ulink>,
-    <ulink 
url="http://sourceforge.net/projects/modplug-xmms/";>libmodplug</ulink>,
+    <ulink
+    url="http://sourceforge.net/projects/modplug-xmms/";>libmodplug</ulink>,
+    <xref linkend="aalib"/>, <xref linkend="liba52"/>, libdts (now <ulink
+    url="http://www.videolan.org/developers/libdca.html";>libdca</ulink>),
     <ulink url="http://www.wavpack.com/";>WavPack</ulink>, and
     <ulink url="http://dxr3.sourceforge.net/";>libdxr3</ulink>.</para>
 
-    <para>If the following packages will are not found on the system, versions
+    <para>If the following packages are not found on the system, versions
     of their libraries from the internal source tree will be used:
-    <ulink url="http://www.gnu.org/software/libcdio/";>libcdio</ulink> and
-    <ulink url="http://www.vcdimager.org/";>VCDImager</ulink> (both required,
-    or neither), and
+    <ulink url="http://www.gnu.org/software/libcdio/";>libcdio</ulink>,
+    <ulink url="http://www.vcdimager.org/";>VCDImager</ulink> and
     <ulink url="http://www.musepack.net/";>libmpcdec</ulink>.</para>
 
     <para>The following are needed to build the API documentation:
-    <ulink 
url="http://sourceforge.net/projects/sgmltools-lite/";>sgmltools-lite</ulink>
+    <ulink
+    
url="http://sourceforge.net/projects/sgmltools-lite/";>sgmltools-lite</ulink>
     and <ulink url="http://www.xfig.org/";>Transfig</ulink></para>
 
-    <para>The developers recommended that you use the internal source tree
-    versions of <xref linkend="liba52"/>, libdts (now <ulink
-    url="http://www.videolan.org/developers/libdca.html";>libdca</ulink>), 
<ulink
-    url="http://sourceforge.net/projects/dvd/";>libdvdnav</ulink>, and <xref
-    linkend="libmad"/> and not system-installed versions.</para>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/xine-lib"/></para>
 
@@ -119,13 +111,13 @@
     <para>Install <application>xine Libraries</application> by running the
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr 
--docdir=/usr/share/doc/xine-lib-&xine-lib-version; &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>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
@@ -135,22 +127,11 @@
     <title>Command Explanations</title>
 
     <!--<para><option>
-    sed -i 's/\(inline \)\(_x_is_fourcc\)/__\1int \2/' 
src/xine-engine/buffer.h &amp;&amp;
-    </option>: This command enables c++ programs to use the header, for example
-    in <xref linkend="kdemultimedia"/></para>-->
+    sed -i 's/\(inline \)\(_x_is_fourcc\)/__\1int \2/' src/xine-engine/buffer.h
+    &amp;&amp;</option>: This command enables c++ programs to use the header,
+    for example in <xref linkend="kdemultimedia"/></para>-->
 
-    <!-- <para><option>\-\-enable-static</option>: This switch is used to 
enable
-    building the static library as some programs link against it.</para>-->
-
-
-    <!-- switch no longer needed
-    <para><option>\-\-with-external-ffmpeg</option>: This switch enables use of
-    an external <application>FFmpeg</application> library.  The internally 
built
-    library produces poor results with some video files.</para>-->
-
-    <!-- See BLFS ticket 2476 for more info on the ffmpeg option.  -->
-
-    
<para><parameter>--docdir=/usr/share/xine-lib-&xine-lib-version;</parameter>:
+    <para><option>--docdir=/usr/share/xine-lib-&xine-lib-version;</option>:
     This switch causes the documentation to be installed into a versioned
     directory instead of the default
     <filename class="directory">/usr/share/doc/xine-lib</filename>.</para>
@@ -161,6 +142,20 @@
     <filename class="directory">/usr/lib</filename> you will need to tell
     the <command>configure</command> command where to find it.</para>
 
+    <para><option>--with-external-a52dec</option>: use this option to force the
+    <filename>xineplug_decode_a52.so</filename> plugin to link against the
+    system installed liba52.</para>
+
+    <para><option>--with-external-libmad</option>: use this option to force the
+    <filename>xineplug_decode_mad.so</filename> plugin to link against the
+    system installed libmad.</para>
+
+    <para><option>--with-external-dvdnav</option>: use this option to force the
+    <filename>xineplug_decode_dxr3_spu.so</filename>,
+    <filename>xineplug_decode_spu.so</filename> and
+    <filename>xineplug_inp_dvd.so</filename> plugins to link against the
+    system installed libdvdnav and libdvdread</para>
+
   </sect2>
 
   <sect2 role="content">

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to