Author: rthomsen
Date: 2012-03-23 16:21:30 -0600 (Fri, 23 Mar 2012)
New Revision: 9743
Removed:
trunk/BOOK/multimedia/audioutils/amarok2.xml
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/audioutils/amarok.xml
trunk/BOOK/multimedia/audioutils/audioutils.xml
Log:
removed amarok 1.4.8
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-03-23 22:07:10 UTC (rev 9742)
+++ trunk/BOOK/general.ent 2012-03-23 22:21:30 UTC (rev 9743)
@@ -991,8 +991,7 @@
<!ENTITY freetts-version "1.2.1">
<!ENTITY audacious-version "3.2">
<!ENTITY audacious-plugins-version "3.2">
-<!ENTITY amarok-version "1.4.8">
-<!ENTITY amarok2-version "2.5.0">
+<!ENTITY amarok-version "2.5.0">
<!ENTITY gnome-media-version "2.32.0">
<!-- Chapter 41 -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-03-23 22:07:10 UTC
(rev 9742)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-03-23 22:21:30 UTC
(rev 9743)
@@ -45,6 +45,9 @@
<para>March 23rd, 2012</para>
<itemizedlist>
<listitem>
+ <para>[rthomsen] - removed amarok 1.4.8.</para>
+ </listitem>
+ <listitem>
<para>[rthomsen] - upgrade to xterm 278.</para>
</listitem>
</itemizedlist>
Modified: trunk/BOOK/multimedia/audioutils/amarok.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/amarok.xml 2012-03-23 22:07:10 UTC (rev
9742)
+++ trunk/BOOK/multimedia/audioutils/amarok.xml 2012-03-23 22:21:30 UTC (rev
9743)
@@ -4,14 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!-- <!ENTITY amarok-download-http
"http://mirrors.isc.org/pub/kde/stable/amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2";>
- <!ENTITY amarok-download-ftp
"ftp://ftp.kde.org/pub/kde/stable/amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2";>
-->
- <!ENTITY amarok-download-http
"&sources-anduin-http;/a/amarok-&amarok-version;.tar.bz2">
- <!ENTITY amarok-download-ftp " ">
- <!ENTITY amarok-md5sum "7f65c4a8f3f0ff9042a5b5dd21b36cc8">
- <!ENTITY amarok-size "13 MB">
- <!ENTITY amarok-buildsize "129 MB">
- <!ENTITY amarok-time "3.6 SBU">
+ <!ENTITY amarok-download-http
"&kde4-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
+ <!ENTITY amarok-download-ftp
"&kde4-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
+ <!ENTITY amarok-md5sum "b7983eaa33e4771769ae9e330c811995">
+ <!ENTITY amarok-size "44 MB">
+ <!ENTITY amarok-buildsize "801 MB">
+ <!ENTITY amarok-time "9.2 SBU">
]>
<sect1 id="amarok" xreflabel="amarok-&amarok-version;">
@@ -31,11 +29,13 @@
<sect2 role="package">
<title>Introduction to Amarok</title>
- <para><application>Amarok</application> is an audio player for KDE.
- Features include a context browser,
- <ulink url="http://www.magnatunes.com/";>Magnatunes</ulink> and
- <ulink url="http://www.last.fm/";>Last.fm</ulink> integration,
- support for multimedia devices, and scripting through Ruby.</para>
+ <para><application>Amarok</application> is a powerful audio player for
+ the KDE4 environment.
+ Features include a context browser, integration with many online music
+ services and support for management of several digital music players
+ including Apple's iPod.</para>
+
+ &lfs70_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -62,32 +62,34 @@
<bridgehead renderas="sect3">Amarok Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required"><xref linkend="kdelibs"/>,
- <xref linkend="ruby"/>, and
- <xref linkend="taglib"/></para>
+ <para role="required">
+ <xref linkend="kde4libs"/>,
+ <xref linkend="mysql"/> and
+ <xref linkend="taglib"/>
+ </para>
<bridgehead renderas="sect4">Recommended</bridgehead>
- <para role="recommended"><xref linkend="kdebase"/> and
- <xref linkend="xine-lib"/></para>
+ <para role="recommended">
+ <xref linkend="ffmpeg"/>
+ </para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><xref linkend="kdemultimedia"/> (for cd-ripping
support),
- <xref linkend="k3b"/> (for cd-burning support),
- <xref linkend="sdl"/>,
- <xref linkend="sqlite"/>,
- <xref linkend="postgresql"/>,
- <xref linkend="mysql"/>,
- <ulink url="https://helixcommunity.org/";>Helix</ulink> (untested media
backend, alternative to xine),
- <xref linkend="faad2"/> or <ulink
url="http://mpeg4ip.sourceforge.net/";>mpeg4ip</ulink>,
- <ulink url="http://sourceforge.net/projects/libvisual/";>libvisual</ulink>,
- <ulink
url="http://www.musicbrainz.org/products/tunepimp/download.html";>TunePimp</ulink>,
- <ulink url="http://www.gtkpod.org/libgpod.html";>libgpod</ulink>,
- <ulink url="http://ifp-driver.sourceforge.net/libifp/";>libifp</ulink>,
- <ulink url="http://libnjb.sourceforge.net/";>libnjp</ulink>,
- <ulink url="http://libmtp.sourceforge.net/";>libmtp</ulink>, and
- <ulink url="http://linux-karma.sourceforge.net/";>libkarma</ulink> (requires
- <ulink url="http://linux-karma.sourceforge.net/";>omfs</ulink>)</para>
-
+ <para role="optional">
+ <xref linkend="curl"/> (for MP3tunes integration),
+ <xref linkend="libxml2"/> (for MP3tunes integration),
+ <xref linkend="openssl"/> (for MP3tunes integration),
+ <xref linkend="glib2"/> (for MP3tunes integration),
+ <xref linkend="gdk-pixbuf"/> (for iPod support),
+ <ulink url="http://qjson.sourceforge.net/";>QJson</ulink> (for Playdar
integration),
+ <ulink url="http://www.gtkpod.org/libgpod.html";>libgpod</ulink> (for iPod
support),
+ <ulink url="http://libmtp.sourceforge.net/";>libmtp</ulink> (for MTP device
support),
+ <ulink
url="http://code.google.com/p/qtscriptgenerator/";>qtscript-qt</ulink>,
+ <ulink url="http://launchpad.net/liblastfm";>liblastfm</ulink> (for Last.fm
integration),
+ <ulink url="http://code.google.com/p/musicip-libofa";>libofa</ulink> (for
MusicBrainz support),
+ <ulink url="http://wiki.gpodder.org/wiki/Libmygpo-qt";>libmygpo-qt</ulink>
(for gpodder.net podcast support) and
+ <ulink url="http://launchpad.net/loudmouth";>loudmouth</ulink> (for
MP3tunes integration)
+ </para>
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/amarok"/></para>
@@ -96,52 +98,33 @@
<sect2 role="installation">
<title>Installation of Amarok</title>
- <para>Install <application>Amarok</application> by running the following
- commands:</para>
+ <para>Install <application>Amarok</application> by running
+ the following commands:</para>
-<screen><userinput>./configure --prefix=$(kde-config --prefix) \
- --sysconfdir=/etc/kde \
- --disable-debug \
- --disable-dependency-tracking &&
+<screen><userinput>mkdir build &&
+cd build &&
+cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
+ -DKDE_DEFAULT_HOME=.kde4 \
+ -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+ .. &&
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>
<screen role="root"><userinput>make install</userinput></screen>
</sect2>
-
+<!--
<sect2 role="commands">
<title>Command Explanations</title>
- <para><parameter>--prefix=$(kde-config --prefix)</parameter>: This
+ <para><parameter>- -prefix=$(kde-config - -prefix)</parameter>: This
parameter uses <command>kde-config</command> to establish the prefix of
the existing KDE installation and then sets the installation prefix for
<application>Amarok</application> to the same value.</para>
- <para><parameter>--disable-debug</parameter>: This option causes the
package
- to be compiled without debugging code.</para>
-
- <para><parameter>--disable-dependency-tracking</parameter>: This option
- speeds up one time builds.</para>
-
- <para><parameter>--without-included-sqlite</parameter>: This option forces
- the use of a system-installed copy of
<application>SQLite</application>.</para>
-
- <para><parameter>--enable-mysql</parameter>: This option enables use of a
- <application>MySQL</application> database for music collections.</para>
-
- <para><parameter>--enable-postgresql</parameter>: This option enables use
of a
- <application>PostgreSQL</application> database for music
collections.</para>
-
- <para>Support for other optional dependencies may require passing options
- to the <command>configure</command> script. Refer to the output from
- <command>./configure --help</command> for additional information.</para>
-
</sect2>
-
+-->
<sect2 role="content">
<title>Contents</title>
@@ -151,15 +134,16 @@
<segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>amarok, amarokapp, amarokcollectionscanner,
- amarok_daapserver.rb, and amarok_proxy.rb</seg>
- <seg>libamarok.so, and several modules
- for installed dependencies</seg>
- <seg><envar>$KDE_PREFIX</envar>/share/apps/amarok and
- <envar>$KDE_PREFIX</envar>/share/doc/HTML/*/amarok</seg>
+ <seg>amarok, amarok_afttagger, amarokcollectionscanner
+ and amarokpkg</seg>
+ <seg>libamarok-sqlcollection.so, libamarok-transcoding.so,
+ libamarokcore.so, libamaroklib.so, libamarokocsclient.so,
+ libamarokpud.so, libampache_account_login.so and several
+ libraries in $KDE4_PREFIX/lib/kde4</seg>
+ <seg>several in $KDE4_PREFIX/share</seg>
</seglistitem>
</segmentedlist>
-
+<!--
<variablelist>
<bridgehead renderas="sect3">Short Descriptions</bridgehead>
<?dbfo list-presentation="list"?>
@@ -218,7 +202,7 @@
</varlistentry>
</variablelist>
-
+-->
</sect2>
-</sect1>
+</sect1>
\ No newline at end of file
Deleted: trunk/BOOK/multimedia/audioutils/amarok2.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/amarok2.xml 2012-03-23 22:07:10 UTC
(rev 9742)
+++ trunk/BOOK/multimedia/audioutils/amarok2.xml 2012-03-23 22:21:30 UTC
(rev 9743)
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-
- <!ENTITY amarok2-download-http
"&kde4-download-http;amarok/&amarok2-version;/src/amarok-&amarok2-version;.tar.bz2">
- <!ENTITY amarok2-download-ftp
"&kde4-download-http;amarok/&amarok2-version;/src/amarok-&amarok2-version;.tar.bz2">
- <!ENTITY amarok2-md5sum "b7983eaa33e4771769ae9e330c811995">
- <!ENTITY amarok2-size "44 MB">
- <!ENTITY amarok2-buildsize "801 MB">
- <!ENTITY amarok2-time "9.2 SBU">
-]>
-
-<sect1 id="amarok2" xreflabel="amarok-&amarok2-version;">
- <?dbhtml filename="amarok2.html"?>
-
- <sect1info>
- <othername>$LastChangedBy$</othername>
- <date>$Date$</date>
- </sect1info>
-
- <title>Amarok-&amarok2-version;</title>
-
- <indexterm zone="amarok2">
- <primary sortas="a-Amarok2">Amarok2</primary>
- </indexterm>
-
- <sect2 role="package">
- <title>Introduction to Amarok2</title>
-
- <para><application>Amarok2</application> is a powerful audio player for
- the KDE4 environment.
- Features include a context browser, integration with many online music
- services and support for management of several digital music players
- including Apple's iPod.</para>
-
- &lfs70_checked;
-
- <bridgehead renderas="sect3">Package Information</bridgehead>
- <itemizedlist spacing="compact">
- <listitem>
- <para>Download (HTTP): <ulink url="&amarok2-download-http;"/></para>
- </listitem>
- <listitem>
- <para>Download (FTP): <ulink url="&amarok2-download-ftp;"/></para>
- </listitem>
- <listitem>
- <para>Download MD5 sum: &amarok2-md5sum;</para>
- </listitem>
- <listitem>
- <para>Download size: &amarok2-size;</para>
- </listitem>
- <listitem>
- <para>Estimated disk space required: &amarok2-buildsize;</para>
- </listitem>
- <listitem>
- <para>Estimated build time: &amarok2-time;</para>
- </listitem>
- </itemizedlist>
-
- <bridgehead renderas="sect3">Amarok2 Dependencies</bridgehead>
-
- <bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">
- <xref linkend="kde4libs"/>,
- <xref linkend="mysql"/> and
- <xref linkend="taglib"/>
- </para>
-
- <bridgehead renderas="sect4">Recommended</bridgehead>
- <para role="recommended">
- <xref linkend="ffmpeg"/>
- </para>
-
- <bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">
- <xref linkend="curl"/> (for MP3tunes integration),
- <xref linkend="libxml2"/> (for MP3tunes integration),
- <xref linkend="openssl"/> (for MP3tunes integration),
- <xref linkend="glib2"/> (for MP3tunes integration),
- <xref linkend="gdk-pixbuf"/> (for iPod support),
- <ulink url="http://qjson.sourceforge.net/";>QJson</ulink> (for Playdar
integration),
- <ulink url="http://www.gtkpod.org/libgpod.html";>libgpod</ulink> (for iPod
support),
- <ulink url="http://libmtp.sourceforge.net/";>libmtp</ulink> (for MTP device
support),
- <ulink
url="http://code.google.com/p/qtscriptgenerator/";>qtscript-qt</ulink>,
- <ulink url="http://launchpad.net/liblastfm";>liblastfm</ulink> (for Last.fm
integration),
- <ulink url="http://code.google.com/p/musicip-libofa";>libofa</ulink> (for
MusicBrainz support),
- <ulink url="http://wiki.gpodder.org/wiki/Libmygpo-qt";>libmygpo-qt</ulink>
(for gpodder.net podcast support) and
- <ulink url="http://launchpad.net/loudmouth";>loudmouth</ulink> (for
MP3tunes integration)
- </para>
-
- <para condition="html" role="usernotes">User Notes:
- <ulink url="&blfs-wiki;/amarok2"/></para>
-
- </sect2>
-
- <sect2 role="installation">
- <title>Installation of Amarok2</title>
-
- <para>Install <application>Amarok2</application> by running
- the following commands:</para>
-
-<screen><userinput>mkdir build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
- .. &&
-make</userinput></screen>
-
- <para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
- </sect2>
-<!--
- <sect2 role="commands">
- <title>Command Explanations</title>
-
- <para><parameter>- -prefix=$(kde-config - -prefix)</parameter>: This
- parameter uses <command>kde-config</command> to establish the prefix of
- the existing KDE installation and then sets the installation prefix for
- <application>Amarok2</application> to the same value.</para>
-
- </sect2>
--->
- <sect2 role="content">
- <title>Contents</title>
-
- <segmentedlist>
- <segtitle>Installed Programs</segtitle>
- <segtitle>Installed Libraries</segtitle>
- <segtitle>Installed Directories</segtitle>
-
- <seglistitem>
- <seg>amarok, amarok_afttagger, amarokcollectionscanner,
- and amarokpkg</seg>
- <seg>libamarok-sqlcollection.so, libamarok-transcoding.so,
- libamarokcore.so, libamaroklib.so, libamarokocsclient.so,
- libamarokpud.so, libampache_account_login.so and several
- libraries in $KDE4_PREFIX/lib/kde4</seg>
- <seg>several in $KDE4_PREFIX/share</seg>
- </seglistitem>
- </segmentedlist>
-<!--
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="amarok-prog">
- <term><command>amarok</command></term>
- <listitem>
- <para>is a wrapper for <command>amarokapp</command> to speed up
- command line argument passing</para>
- <indexterm zone="amarok amarok-prog">
- <primary sortas="b-amarok">amarok</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="amarokapp">
- <term><command>amarokapp</command></term>
- <listitem>
- <para>is the <application>Amarok2</application> audio player</para>
- <indexterm zone="amarok amarokapp">
- <primary sortas="b-amarokapp">amarokapp</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="amarokcollectionscanner">
- <term><command>amarokcollectionscanner</command></term>
- <listitem>
- <para>is used to scan a directory structure and build a
collection</para>
- <indexterm zone="amarokcollectionscanner">
- <primary
sortas="b-amarokcollectionscanner">amarokcollectionscanner</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="amarok_daapserver.rb">
- <term><command>amarok_daapserver.rb</command></term>
- <listitem>
- <para>is a DAAP server for <application>Amarok2</application></para>
- <indexterm zone="amarok amarok_daapserver.rb">
- <primary
sortas="b-amarok_daapserver.rb">amarok_daapserver.rb</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="amarok_proxy.rb">
- <term><command>amarok_proxy.rb</command></term>
- <listitem>
- <para>is a proxy server for DAAP and
- <ulink url="http://www.last.fm/";>Last.fm</ulink></para>
- <indexterm zone="amarok amarok_proxy.rb">
- <primary sortas="b-amarok_proxy.rb">amarok_proxy.rb</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- </variablelist>
--->
- </sect2>
-
-</sect1>
\ No newline at end of file
Modified: trunk/BOOK/multimedia/audioutils/audioutils.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/audioutils.xml 2012-03-23 22:07:10 UTC
(rev 9742)
+++ trunk/BOOK/multimedia/audioutils/audioutils.xml 2012-03-23 22:21:30 UTC
(rev 9743)
@@ -29,7 +29,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="freetts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="audacious.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="amarok.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="amarok2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="gnome-media.xml"/>
</chapter>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
