Changeset afd3b20b

Timestamp:

03/23/2012 10:21:30 PM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

1321a15

Parents:

33cf52e

Message:

removed amarok 1.4.8

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9743 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/audioutils/amarok.xml (modified) (7 diffs)
• multimedia/audioutils/amarok2.xml (deleted)
• multimedia/audioutils/audioutils.xml (modified) (1 diff)

general.ent

@@ -992 +992 @@
 <!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">
 

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[rthomsen] - removed amarok 1.4.8.</para>
+        </listitem>
+        <listitem>
           <para>[rthomsen] - upgrade to xterm 278.</para>
         </listitem>

multimedia/audioutils/amarok.xml

@@ -5 +5 @@
   %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">
 ]>
 
@@ -32 +30 @@
     <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>
@@ -63 +63 @@
 
     <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>
@@ -97 +99 @@
     <title>Installation of Amarok</title>
 
-    <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 &amp;&amp;
+    <para>Install <application>Amarok</application> by running
+    the following commands:</para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
+      -DKDE_DEFAULT_HOME=.kde4 \
+      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+      .. &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>
 
@@ -113 +115 @@
 
   </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>
+-->
   <sect2 role="content">
     <title>Contents</title>
@@ -152 +135 @@
 
       <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>
@@ -219 +203 @@
 
     </variablelist>
-
+-->
   </sect2>
 

multimedia/audioutils/audioutils.xml

@@ -30 +30 @@
   <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"/>