New version (#85284). Correct gstreamer dependencies (#84663). Add support for visualization plugins through libvisual (#82165). Warn that aRts support is deprecated (as requested in bug #85542). Add patch to fix kde bug 101524.

Package-Manager: portage-2.0.51.19

5 files changed, 233 insertions, 8 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 0cdc2814c27a..1de61ced0fc5 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.48 2005/02/28 23:20:20 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.49 2005/03/18 16:49:44 greg_g Exp $
+
+*amarok-1.2.2 (18 Mar 2005)
+
+  18 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/amarok-1.2.2-contextbrowser-cpu-fix.patch, +amarok-1.2.2.ebuild:
+  New version (#85284). Correct gstreamer dependencies (#84663). Add support for
+  visualization plugins through libvisual (#82165). Warn that aRts support is
+  deprecated (as requested in bug #85542). Add patch to fix kde bug 101524.
 
 *amarok-1.2.1 (01 Mar 2005)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index b3802369a393..6264a637b837 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,11 +1,14 @@
-MD5 8ab1d316a1506fe1ecff05ba7f6cf8cb amarok-1.1.1.ebuild 1578
+MD5 15a028c1f8fff178682119240f0189be metadata.xml 181
 MD5 018c1cd00abeacfdc4f2d648b78efd21 amarok-1.2.ebuild 1681
-MD5 92265aae60960f205fe531225936eb99 amarok-1.2.1.ebuild 1682
+MD5 87a75e16933d92c4cfccef6fedf4d000 amarok-1.2.2.ebuild 2471
 MD5 8dec94b33db41952f96628c1948fa301 amarok-1.0.2.ebuild 1199
-MD5 537f8e380623bb874b9e40ae9d3d460a ChangeLog 7129
-MD5 15a028c1f8fff178682119240f0189be metadata.xml 181
-MD5 29fa546c14f7d1c0498727a37e1468c0 files/digest-amarok-1.2 64
-MD5 8af9e3314d69ebb6341e75b5a1ead176 files/amarok-1.0-cjk-a.diff 1532
-MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
+MD5 3cacd500a3ac0636a81ff713d539f986 ChangeLog 7519
+MD5 92265aae60960f205fe531225936eb99 amarok-1.2.1.ebuild 1682
+MD5 8ab1d316a1506fe1ecff05ba7f6cf8cb amarok-1.1.1.ebuild 1578
 MD5 33697f318e63c60a1ec8082330eece7f files/digest-amarok-1.1.1 66
+MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
+MD5 29fa546c14f7d1c0498727a37e1468c0 files/digest-amarok-1.2 64
 MD5 2a078f136cadb54f32bd6531ef66e218 files/digest-amarok-1.2.1 66
+MD5 13f06732c7435e60cc160fdd9bdc293a files/amarok-1.2.2-contextbrowser-cpu-fix.patch 5191
+MD5 8af9e3314d69ebb6341e75b5a1ead176 files/amarok-1.0-cjk-a.diff 1532
+MD5 b9f7fa7da92d9361c1effc82b09ebe07 files/digest-amarok-1.2.2 66
diff --git a/media-sound/amarok/amarok-1.2.2.ebuild b/media-sound/amarok/amarok-1.2.2.ebuild
new file mode 100644
index 000000000000..d9075cfc408f
--- /dev/null
+++ b/media-sound/amarok/amarok-1.2.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.2.ebuild,v 1.1 2005/03/18 16:49:44 greg_g Exp $
+
+inherit kde eutils
+
+DESCRIPTION="amaroK - the audio player for KDE"
+HOMEPAGE="http://amarok.kde.org/"
+SRC_URI="mirror://sourceforge/amarok/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="arts flac gstreamer kde mad mysql noamazon oggvorbis opengl xine xmms visualization"
+# kde: enables compilation of the konqueror sidebar plugin
+
+RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+	 arts? ( kde-base/arts
+		 || ( ( kde-base/kdemultimedia-arts kde-base/akode )
+		 	kde-base/kdemultimedia ) )
+	 opengl? ( virtual/opengl )
+	 xmms? ( >=media-sound/xmms-1.2 )
+	 xine? ( >=media-libs/xine-lib-1_rc4 )
+	 >=media-libs/tunepimp-0.3.0
+	 >=media-libs/taglib-1.3.1
+	 gstreamer? ( >=media-libs/gst-plugins-0.8.6
+	 	      mad? ( >=media-plugins/gst-plugins-mad-0.8.6 )
+		      oggvorbis? ( >=media-plugins/gst-plugins-ogg-0.8.6
+				   >=media-plugins/gst-plugins-vorbis-0.8.6 )
+		      flac? ( >=media-plugins/gst-plugins-flac-0.8.6 ) )
+	 mysql? ( >=dev-db/mysql-4 )
+	 visualization? ( media-libs/libsdl
+			  >=media-plugins/libvisual-plugins-0.2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+need-kde 3.2
+
+pkg_setup() {
+	if use arts && ! use xine && ! use gstreamer; then
+		ewarn "aRTs support is deprecated, if you have problems please consider"
+		ewarn "enabling support for Xine or GStreamer"
+		ewarn "(emerge amarok again with USE=\"xine\" or USE=\"gstreamer\")."
+		ebeep 2
+	fi
+
+	if ! use arts && ! use xine && ! use gstreamer; then
+		eerror "amaroK needs either aRts (deprecated), Xine or GStreamer to work,"
+		eerror "please try again with USE=\"arts\", USE=\"xine\" or USE=\"gstreamer\"."
+		die
+	fi
+
+	# check whether kdelibs was compiled with arts support
+	kde_pkg_setup
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	# see kde bug 101524. Applied in CVS.
+	epatch "${FILESDIR}/${P}-contextbrowser-cpu-fix.patch"
+}
+
+src_compile() {
+	# amarok does not respect kde coding standards, and makes a lot of
+	# assuptions regarding its installation directory. For this reason,
+	# it must be installed in the KDE install directory.
+	PREFIX="`kde-config --prefix`"
+
+	myconf="$(use_with arts) $(use_with xine)
+		$(use_with gstreamer) $(use_enable mysql)
+		$(use_with opengl) $(use_enable !noamazon amazon)"
+
+	kde_src_compile
+}
diff --git a/media-sound/amarok/files/amarok-1.2.2-contextbrowser-cpu-fix.patch b/media-sound/amarok/files/amarok-1.2.2-contextbrowser-cpu-fix.patch
new file mode 100644
index 000000000000..fd7560924da8
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.2.2-contextbrowser-cpu-fix.patch
@@ -0,0 +1,137 @@
+Index: amarok/src/contextbrowser.cpp
+===================================================================
+RCS file: /home/kde/kdeextragear-1/amarok/src/contextbrowser.cpp,v
+retrieving revision 1.416
+diff -u -p -r1.416 contextbrowser.cpp
+--- amarok/src/contextbrowser.cpp	15 Mar 2005 13:14:21 -0000	1.416
++++ amarok/src/contextbrowser.cpp	15 Mar 2005 21:31:39 -0000
+@@ -36,12 +36,12 @@
+ #include <kio/job.h>
+ #include <kio/jobclasses.h>
+ #include <klocale.h>
+-#include <kmdcodec.h> // for dataUrlFromImage()
+ #include <kmessagebox.h>
+ #include <kpopupmenu.h>
+ #include <krun.h>
+ #include <kstandarddirs.h> //locate file
+ #include <ktabbar.h>
++#include <ktempfile.h>
+ #include <kurl.h>
+ 
+ #define escapeHTML(s)     QString(s).replace( "&", "&amp;" ).replace( "<", "&lt;" ).replace( ">", "&gt;" )
+@@ -79,6 +79,9 @@
+         , m_dirtyCurrentTrackPage( true )
+         , m_dirtyLyricsPage( true )
+         , m_emptyDB( CollectionDB::instance()->isEmpty() )
++        , m_bgGradientImage( 0 )
++        , m_headerGradientImage( 0 )
++        , m_shadowGradientImage( 0 )
+         , m_suggestionsOpen( true )
+         , m_favouritesOpen( true )
+ {
+@@ -141,6 +144,9 @@
+ 
+ ContextBrowser::~ContextBrowser()
+ {
++     delete m_bgGradientImage;
++     delete m_headerGradientImage;
++     delete m_shadowGradientImage;
+ }
+ 
+ 
+@@ -1384,14 +1390,6 @@
+     m_lyricsPage->setUserStyleSheet( m_styleSheet );
+ }
+ 
+-static QString dataUrlFromImage( const QImage &img )
+-{
+-    QByteArray ba;
+-    QBuffer buffer( ba );
+-    buffer.open( IO_WriteOnly );
+-    img.save( &buffer, "PNG" ); // writes image into ba in PNG format
+-    return QString("data:image/png;base64,%1").arg( KCodecs::base64Encode( ba ) );
+-}
+ 
+ void ContextBrowser::setStyleSheet_Default( QString& styleSheet )
+ {
+@@ -1405,14 +1403,29 @@
+     const QColor bgColor = colorGroup().highlight();
+     const amaroK::Color gradientColor = bgColor;
+ 
++    delete m_bgGradientImage;
++    delete m_headerGradientImage;
++    delete m_shadowGradientImage;
++
++    m_bgGradientImage = new KTempFile( locateLocal( "tmp", "gradient" ), ".png", 0600 );
+     QImage image = KImageEffect::gradient( QSize( 600, 1 ), gradientColor, gradientColor.light( 130 ), KImageEffect::PipeCrossGradient );
+-    QString bgGradientImage = dataUrlFromImage( image );
++    image.save( m_bgGradientImage->file(), "PNG" );
++    m_bgGradientImage->close();
+ 
++    m_headerGradientImage = new KTempFile( locateLocal( "tmp", "gradient_header" ), ".png", 0600 );
+     QImage imageH = KImageEffect::unbalancedGradient( QSize( 1, 10 ), bgColor, gradientColor.light( 130 ), KImageEffect::VerticalGradient, 100, -100 );
+-    QString headerGradientImage = dataUrlFromImage( imageH );
++    imageH.copy( 0, 1, 1, 9 ).save( m_headerGradientImage->file(), "PNG" );
++    m_headerGradientImage->close();
+ 
++    m_shadowGradientImage = new KTempFile( locateLocal( "tmp", "gradient_shadow" ), ".png", 0600 );
+     QImage imageS = KImageEffect::unbalancedGradient( QSize( 1, 10 ), baseColor, Qt::gray, KImageEffect::VerticalGradient, 100, -100 );
+-    QString shadowGradientImage = dataUrlFromImage( imageS );
++    imageS.save( m_shadowGradientImage->file(), "PNG" );
++    m_shadowGradientImage->close();
++
++    //unlink the files for us on deletion
++    m_bgGradientImage->setAutoDelete( true );
++    m_headerGradientImage->setAutoDelete( true );
++    m_shadowGradientImage->setAutoDelete( true );
+ 
+     //we have to set the color for body due to a KHTML bug
+     //KHTML sets the base color but not the text color
+@@ -1420,7 +1433,7 @@
+             .arg( pxSize )
+             .arg( text )
+             .arg( AmarokConfig::schemeAmarok() ? fg : gradientColor.name() )
+-            .arg( bgGradientImage )
++            .arg( m_bgGradientImage->name() )
+             .arg( fontFamily );
+ 
+     //text attributes
+@@ -1442,11 +1455,11 @@
+             .arg( fg )
+             .arg( bg )
+             .arg( pxSize + 2 )
+-            .arg( headerGradientImage );
++            .arg( m_headerGradientImage->name() );
+ 
+     styleSheet += QString( ".box-body { padding: 2px; background-color: %1; background-image: url( %2 ); background-repeat: repeat-x; font-size:%3px; }" )
+             .arg( colorGroup().base().name() )
+-            .arg( shadowGradientImage )
++            .arg( m_shadowGradientImage->name() )
+             .arg( pxSize );
+ 
+     //"Albums by ..." related styles
+Index: amarok/src/contextbrowser.h
+===================================================================
+RCS file: /home/kde/kdeextragear-1/amarok/src/contextbrowser.h,v
+retrieving revision 1.67
+diff -u -p -r1.67 contextbrowser.h
+--- amarok/src/contextbrowser.h	14 Mar 2005 19:24:54 -0000	1.67
++++ amarok/src/contextbrowser.h	15 Mar 2005 21:31:39 -0000@@ -15,6 +15,7 @@
+@@ -15,6 +15,7 @@
+ 
+ class KHTMLPart;
+ class KTabBar;
++class KTempFile;
+ 
+ namespace KIO { class Job; }
+ 
+@@ -82,6 +83,9 @@
+         QString       m_lyricAddUrl;
+         QString       m_lyricSearchUrl;
+         QString       m_HTMLSource;
++        KTempFile    *m_bgGradientImage;
++        KTempFile    *m_headerGradientImage;
++        KTempFile    *m_shadowGradientImage;
+         QStringList   m_metadataHistory;
+         KURL          m_currentURL;
+ 
diff --git a/media-sound/amarok/files/digest-amarok-1.2.2 b/media-sound/amarok/files/digest-amarok-1.2.2
new file mode 100644
index 000000000000..a8fa5e7ecabd
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.2.2
@@ -0,0 +1 @@
+MD5 af3bd552fbc61168a894a9cd447d2b2e amarok-1.2.2.tar.bz2 5966639