From 3c25d1bdd74de7c1cd1e1ccd52f3280fb56f30ee Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Tue, 16 Dec 2008 23:35:30 +0000
Subject: [PATCH] Update xine-lib.  Removed the references to --enable-static
 because nobody else uses it (at least, not fedora, debian, gentoo) and to the
 override for external ffmpeg which is no longer required.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7653 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 +--
 introduction/welcome/changelog.xml |  9 +++++++
 multimedia/libdriv/xine-lib.xml    | 41 ++++++++++++++++++++----------
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/general.ent b/general.ent
index b182221402..2357a88fb4 100644
--- a/general.ent
+++ b/general.ent
@@ -3,7 +3,7 @@ $LastChangedBy$
 $Date$
 -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
 <!ENTITY copyrightdate "2001-&year;">
@@ -641,7 +641,7 @@ $Date$
 <!ENTITY libdv-version                "1.0.0">
 <!ENTITY liba52-version               "0.7.4">
 <!ENTITY xvid-version                 "1.1.3">
-<!ENTITY xine-lib-version             "1.1.12">
+<!ENTITY xine-lib-version             "1.1.15">
 <!ENTITY libmikmod-version            "3.1.11">
 <!ENTITY gstreamer-version            "0.10.13">
 <!ENTITY gst-plugins-base-version     "0.10.13">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 07541326a6..c267cd6c58 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -40,6 +40,15 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>December 16th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to xine-lib-0.15.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>December 6th, 2008</para>
       <itemizedlist>
diff --git a/multimedia/libdriv/xine-lib.xml b/multimedia/libdriv/xine-lib.xml
index 64cd0986ec..576911d95e 100644
--- a/multimedia/libdriv/xine-lib.xml
+++ b/multimedia/libdriv/xine-lib.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY xine-lib-download-http "&sourceforge-repo;/xine/xine-lib-&xine-lib-version;.tar.bz2">
   <!ENTITY xine-lib-download-ftp  "&gentoo-ftp-repo;/xine-lib-&xine-lib-version;.tar.bz2">
-  <!ENTITY xine-lib-md5sum        "b7254614c78c8b0f1652b8dc06f80b3a">
+  <!ENTITY xine-lib-md5sum        "42a2b4893b7f892eb334de2fc36d49c8">
   <!ENTITY xine-lib-size          "7.1 MB">
-  <!ENTITY xine-lib-buildsize     "233 MB">
-  <!ENTITY xine-lib-time          "6.1 SBU">
+  <!ENTITY xine-lib-buildsize     "121 MB (without the API documentation)">
+  <!ENTITY xine-lib-time          "3.2 SBU">
 ]>
 
 <sect1 id="xine-lib" xreflabel="xine Libraries-&xine-lib-version;">
@@ -66,7 +66,8 @@
     <ulink url="http://jackaudio.org/">JACK</ulink></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="pkgconfig"/> and  <xref linkend="ffmpeg"/></para>
+    <para role="recommended"><xref linkend="pkgconfig"/> and  <xref linkend="ffmpeg"/>
+    (with <option>postproc</option> enabled)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="aalib"/>,
@@ -88,8 +89,8 @@
     <ulink url="http://www.musepack.net/">libmpcdec</ulink>,
     <ulink url="http://www.wavpack.com/">WavPack</ulink>,
     <ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>,
-
-    <ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink>,
+    and to build the API documentation
+    <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
@@ -109,7 +110,8 @@
     <para>Install <application>xine Libraries</application> by running the
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --enable-static --with-external-ffmpeg \
+<screen><userinput>sed -i 's/\(inline \)\(_x_is_fourcc\)/__\1int \2/' src/xine-engine/buffer.h &amp;&amp;
+./configure --prefix=/usr \
             --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &amp;&amp;
 make</userinput></screen>
 
@@ -124,20 +126,33 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--enable-static</option>: This switch is used to enable
-    building the static library as some programs link against it.</para>
+    <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>
 
-    <para><option>--with-external-ffmpeg</option>: This switch enables use of
+    <!-- <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 internaly built
-    library produces poor resuts with some video files.</para>
+    library produces poor resuts with some video files.</para>-->
 
     <!-- See BLFS ticket 2476 for more info on the ffmpeg option.  -->
 
     <para><option>--docdir=/usr/share/xine-lib-&xine-lib-version;</option>:
     This switch causes the documentation to be installed into a versioned
-    instead of the default
+    directory instead of the default
     <filename class="directory">/usr/share/doc/xine-lib</filename>.</para>
 
+    <para><option>--with-xv-path=/path/to/somewhere</option>: if
+    <filename>libXv.so</filename> is not installed in
+    <filename class="directory">/usr/X11R6/lib</filename> nor in
+    <filename class="directory">/usr/lib</filename> you will need to tell
+    the <command>configure</command> command where to find it.</para>
+
   </sect2>
 
   <sect2 role="content">
@@ -151,7 +166,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>xine-config</seg>
-        <seg>libxine.{a,so} and numerous plugin modules and video extensions</seg>
+        <seg>libxine.so and numerous plugin modules and video extensions</seg>
         <seg>Output display engine fonts located in
         /usr/share/xine/libxine1/fonts</seg>
         <seg>/usr/include/xine, /usr/lib/xine, /usr/share/xine, and