From 731b319c4fbc0eaace6accde3be0e57638a01da6 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Thu, 20 Jan 2005 15:17:56 +0000
Subject: [PATCH] Updated to xine Libraries-1.0

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

diff --git a/general.ent b/general.ent
index 380908bbb9..94fbc066e3 100644
--- a/general.ent
+++ b/general.ent
@@ -444,7 +444,7 @@
 <!ENTITY libdv-version                "0.103"> 
 <!ENTITY liba52-version               "0.7.4">    
 <!ENTITY xvid-version                 "1.0.2">  
-<!ENTITY xine-lib-version             "1-rc7">  
+<!ENTITY xine-lib-version             "1.0">  
 <!ENTITY libmikmod-version            "3.1.11"> 
 <!ENTITY gstreamer-version            "0.8.7">
 <!ENTITY gst-plugins-version          "0.8.5">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 756b6ce591..3fba882602 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -22,8 +22,8 @@ who wrote what.</para>
 
 <itemizedlist>
 
-<listitem><para>January 20th, 2005 [randy]: Updated to
-MPlayer-1.0pre6a.</para></listitem>
+<listitem><para>January 20th, 2005 [randy]: Updated to MPlayer-1.0pre6a and 
+xine Libraries-1.0.</para></listitem>
 
 <listitem><para>January 19th, 2005 [randy]: Added installation of 
 HTML documentation to the FFmpeg instructions; added commands to create 
diff --git a/multimedia/libdriv/xine-lib.xml b/multimedia/libdriv/xine-lib.xml
index 4edad2354a..07d3c0e0b1 100644
--- a/multimedia/libdriv/xine-lib.xml
+++ b/multimedia/libdriv/xine-lib.xml
@@ -7,7 +7,7 @@
   <!ENTITY xine-lib-download-ftp  " ">
   <!ENTITY xine-lib-size          "7.3 MB">
   <!ENTITY xine-lib-buildsize     "82 MB">
-  <!ENTITY xine-lib-time          "3.44 SBU">
+  <!ENTITY xine-lib-time          "3.56 SBU">
 ]>
 
 <sect1 id="xine-lib" xreflabel="xine Libraries-&xine-lib-version;">
@@ -17,6 +17,8 @@
 </sect1info>
 <?dbhtml filename="xine-lib.html"?>
 <title>xine Libraries-&xine-lib-version;</title>
+<indexterm zone="xine-lib">
+<primary sortas="a-Xine-Libraries">Xine Libraries</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>xine Libraries</application></title>
@@ -38,12 +40,12 @@ the flow of information from the source to the screen and speakers.</para>
 &xine-lib-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title>Additional downloads</title>
+<!-- <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para><ulink 
 url="&patch-root;/xine-lib-&xine-lib-version;-discover_smb-1.patch"/></para>
 </listitem></itemizedlist>
-</sect3>
+</sect3> -->
 
 <sect3><title><application>xine Libraries</application> dependencies</title>
 <sect4><title>Required</title>
@@ -70,6 +72,8 @@ url="&patch-root;/xine-lib-&xine-lib-version;-discover_smb-1.patch"/></para>
 <ulink url="http://www.theora.org/">Theora</ulink>, 
 <ulink url="http://www.audiocoding.com/modules/mydownloads/">FAAD</ulink>, 
 <ulink url="http://www.libstk.org/">LibSTK</ulink>, 
+<ulink 
+url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink>, 
 <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>, 
 <ulink url="http://sourceforge.net/projects/dvd/">libdvdnav</ulink>, 
 <ulink 
@@ -86,33 +90,55 @@ and <ulink url="http://www.xfig.org/">Transfig</ulink></para>
 <para>Install <application>xine Libraries</application> by running the 
 following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../xine-lib-&xine-lib-version;-discover_smb-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
 
 <sect2>
 <title>Contents</title>
 
-<para>The <application>xine Libraries</application> package contains 
-<command>xine-config</command>, 
-the <filename class="libraryfile">libxine</filename> library, 
-various input/output plugins and fonts used by the output display 
-engine.</para>
+<segmentedlist>
+<segtitle>Installed Program</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Fonts</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>xine-config</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 
+/usr/share/doc/xine</seg>
+</seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
+<varlistentry id="xine-config">
+<term><command>xine-config</command></term>
+<listitem><para>provides information to programs trying to link with the 
+<application>xine</application> libraries.</para>
+<indexterm zone="xine-lib xine-config">
+<primary sortas="b-xine-config">xine-config</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>xine-config</title>
-<para><command>xine-config</command> provides information to programs trying 
-to link with the <application>xine</application> libraries.</para></sect3>
-
-<sect3><title>libxine libraries</title>
-<para><filename class="libraryfile">libxine</filename> libraries provide the 
-<acronym>API</acronym> for processing audio/video files.</para></sect3>
+<varlistentry id="libxine">
+<term><filename class='libraryfile'>libxine.so</filename></term>
+<listitem><para> provides the <acronym>API</acronym> for processing 
+audio/video files.</para>
+<indexterm zone="xine-lib libxine">
+<primary sortas="c-libxine">libxine.so</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>