Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6d446fc195c2ceebbedab7469e3a6d4a34f0f874)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6d446fc195c2ceebbedab7469e3a6d4a34f0f874)
  • Date: Sun, 21 Dec 2008 10:49:17 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-players/last.fm/DETAILS | 6
audio-players/last.fm/HISTORY | 6
audio-players/last.fm/INSTALL | 1
audio-players/last.fm/PRE_BUILD | 19 +-
audio-players/last.fm/last.fm | 2
audio-players/last.fm/mad-asneeded.patch | 11 -
audio-players/last.fm/no-fingerprint-lib.diff | 237
++++++++++++++++++++++++++
7 files changed, 266 insertions(+), 16 deletions(-)

New commits:
commit e9f413174a79fdabc04ce9848584786b9863222b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

last.fm: bump to 1.5.1, make it build at all again

diff --git a/audio-players/last.fm/DETAILS b/audio-players/last.fm/DETAILS
index 07919b7..7bb83e8 100755
--- a/audio-players/last.fm/DETAILS
+++ b/audio-players/last.fm/DETAILS
@@ -1,9 +1,9 @@
SPELL=last.fm
- VERSION=1.4.2.58240
- SOURCE=$SPELL-$VERSION.src.tar.bz2
+ VERSION=1.5.1.31879
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://cdn.last.fm/client/src/$SOURCE
-
SOURCE_HASH=sha512:0f206245a96b35e65ab91b31196cc62c38ab8ce4d39b630b04974f53805b86e4d8370dc1545155b8f6cf0244375db3c855bd610bfa9a754c467da63c6bc35b79
+
SOURCE_HASH=sha512:c5ad12e447270cf67c718511c1a8e35aab90d48dfba4611a69ed0b640e44c0ea1a91fae75fc23ccca46ae496ed9d1e2c395874ee3623073b2ac10d87650f0647
WEB_SITE=http://www.last.fm
LICENSE[0]=GPL
ENTERED=20070325
diff --git a/audio-players/last.fm/HISTORY b/audio-players/last.fm/HISTORY
index 87fc827..1fd8bda 100644
--- a/audio-players/last.fm/HISTORY
+++ b/audio-players/last.fm/HISTORY
@@ -1,3 +1,9 @@
+2008-12-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 1.5.1
+ * PRE_BUILD, no-fingerprint-lib.diff: make it build, really
+ * INSTALL: make sure everyone has rx permission on last.fm script
+ * mad-asneeded.patch: not needed anymore
+
2008-02-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* BUILD: don't build it twice just to remove a flag
* mad-asneeded.patch, PRE_BUILD: compilation patch from gentoo
diff --git a/audio-players/last.fm/INSTALL b/audio-players/last.fm/INSTALL
index c0c2cdc..46cc107 100755
--- a/audio-players/last.fm/INSTALL
+++ b/audio-players/last.fm/INSTALL
@@ -3,4 +3,5 @@ mkdir -vp "$path" &&
cp -r bin/* "$path" &&
sed -i "s,WOOT,$TRACK_ROOT," $SPELL_DIRECTORY/last.fm &&
cp $SPELL_DIRECTORY/last.fm "$INSTALL_ROOT/usr/bin" &&
+chmod a+rx "$INSTALL_ROOT/usr/bin" &&
default_install
diff --git a/audio-players/last.fm/PRE_BUILD b/audio-players/last.fm/PRE_BUILD
index dca34d9..492ef85 100755
--- a/audio-players/last.fm/PRE_BUILD
+++ b/audio-players/last.fm/PRE_BUILD
@@ -1,2 +1,19 @@
default_pre_build &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/mad-asneeded.patch
+cd "$SOURCE_DIRECTORY" &&
+# Still one for gcc-4.3, last.fm 1.5.1
+echo '--- a/src/libFingerprint/fplib/src/OptFFT.cpp
++++ b/src/libFingerprint/fplib/src/OptFFT.cpp
+@@ -30,7 +30,7 @@
+
+ #include <cmath>
+ #include <cassert>
+-#include <cstdlib>
++#include <cstring>
+ #include <iostream>
+ #include <sstream>
+ #include <cstdlib>
+' | patch -Np1 &&
+# More borkage follows...
+# Fingerprinting is apparently not used on linux and has several build
issues.
+# Disable it!
+patch -Np1 < "$SCRIPT_DIRECTORY/no-fingerprint-lib.diff"
diff --git a/audio-players/last.fm/last.fm b/audio-players/last.fm/last.fm
index 7cc2218..f54a132 100755
--- a/audio-players/last.fm/last.fm
+++ b/audio-players/last.fm/last.fm
@@ -1,4 +1,4 @@
#!/bin/bash
-pushd WOOT/usr/share/last.fm > /dev/null
+pushd /usr/share/last.fm > /dev/null
./last.fm.sh
popd > /dev/null
diff --git a/audio-players/last.fm/mad-asneeded.patch
b/audio-players/last.fm/mad-asneeded.patch
deleted file mode 100644
index b55548e..0000000
--- a/audio-players/last.fm/mad-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- last.fm-1.4.1.57486/src/libFingerprint/libFingerprint.pro.orig
2007-12-22 13:08:59.000000000 +0100
-+++ last.fm-1.4.1.57486/src/libFingerprint/libFingerprint.pro 2007-12-22
13:09:23.000000000 +0100
-@@ -40,7 +40,7 @@
-
- unix:!mac {
- LIBPATH += $$BUILD_DIR/../fplib
-- LIBS += $$ROOT_DIR/build/fplib/libfplib$${EXT}.a -lsamplerate -lfftw3f
-+ LIBS += $$ROOT_DIR/build/fplib/libfplib$${EXT}.a -lsamplerate -lfftw3f
-lmad
- }
-
- win32 {
diff --git a/audio-players/last.fm/no-fingerprint-lib.diff
b/audio-players/last.fm/no-fingerprint-lib.diff
new file mode 100644
index 0000000..23ed66b
--- /dev/null
+++ b/audio-players/last.fm/no-fingerprint-lib.diff
@@ -0,0 +1,237 @@
+--- a/LastFM.pro
++++ b/LastFM.pro
+@@ -39,6 +39,8 @@
+
+ linux* {
+ SUBDIRS -= src/Twiddly \
++ src/libFingerprint/fplib/pro_qmake/fplib.pro \
++ src/libFingerprint/ \
+ src/Bootstrapper/ITunesDevice
+
+ SUBDIRS += src/output/alsa-playback
+--- a/src/DiagnosticsDialog.cpp
++++ b/src/DiagnosticsDialog.cpp
+@@ -27,7 +27,10 @@
+ #include "container.h"
+ #include "lastfmapplication.h"
+ #include "libMoose/LastFmSettings.h"
++
++#ifndef LINUX
+ #include "libFingerprint/FingerprintCollector.h"
++#endif
+
+ #include <QProcess>
+ #include <QClipboard>
+@@ -106,6 +109,7 @@
+ connect( ui.scrobbleIpodButton, SIGNAL( clicked() ), SLOT(
onScrobbleIpodClicked() ) );
+
+ // Fingerprint collector
++#ifndef LINUX
+ ui.fpQueueSizeLabel->setText( "0" );
+ connect( The::app().m_fpCollector, SIGNAL( trackFingerprintingStarted(
TrackInfo ) ),
+ this, SLOT( onTrackFingerprintingStarted(
TrackInfo ) ),
+@@ -116,6 +120,9 @@
+ connect( The::app().m_fpCollector, SIGNAL( cantFingerprintTrack(
TrackInfo, QString ) ),
+ this, SLOT( onCantFingerprintTrack(
TrackInfo, QString ) ),
+ Qt::QueuedConnection );
++#else
++ ui.tabWidget->removeTab( 2 );
++#endif
+
+ m_logTimer = new QTimer( this );
+ connect( m_logTimer, SIGNAL( timeout() ),
+@@ -336,6 +343,7 @@
+ }
+
+
++#ifndef LINUX
+ void
+ DiagnosticsDialog::onTrackFingerprintingStarted( TrackInfo track )
+ {
+@@ -360,7 +368,7 @@
+ ui.fpCurrentTrackLabel->setText( "" );
+ ui.fpQueueSizeLabel->setText( QString::number(
The::app().m_fpCollector->queueSize() ) );
+ }
+-
++#endif
+
+ void
+ DiagnosticsDialog::onLogPoll()
+--- a/src/DiagnosticsDialog.h
++++ b/src/DiagnosticsDialog.h
+@@ -63,9 +63,11 @@
+ void onRefresh();
+ void onCopyToClipboard();
+
++ #ifndef LINUX
+ void onTrackFingerprintingStarted( TrackInfo );
+ void onTrackFingerprinted( TrackInfo );
+ void onCantFingerprintTrack( TrackInfo track, QString reason );
++ #endif
+
+ void onScrobbleIpodClicked();
+ void onLogPoll();
+--- a/src/lastfmapplication.cpp
++++ b/src/lastfmapplication.cpp
+@@ -26,8 +26,10 @@
+ #include "confirmdialog.h"
+ #include "container.h"
+ #include "LastMessageBox.h"
++#ifndef LINUX
+ #include "libFingerprint/FingerprintCollector.h"
+ #include "libFingerprint/FingerprintQueryer.h"
++#endif
+ #include "logger.h"
+ #include "loginwidget.h"
+ #include "MediaDeviceScrobbler.h"
+@@ -167,10 +169,12 @@
+ new ITunesScript( this, m_listener );
+ #endif
+
++ #ifndef LINUX
+ m_fpCollector = new FingerprintCollector( 1 /*number of threads*/, this
);
+ m_fpQueryer = new FingerprintQueryer( this );
+ connect( m_fpQueryer, SIGNAL( trackFingerprinted( TrackInfo, bool ) ),
+ SLOT( onFingerprintQueryDone( TrackInfo, bool ) )
);
++ #endif
+
+ m_radio = new Radio( this );
+ connect( m_radio, SIGNAL( stateChanged( RadioState ) ), SLOT(
onRadioStateChanged( RadioState ) ) );
+@@ -365,8 +369,10 @@
+ sendPostedEvents( m_scrobbler, 0 /*all event types*/ );
+ //TODO send events to individual scrobblers in the manager too?
+
++ #ifndef LINUX
+ delete m_fpQueryer;
+ delete m_fpCollector;
++ #endif
+
+ #ifdef Q_WS_MAC
+ if ( !m_pidFile.remove() )
+@@ -534,6 +540,7 @@
+ QString password = m_user->settings().password();
+ QString version = The::settings().version();
+
++ #ifndef LINUX
+ // as you can see we are initialising the fingerprinter, I like this
comment
+ m_fpCollector->setUsername( username );
+ m_fpCollector->setPasswordMd5( password );
+@@ -542,6 +549,7 @@
+ m_fpQueryer->setPasswordMd5( password );
+ m_fpQueryer->setPasswordMd5Lower( password ); // FIXME: surely they
can't be the same!
+ m_fpQueryer->setVersion( The::settings().version() );
++ #endif
+
+ // init radio YTIO
+ m_radio->init( username, password, version );
+@@ -849,12 +857,14 @@
+ if ( m_container->isVisible() )
+ fetchMetaData();
+
++ #ifndef LINUX
+ if ( QFile::exists( m_currentTrack.path() ) &&
+ The::settings().currentUser().fingerprintingEnabled() )
+ {
+ m_activeNorman = 0;
+ m_fpQueryer->fingerprint( m_currentTrack );
+ }
++ #endif
+ }
+ }
+ break;
+@@ -1167,6 +1177,7 @@
+ }
+
+
++#ifndef LINUX
+ void
+ LastFmApplication::onFingerprintQueryDone( TrackInfo track, bool
fullFpRequested )
+ {
+@@ -1199,6 +1210,7 @@
+ }
+ }
+ }
++#endif
+
+
+ void
+--- a/src/lastfmapplication.h
++++ b/src/lastfmapplication.h
+@@ -181,7 +181,9 @@
+ void onAppEvent( int event, const QVariant& );
+ void onRequestReturned( class Request* request );
+ void onScrobblerStatusUpdate( int, const QVariant& );
++#ifndef LINUX
+ void onFingerprintQueryDone( TrackInfo, bool fullFpRequested );
++#endif
+ void onNormanRequestDone( Request* r );
+ void onPlaybackEndedTimerTimeout();
+
+@@ -208,8 +210,10 @@
+ class QTcpServer* m_control;
+ class ScrobblerManager* m_scrobbler;
+ class Radio* m_radio;
++#ifndef LINUX
+ class FingerprintCollector* m_fpCollector;
+ class FingerprintQueryer* m_fpQueryer;
++#endif
+ class FrikkinNormanRequest* m_activeNorman;
+
+ QPointer<class ArtistMetaDataRequest> m_activeArtistReq;
+--- a/src/Radio.cpp
++++ b/src/Radio.cpp
+@@ -129,7 +129,9 @@
+ m_session = handshake->session();
+ m_basePath = handshake->basePath();
+
++ #ifndef LINUX
+ The::settings().setFingerprintUploadUrl(
handshake->fingerprintUploadUrl() );
++ #endif
+
+ setState( State_Handshaken );
+
+--- a/src/settingsdialog.cpp
++++ b/src/settingsdialog.cpp
+@@ -210,7 +210,11 @@
+ connect( ui_scrobbling.dirTree, SIGNAL( dataChanged() ), this, SLOT(
configChanged() ) );
+ connect( ui_scrobbling.scrobblePointSlider, SIGNAL( valueChanged( int )
), this, SLOT( configChanged() ) );
+ connect( ui_scrobbling.launchWithMediaPlayerCheck, SIGNAL( toggled(
bool ) ), this, SLOT( configChanged() ) );
++#ifndef LINUX
+ connect( ui_scrobbling.fingerprintCheckBox, SIGNAL( stateChanged( int )
), this, SLOT( configChanged() ) );
++#else
++ ui_scrobbling.fingerprintCheckBox->hide();
++#endif
+ connect( ui_connection.proxyBox, SIGNAL( toggled( bool ) ), this, SLOT(
configChanged() ) );
+ connect( ui_connection.proxyHostEdit, SIGNAL( textChanged( QString ) ),
this, SLOT( configChanged() ) );
+ connect( ui_connection.proxyPortEdit, SIGNAL( textChanged( QString ) ),
this, SLOT( configChanged() ) );
+@@ -379,7 +383,9 @@
+ ui_scrobbling.scrobblePointSlider->setValue( user.scrobblePoint() );
+ ui_scrobbling.scrobblePointLabel->setText( QString::number(
user.scrobblePoint() ) );
+ ui_scrobbling.launchWithMediaPlayerCheck->setChecked(
The::settings().launchWithMediaPlayer() );
++#ifndef LINUX
+ ui_scrobbling.fingerprintCheckBox->setChecked(
user.fingerprintingEnabled() );
++#endif
+ ui_scrobbling.dirTree->setExclusions( user.excludedDirs() );
+ }
+
+@@ -567,7 +573,9 @@
+ user.setScrobblePoint( ui_scrobbling.scrobblePointSlider->value() );
+ user.setExcludedDirs( ui_scrobbling.dirTree->getExclusions() );
+ The::settings().setLaunchWithMediaPlayer(
ui_scrobbling.launchWithMediaPlayerCheck->isChecked() );
++#ifndef LINUX
+ user.setFingerprintingEnabled(
ui_scrobbling.fingerprintCheckBox->checkState() == Qt::Checked ? true : false
);
++#endif
+
+ pageSaved( 2 );
+ }
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -214,6 +214,8 @@
+
+ SOURCES -= Bootstrapper/iTunesBootstrapper.cpp \
+ Bootstrapper/PluginBootstrapper.cpp
++
++ LIBS -= -lLastFmFingerprint$$EXT
+ }
+
+




Archive powered by MHonArc 2.6.24.

Top of Page