AmaroK 1.2-beta4 package

Question

I'm an amaroK developer, and want to start either maintaining the official amaroK package for Arch or/and start providing weekly CVS builds.
amaroK 1.2-beta4 isn't out yet, but it will be soon, so here's a sneak peak. Please tell me how the package sucks, how it can be improved etc. This is the first arch build I've offered for other people, so it is probably flakey:
http://methylblue.com/amarok/amarok-1.2 … pkg.tar.gz
Issues:
I built in the xine and gstreamer engines. There is no dependency check for xine-lib or gstreamer because, the engines are plugins, amaroK will still work without 1 of gst/xine installed, and because eventually I want these dependencies to be met by separate packages.
There is no aRts engine, currently.
It also is built with support for LibVisual CVS (0.2.0), but again this is a plugin and amaroK stability/etc. is not affected. Grab libvisual cvs if you want to see the amazing new stuff coming along in that project.
Finally I'm actually running kdelibs-CVS, so it's possible it may not even run for you guys. In which case I'll reinstall the Arch packages for KDE, and build against those. KDE is supposedly binary compatable in the 3.x series so supposedly it should be ok.
I look forward to your comments/criticism, etc.
Here's the PKGBUILD, it runs straight off of a CVS checkout, as this would be the CVS snapshot build.
# $Id: PKGBUILD,v 1.13 2004/10/23 16:10:41 damir Exp $
# Maintainer: mxcl <[email protected]>
pkgname=amarok
pkgver=1.2beta4
pkgrel=1
pkgdesc="amaroK - an audio-player that depends on KDElibs"
url="http://amarok.kde.org/"
depends=('kdelibs>=3.2' 'taglib>=1.3.1')
build() {
cd $startdir/src/kdeextragear-1
cvs up -l
cvs up amarok
make -f Makefile.cvs
./configure --prefix=/opt/kde --without-arts --enable-final --enable-debug
unsermake || return 1
unsermake prefix=$startdir/pkg/opt/kde install

Answer 1

What a pity, amaroK can not show the id3 of CJK (Chinese japanese & Korean) character. I hade to recompile it with the following patch every time when the new version of amaroK be released. Will you please take a look at the following patch and take some changes in amaroK? Thank.
--- amarok-1.1.1/amarok/src/metabundle.cpp.orig 2004-10-09 20:52:09.000000000 +0800
+++ amarok-1.1.1/amarok/src/metabundle.cpp 2004-10-16 09:41:32.627671624 +0800
@@ -9,6 +9,8 @@
#include <qfile.h>
#include <kfilemetainfo.h>
+#include <kmimetype.h>
+#include <kstringhandler.h>
#include <taglib/audioproperties.h>
#include <taglib/fileref.h>
@@ -85,15 +87,28 @@
//Taglib::Tag ctor //TODO DEPRECATE
MetaBundle::MetaBundle( const KURL &url, TagLib::Tag *tag, TagLib::AudioProperties *ap )
- : m_url( url )
- , m_title( TStringToQString( tag->title() ).stripWhiteSpace() )
- , m_artist( TStringToQString( tag->artist() ).stripWhiteSpace() )
- , m_album( TStringToQString( tag->album() ).stripWhiteSpace() )
- , m_year( tag->year() ? QString::number( tag->year() ) : QString::null )
- , m_comment( TStringToQString( tag->comment() ).stripWhiteSpace() )
- , m_genre( TStringToQString( tag->genre() ).stripWhiteSpace() )
- , m_track( tag->track() ? QString::number( tag->track() ) : QString::null )
+{
+ m_url = url;
+ KMimeType::Ptr result = KMimeType::findByURL(m_url, 0, true, true);
+
+ if ( result->name() != "audio/x-mp3") {
+ m_title = TStringToQString( tag->title() ).stripWhiteSpace();
+ m_artist = TStringToQString( tag->artist() ).stripWhiteSpace();
+ m_album = TStringToQString( tag->album() ).stripWhiteSpace();
+ m_comment = TStringToQString( tag->comment() ).stripWhiteSpace();
+ m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
+ m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
+ m_track = tag->track() ? QString::number( tag->track() ) : QString::null;
+ }
+ else {
+ m_title = KStringHandler::from8Bit( TStringToQString(tag->title()).latin1()).stripWhiteSpace();
+ m_artist = KStringHandler::from8Bit( TStringToQString(tag->artist()).latin1()).stripWhiteSpace();
+ m_album = KStringHandler::from8Bit( TStringToQString(tag->album()).latin1()).stripWhiteSpace();
+ m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
+ m_comment = KStringHandler::from8Bit( TStringToQString(tag->comment()).latin1()).stripWhiteSpace();
+ m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
+ m_track = tag->track() ? QString::number( tag->track() ) : QString::null;
+ }
init( ap );
@@ -149,12 +164,15 @@
TagLib::FileRef f( QFile::encodeName( m_url.path() ), readAudioProperties, TagLib::AudioProperties::Fast );
- if( !f.isNull() )
+ KMimeType::Ptr result = KMimeType::findByURL(m_url, 0, true, true);
+
+ if( !f.isNull() )
if( f.tag() )
TagLib::Tag *tag = f.tag();
+
+ if ( result->name() != "audio/x-mp3") {
m_title = TStringToQString( tag->title() ).stripWhiteSpace();
m_artist = TStringToQString( tag->artist() ).stripWhiteSpace();
m_album = TStringToQString( tag->album() ).stripWhiteSpace();
@@ -162,6 +180,16 @@
m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
m_track = tag->track() ? QString::number( tag->track() ) : QString::null;
+ }
+ else {
+ m_title = KStringHandler::from8Bit( TStringToQString(tag->title()).latin1()).stripWhiteSpace();
+ m_artist = KStringHandler::from8Bit( TStringToQString(tag->artist()).latin1()).stripWhiteSpace();
+ m_album = KStringHandler::from8Bit( TStringToQString(tag->album()).latin1()).stripWhiteSpace();
+ m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
+ m_comment = KStringHandler::from8Bit( TStringToQString(tag->comment()).latin1()).stripWhiteSpace();
+ m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
+ m_track = tag->track() ? QString::number( tag->track() ) : QString::null;
+ }
init( f.audioProperties() ); //no need to test for the readAudioProperties bool
--- amarok-1.1.1/amarok/src/tagdialog.cpp.org 2004-10-09 20:52:10.000000000 +0800
+++ amarok-1.1.1/amarok/src/tagdialog.cpp 2004-10-23 11:49:02.000000000 +0800
@@ -29,6 +29,7 @@
#include <krun.h>
#include <kstandarddirs.h>
+#define QStringToMyTString(s) TagLib::String(s.local8Bit().data(), TagLib::String::Latin1)
TagDialog::TagDialog( const KURL& url, QWidget* parent )
: TagDialogBase( parent )
@@ -461,13 +462,13 @@
QApplication::setOverrideCursor( KCursor::waitCursor() );
TagLib::Tag * t = f.tag();
- t->setTitle( QStringToTString( mb.title() ) );
- t->setArtist( QStringToTString( mb.artist() ) );
- t->setAlbum( QStringToTString( mb.album() ) );
+ t->setTitle( QStringToMyTString( mb.title() ) );
+ t->setArtist( QStringToMyTString( mb.artist() ) );
+ t->setAlbum( QStringToMyTString( mb.album() ) );
t->setTrack( mb.track().toInt() );
t->setYear( mb.year().toInt() );
- t->setComment( QStringToTString( mb.comment() ) );
- t->setGenre( QStringToTString( mb.genre() ) );
+ t->setComment( QStringToMyTString( mb.comment() ) );
+ t->setGenre( QStringToMyTString( mb.genre() ) );
bool result = f.save();
if( result )