cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to last.fm 1.5.4.27091

Browse Source 
Still happy with gcc 3.3.5

Tested on sparc64 and i386
This commit is contained in:
dcoppa 2011-03-30 14:00:48 +00:00
parent c9a77015d3
commit ed80a78265
50 changed files with 641 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
audio/last.fm/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2010/11/15 13:08:37 espie Exp $
# $OpenBSD: Makefile,v 1.7 2011/03/30 14:00:48 dcoppa Exp $
COMMENT = official Last.fm client
DISTNAME = last.fm-1.4.2.58240.src
EXTRACT_SUFX = .tar.bz2
PKGNAME = ${DISTNAME:S/.src//}
REVISION = 0
VER = 1.5.4.27091
DISTNAME = lastfm-${VER}+dfsg
PKGNAME = last.fm-${VER}
SHARED_ONLY = Yes
@ -19,7 +18,7 @@ MAINTAINER = David Coppa <dcoppa@openbsd.org>
HOMEPAGE = http://www.last.fm/
MASTER_SITES = ${HOMEPAGE:S/www./cdn./}client/src/
MASTER_SITES = http://dev.gentoo.org/~hwoarang/distfiles/
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
@ -38,15 +37,11 @@ LIB_DEPENDS = math/fftw3,float \
audio/libmad \
audio/libsamplerate \
audio/portaudio-svn
RUN_DEPENDS = devel/desktop-file-utils
RUN_DEPENDS = devel/desktop-file-utils \
devel/xdg-utils
NO_REGRESS = Yes
CONFIGURE_STYLE = simple
WRKDIST = ${WRKDIR}/${DISTNAME:S/.src//}
LASTFM_LIBDIR = ${PREFIX}/lib/last.fm
LASTFM_DATADIR = ${PREFIX}/share/last.fm
MOOSELIB = ${WRKBUILD}/bin/libMoose.so.${LIBMoose_VERSION}
@ -55,12 +50,11 @@ FPLIB = \
${WRKBUILD}/bin/libLastFmFingerprint.so.${LIBLastFmFingerprint_VERSION}
pre-patch:
cd ${WRKSRC}; perl -i -pe 's/\r$$//' \
`find . -type f -name *.h -or -name *.cpp`
cd ${WRKSRC}; perl -pi -e "s/\r$$//"\
`find . -type f -name *.h -or -name *.cpp -or -name '*.pro*'`
pre-configure:
${SUBST_CMD} \
${WRKSRC}/src/container.cpp \
${WRKSRC}/src/libFingerprint/fplib/pro_qmake/fplib.pro \
${WRKSRC}/src/libFingerprint/libFingerprint.pro \
${WRKSRC}/src/libMoose/libMoose.pro \
@ -70,9 +64,11 @@ pre-configure:
${WRKSRC}/src/output/portAudio/portAudio.pro \
${WRKSRC}/src/src.pro \
${WRKSRC}/src/transcode/mad/mad.pro
# Use system portaudio.h
@rm -f \
${WRKSRC}/src/output/portAudio/PortAudio/include/portaudio.h
do-configure:
perl -pi -e "s/!!CXXFLAGS!!/${CXXFLAGS}/" \
${WRKSRC}/src/libUnicorn/unicorn.pro.inc
cd ${WRKDIST} && ${LOCALBASE}/bin/qmake4 -config release
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/bin/last.fm ${PREFIX}/bin/last.fm
@ -93,12 +89,8 @@ do-install:
${LASTFM_DATADIR}/icons/
${INSTALL_DATA} ${FILESDIR}/*.png ${LASTFM_DATADIR}/icons/
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${FILESDIR}/lastfm.desktop \
${PREFIX}/share/applications/
post-install:
${SUBST_CMD} ${PREFIX}/share/applications/lastfm.desktop
@rm -f \
${PREFIX}/share/applications/lastfm.desktop.beforesubst
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
-c ${FILESDIR}/lastfm.desktop \
${PREFIX}/share/applications/lastfm.desktop
.include <bsd.port.mk>

10
audio/last.fm/distinfo
View File

@ -1,5 +1,5 @@
MD5 (last.fm-1.4.2.58240.src.tar.bz2) = l300lzbJzXPksCjDkomEZw==
RMD160 (last.fm-1.4.2.58240.src.tar.bz2) = 3YrfkVFHhv0x7o6PTof5LInrfPk=
SHA1 (last.fm-1.4.2.58240.src.tar.bz2) = txJnuXix1Ewah35FhV0k/N8xN6k=
SHA256 (last.fm-1.4.2.58240.src.tar.bz2) = bmbzQIAhs+pRIiRFFZnoG9D7nt5GRXXZrK4swW1bZCk=
SIZE (last.fm-1.4.2.58240.src.tar.bz2) = 7302117
MD5 (lastfm-1.5.4.27091+dfsg.tar.gz) = rsM7udIWwrVtpobfHkdZgA==
RMD160 (lastfm-1.5.4.27091+dfsg.tar.gz) = 2zTEcdhQD/3nvacdtNr5iDcoKNY=
SHA1 (lastfm-1.5.4.27091+dfsg.tar.gz) = MITgbToemSIE9+om5aM1cirK0IE=
SHA256 (lastfm-1.5.4.27091+dfsg.tar.gz) = smWW815xyfWyBQVIbLc/NEBLvvAZScFmkp9Wal2dZQU=
SIZE (lastfm-1.5.4.27091+dfsg.tar.gz) = 1480448

6
audio/last.fm/files/lastfm.desktop
View File

@ -1,10 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
Name=Last.fm
GenericName=Official Last.fm radio player
Comment=Official Last.fm radio player
Exec=last.fm
Icon=${LOCALBASE}/share/last.fm/icons/as.png
Icon=${TRUEPREFIX}/share/last.fm/icons/as.png
Type=Application
Terminal=false
StartupNotify=false
Categories=AudioVideo;Player;
Categories=Qt;Application;AudioVideo;Player;

17
audio/last.fm/patches/patch-LastFM_pro
View File

@ -1,16 +1,11 @@
$OpenBSD: patch-LastFM_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- LastFM.pro.orig Thu May 20 12:20:44 2010
+++ LastFM.pro Fri May 21 12:20:16 2010
@@ -12,11 +12,9 @@ SUBDIRS = src/libUnicorn \
src/libFingerprint/ \
src \
$OpenBSD: patch-LastFM_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- LastFM.pro.orig Wed Mar 30 09:35:04 2011
+++ LastFM.pro Wed Mar 30 09:36:19 2011
@@ -14,7 +14,7 @@ SUBDIRS = src/libUnicorn \
src/httpinput \
- src/mediadevices/itunes \
src/mediadevices/ipod \
- src/Helper \
- src/transcode/mad
- #src/transcode/mpglib
+ src/transcode/mad \
src/transcode/mad \
- src/Twiddly
+ src/output/portAudio
win32 {

29
audio/last.fm/patches/patch-configure
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- configure.orig Thu May 20 13:11:37 2010
+++ configure Thu May 20 13:17:12 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
function header {
echo -e "\033[0;34m==>\033[0;0;1m $1 \033[0;0m"
@@ -11,16 +11,10 @@ function middle {
header "Last.fm Configure"
middle "Checking for qmake..."
-qmake-qt4 -v &> /dev/null
-if [[ $? == 127 ]]
+qmake4 -v &> /dev/null
+if [[ $? == 0 ]]
then
- qmake -v &> /dev/null
- if [[ $? == 0 ]]
- then
- QMAKE=qmake
- fi
-else
- QMAKE=qmake-qt4
+ QMAKE=qmake4
fi
if [[ $? == 127 ]]

33
audio/last.fm/patches/patch-src_AudioController_cpp Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-src_AudioController_cpp,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/AudioController.cpp.orig Wed Mar 30 13:37:45 2011
+++ src/AudioController.cpp Wed Mar 30 13:38:36 2011
@@ -134,6 +134,8 @@ AudioControllerThread::run()
this, SLOT ( onTimerTimeout() ),
Qt::DirectConnection );
+ m_output->setBufferCapacity( kOutputBufferMinSize );
+ m_output->setDevice( The::settings().soundCard() );
// What is this interval exactly?
// It's how often we send out timeChanged signals (500 ms)
@@ -168,19 +170,10 @@ AudioControllerThread::loadPlugins()
m_transcode->setBufferCapacity( kDecodedBufferMinSize );
- #ifdef WIN32
- m_output = qobject_cast<OutputInterface*>( loadPlugin( "rtaudioplayback" ) );
- #elif defined LINUX
- m_output = qobject_cast<OutputInterface*>( loadPlugin( "output_alsa" ) );
- #else
- m_output = qobject_cast<OutputInterface*>( loadPlugin( "output_portaudio" ) );
- #endif
+ m_output = qobject_cast<OutputInterface*>( loadPlugin( "output_portaudio" ) );
if ( m_output == 0 )
return false;
-
- m_output->setBufferCapacity( kOutputBufferMinSize );
- m_output->setDevice( The::settings().soundCard() );
m_proxyOutput = new ProxyOutput();

21
audio/last.fm/patches/patch-src_DiagnosticsDialog_cpp Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_DiagnosticsDialog_cpp,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/DiagnosticsDialog.cpp.orig Mon Mar 28 18:07:18 2011
+++ src/DiagnosticsDialog.cpp Mon Mar 28 18:09:05 2011
@@ -44,7 +44,7 @@ static void smallFontise( QWidget* w )
#endif
QFont f = w->font();
- #if defined LINUX
+ #if defined Q_WS_X11
f.setPointSize( f.pointSize() - 2 );
#else
f.setPointSize( 10 );
@@ -71,7 +71,7 @@ DiagnosticsDialog::DiagnosticsDialog( QWidget *parent
smallFontise( ui.cachedTracksTitle );
smallFontise( ui.fingerprintedTracksTitle );
- #ifndef LINUX
+ #ifndef Q_WS_X11
// Qt 4.3.1 b0rked? as this is specified in Designer, but only works on Linux :(
foreach ( QGroupBox* b, findChildren<QGroupBox*>() )
{

12
audio/last.fm/patches/patch-src_ProxyOutput_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_ProxyOutput_h,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/ProxyOutput.h.orig Wed Mar 30 12:53:00 2011
+++ src/ProxyOutput.h Wed Mar 30 12:58:51 2011
@@ -51,7 +51,7 @@ class ProxyOutput : public QObject
virtual void stopPlayback();
signals:
- virtual void error( int error, const QString& reason );
+ void error( int error, const QString& reason );
private slots:
void onClientConnected();

12
audio/last.fm/patches/patch-src_Radio_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Radio_cpp,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/Radio.cpp.orig Wed Mar 30 13:25:59 2011
+++ src/Radio.cpp Wed Mar 30 13:28:01 2011
@@ -652,7 +652,7 @@ Radio::onAudioControllerError( RadioError err,
}
else
{
- if ( err == Radio_PluginLoadFailed )
+ if ( err == Radio_PluginLoadFailed || err == Radio_NoSoundcard )
{
m_broken = true;
}

12
audio/last.fm/patches/patch-src_RestStateWidget_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_RestStateWidget_cpp,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/RestStateWidget.cpp.orig Mon Mar 28 18:05:04 2011
+++ src/RestStateWidget.cpp Mon Mar 28 18:05:17 2011
@@ -102,7 +102,7 @@ RestStateWidget::RestStateWidget( QWidget* parent )
ui.edit->setFixedHeight( 20 );
ui.play->setFixedHeight( 22 );
- #elif defined LINUX
+ #elif defined Q_WS_X11
ui.label1->hide(); //no iTunes on Linux
ui.label2->hide(); //no plugins on Linux

12
audio/last.fm/patches/patch-src_SideBarDelegate_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_SideBarDelegate_cpp,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/SideBarDelegate.cpp.orig Mon Mar 28 18:05:29 2011
+++ src/SideBarDelegate.cpp Mon Mar 28 18:05:52 2011
@@ -56,7 +56,7 @@ SideBarDelegate::sizeHint( const QStyleOptionViewItem&
switch ( type )
{
case MyProfile:
- #ifdef LINUX
+ #ifdef Q_WS_X11
return QSize( w, 44 );
#elif defined Q_WS_MAC
return QSize( w, 52 );

30
audio/last.fm/patches/patch-src_SideBarModel_cpp Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_SideBarModel_cpp,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/SideBarModel.cpp.orig Wed Mar 30 12:53:01 2011
+++ src/SideBarModel.cpp Wed Mar 30 13:01:25 2011
@@ -236,6 +236,8 @@ SideBarModel::data( const QModelIndex &index, int role
Qt::ItemFlags
SideBarModel::flags( const QModelIndex& index ) const
{
+ if ( !index.isValid() )
+ return 0;
SideBarItem i( index, m_masterList );
Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsDropEnabled;
@@ -652,7 +654,7 @@ SideBarModel::onAvatarDownloaded( QByteArray const buf
{
if ( username.toLower() == The::currentUsername().toLower() )
{
- #ifdef LINUX
+ #ifdef Q_WS_X11
int m = 38;
#else
int m = 30;
@@ -859,7 +861,7 @@ SideBarItem::SideBarItem( const QModelIndex& i, const
}
}
- if( m_type == TypeUnknown )
+ if( m_type == TypeUnknown && i.isValid() )
m_type = m_masterList[ i.row() ];
//////

58
audio/last.fm/patches/patch-src_SideBarView_cpp Normal file
View File

@ -0,0 +1,58 @@
$OpenBSD: patch-src_SideBarView_cpp,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/SideBarView.cpp.orig Wed Mar 30 12:53:01 2011
+++ src/SideBarView.cpp Wed Mar 30 12:57:00 2011
@@ -115,7 +115,7 @@ SideBarTree::SideBarTree( QWidget* parent ) :
style()->setParent( this );
#elif defined Q_WS_X11
- if ( style()->objectName() == "cleanlooks" )
+ if ( style()->objectName().compare("Cleanlooks", Qt::CaseInsensitive) == 0)
{
// mostly from QCleanLooksStyle.cpp
QColor button = palette().button().color();
@@ -133,7 +133,7 @@ SideBarTree::SideBarTree( QWidget* parent ) :
else
{
setStyle( new TreeStyle<QPlastiqueStyle> );
- setStyleSheet( "QTreeView { border: 0px }" );
+ setStyleSheet( "QTreeView { border: 0px; background: white; }" );
}
#endif
@@ -248,8 +248,8 @@ SideBarTree::drawRow( QPainter* painter, const QStyleO
QRect rect = option.rect;
- #ifdef LINUX
- if (qApp->style()->objectName() == "cleanlooks")
+ #ifdef Q_WS_X11
+ if (qApp->style()->objectName().compare("Cleanlooks", Qt::CaseInsensitive) == 0)
rect.adjust( 2, 1, width() - 2, -5 );
else
rect.adjust( 0, 0, width() - 2, -6 );
@@ -274,7 +274,7 @@ SideBarTree::drawRow( QPainter* painter, const QStyleO
QPixmap avatar = i.data( Qt::DecorationRole ).value<QPixmap>();
if (!avatar.isNull()) {
- #ifdef LINUX
+ #ifdef Q_WS_X11
QPoint p = rect.topLeft();
QColor c = QColor( 0xab, 0xb9, 0xcf ).light( 103 );
painter->setPen( c );
@@ -289,7 +289,7 @@ SideBarTree::drawRow( QPainter* painter, const QStyleO
noWrap.setWrapMode( QTextOption::NoWrap );
#ifdef Q_WS_MAC
rect.adjust( 48, 10, 0, -10 );
- #elif defined LINUX
+ #elif defined Q_WS_X11
rect.adjust( 44, 6, 0, -6 );
#else
rect.adjust( 48, 6, 0, -6 );
@@ -539,7 +539,6 @@ SideBarTree::contextMenuHandler( const QModelIndex& in
{
map[PlayPersonalRadio] = menu.addAction( MooseUtils::icon( "personal_radio" ), tr( "Play %1's Radio Station" ).arg( text ) );
map[PlayNeighbourRadio] = menu.addAction( MooseUtils::icon( "neighbour_radio" ), tr( "Play %1's Neighbourhood" ).arg( text ) );
- map[PlayLovedRadio] = menu.addAction( MooseUtils::icon( "loved_radio" ), tr( "Play %1's Loved Tracks" ).arg( text ) );
menu.addSeparator();
map[GoToUserPage] = menu.addAction( tr( "Go To %1's Profile" ).arg( text ) );

12
audio/last.fm/patches/patch-src_configwizard_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_configwizard_cpp,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/configwizard.cpp.orig Mon Mar 28 22:31:41 2011
+++ src/configwizard.cpp Mon Mar 28 22:19:07 2011
@@ -753,7 +753,7 @@ ConfigWizard::handshakeFinished()
nextButtonClicked();
#else
- m_pageOffset += 7;
+ m_pageOffset += 8;
BaseWizard::nextButtonClicked();
#endif

111
audio/last.fm/patches/patch-src_container_cpp
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-src_container_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/container.cpp.orig Fri May 28 12:41:13 2010
+++ src/container.cpp Fri May 28 12:42:05 2010
@@ -103,7 +103,6 @@ Container::setupUi()
$OpenBSD: patch-src_container_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/container.cpp.orig Wed Mar 30 13:26:00 2011
+++ src/container.cpp Wed Mar 30 13:28:01 2011
@@ -79,6 +79,7 @@ Container* Container::s_instance = 0;
Container::Container()
: QMainWindow(),
m_userCheck( false ),
+ m_soundcardError( false ),
m_sidebarEnabled( false ),
m_sidebarWidth( 190 )
#ifndef Q_WS_MAC
@@ -106,7 +107,6 @@ Container::setupUi()
{
ui.setupUi( this );
@ -9,47 +17,42 @@ $OpenBSD: patch-src_container_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
ui.actionAboutLastfm->setMenuRole( QAction::AboutRole );
ui.actionSettings->setMenuRole( QAction::PreferencesRole );
ui.actionStop->setVisible( false );
@@ -294,7 +293,6 @@ void
@@ -318,7 +318,6 @@ void
Container::applyPlatformSpecificTweaks()
{
#ifdef Q_WS_X11
- ui.actionCheckForUpdates->setVisible( false );
ui.actionQuit->setShortcut( tr( "CTRL+Q" ) );
ui.actionQuit->setText( tr("&Quit") );
ui.actionQuit->setText( tr( "&Quit" ) );
@@ -390,7 +388,6 @@ Container::setupConnections()
connect( ui.actionDashboard, SIGNAL(triggered()), SLOT(gotoProfile()) );
connect( ui.actionSettings, SIGNAL(triggered()), SLOT(showSettingsDialog()) );
connect( ui.actionGetPlugin, SIGNAL(triggered()), SLOT(getPlugin()) );
- connect( ui.actionCheckForUpdates, SIGNAL(triggered()), SLOT(checkForUpdates()) );
connect( ui.actionAddUser, SIGNAL(triggered()), SLOT(addUser()) );
connect( ui.actionDeleteUser, SIGNAL(triggered()), SLOT(deleteUser()) );
connect( ui.actionToggleScrobbling, SIGNAL(triggered()), SLOT(toggleScrobbling()) );
@@ -416,7 +413,6 @@ Container::setupConnections()
connect( The::webService(), SIGNAL(failure( Request* )), SLOT(webServiceFailure( Request* )), Qt::QueuedConnection );
@@ -411,7 +410,6 @@ Container::setupConnections()
connect( ui.actionDashboard, SIGNAL( triggered() ), SLOT( gotoProfile() ) );
connect( ui.actionSettings, SIGNAL( triggered() ), SLOT( showSettingsDialog() ) );
connect( ui.actionGetPlugin, SIGNAL( triggered() ), SLOT( getPlugin() ) );
- connect( ui.actionCheckForUpdates, SIGNAL( triggered() ), SLOT( checkForUpdates() ) );
connect( ui.actionAddUser, SIGNAL( triggered() ), SLOT( addUser() ) );
connect( ui.actionDeleteUser, SIGNAL( triggered() ), SLOT( deleteUser() ) );
connect( ui.actionToggleScrobbling, SIGNAL( triggered() ), SLOT( toggleScrobbling() ) );
@@ -437,7 +435,6 @@ Container::setupConnections()
connect( The::webService(), SIGNAL( failure( Request* ) ), SLOT( webServiceFailure( Request* ) ), Qt::QueuedConnection );
connect( &The::settings(), SIGNAL( userSettingsChanged( LastFmUserSettings& ) ), SLOT( updateUserStuff( LastFmUserSettings& ) ) );
connect( &The::settings(), SIGNAL( appearanceSettingsChanged() ), SLOT( updateAppearance() ) );
- connect( m_updater, SIGNAL( updateCheckDone( bool, bool, QString ) ), SLOT( updateCheckDone( bool, bool, QString ) ) );
connect( ui.stack, SIGNAL(currentChanged( int )), SIGNAL(stackIndexChanged( int )) );
connect( ui.actionMyProfile, SIGNAL(triggered()), SLOT(toggleSidebar()) );
connect( ui.actionPlaylist, SIGNAL(triggered()), SLOT(addToMyPlaylist()) );
@@ -519,7 +515,7 @@ Container::loadExtensions()
// Hack to get it working with VS2005
QString path = qApp->applicationDirPath();
#else
- QString path = qApp->applicationDirPath() + "/extensions";
+ QString path = "${PREFIX}/lib/last.fm/extensions";
#endif
connect( ui.stack, SIGNAL( currentChanged( int ) ), SIGNAL( stackIndexChanged( int ) ) );
connect( ui.actionMyProfile, SIGNAL( triggered() ), SLOT( toggleSidebar() ) );
connect( ui.actionPlaylist, SIGNAL( triggered() ), SLOT( addToMyPlaylist() ) );
@@ -798,6 +795,7 @@ Container::onRadioError( RadioError error, const QStri
case Handshake_SessionFailed:
case Radio_PluginLoadFailed:
case Radio_NoSoundcard:
+ m_soundcardError = true;
case Radio_PlaybackError:
case Radio_UnknownError:
{
@@ -902,70 +900,6 @@ Container::getPlugin()
#ifndef QT_NO_DEBUG
@@ -890,56 +886,6 @@ Container::getPlugin()
{
ConfigWizard( this, ConfigWizard::Plugin ).exec();
ui.restStateWidget->updatePlayerNames();
-}
-
-
-void
void
-Container::checkForUpdates( bool invokedByUser )
-{
- m_userCheck = invokedByUser;
@ -95,7 +98,39 @@ $OpenBSD: patch-src_container_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
- // Go ahead and launch update wizard
- LOG( 3, "New updates available. Launching update wizard.\n" );
-
- UpdateWizard( *m_updater, this ).exec();
}
- UpdateWizard* wizard = new UpdateWizard( *m_updater, this );
- if( wizard->shouldShow()) {
- wizard->exec();
- wizard->deleteLater();
- }
-
-#ifdef WIN32
- // this is really only for beta testers,
- // ie. User installs 1.5 via installer, not upgrade path, but they had the
- // itunes plugin version 2 installed already, so upgrade wizard wasn't run
- // in previous instantiation. So we run configwizard to bootstrap twiddly
- //NOTE some of this code is duplicated in LastFmApplication::init()
- if (The::settings().weWereJustUpgraded())
- ConfigWizard( NULL, ConfigWizard::MediaDevice ).exec();
-#endif
-}
-
-
-void
Container::showFAQ()
{
QDesktopServices::openUrl( "http://" + UnicornUtils::localizedHostName( The::settings().appLanguage() ) + "/help/faq/" );
@@ -1987,8 +1921,11 @@ Container::onRadioStateChanged( RadioState newState )
default:
{
- ui.actionPlay->setEnabled( true );
- ui.actionStop->setEnabled( true );
+ if ( !m_soundcardError )
+ {
+ ui.actionPlay->setEnabled( true );
+ ui.actionStop->setEnabled( true );
+ }
}
break;
}

28
audio/last.fm/patches/patch-src_container_h
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-src_container_h,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/container.h.orig Fri May 28 08:55:19 2010
+++ src/container.h Fri May 28 08:55:19 2010
@@ -51,7 +51,6 @@ class Container : public QMainWindow
$OpenBSD: patch-src_container_h,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/container.h.orig Wed Mar 30 13:25:59 2011
+++ src/container.h Wed Mar 30 13:28:01 2011
@@ -39,6 +39,7 @@ class Container : public QMainWindow
Q_OBJECT
static Container* s_instance;
+ friend class TrayIcon;
public:
Container();
@@ -51,7 +52,6 @@ class Container : public QMainWindow
std::vector<class CPluginInfo>& getPluginList();
public slots:
@ -9,7 +17,7 @@ $OpenBSD: patch-src_container_h,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
void showSettingsDialog( int startPage = 0 );
void showDiagnosticsDialog();
void showShareDialog();
@@ -77,7 +76,7 @@ class Container : public QMainWindow
@@ -80,7 +80,7 @@ class Container : public QMainWindow
bool event( QEvent* );
private:
@ -18,7 +26,15 @@ $OpenBSD: patch-src_container_h,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
{
class ScrobbleLabel* scrobbleLabel;
class RestStateWidget* restStateWidget;
@@ -159,7 +158,6 @@ class Container : public QMainWindow
@@ -108,6 +108,7 @@ class Container : public QMainWindow
class DiagnosticsDialog *m_diagnosticsDialog;
bool m_userCheck;
+ bool m_soundcardError;
bool m_sidebarEnabled;
int m_lastVolume;
int m_sidebarWidth;
@@ -162,7 +163,6 @@ class Container : public QMainWindow
void inviteAFriend();
void onUserSelected( QAction* action );

27
audio/last.fm/patches/patch-src_container_ui Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_container_ui,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/container.ui.orig Tue Mar 29 17:29:57 2011
+++ src/container.ui Tue Mar 29 17:31:14 2011
@@ -255,8 +255,6 @@
<addaction name="actionFAQ" />
<addaction name="actionForums" />
<addaction name="separator" />
- <addaction name="actionCheckForUpdates" />
- <addaction name="separator" />
<addaction name="actionDiagnostics" />
<addaction name="separator" />
<addaction name="actionAboutLastfm" />
@@ -357,14 +355,6 @@
<action name="actionGetPlugin" >
<property name="text" >
<string>&amp;Get Plugin...</string>
- </property>
- </action>
- <action name="actionCheckForUpdates" >
- <property name="text" >
- <string>Check for &amp;Updates...</string>
- </property>
- <property name="menuRole" >
- <enum>QAction::TextHeuristicRole</enum>
</property>
</action>
<action name="actionAboutLastfm" >

24
audio/last.fm/patches/patch-src_httpinput_httpinput_h Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_httpinput_httpinput_h,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/httpinput/httpinput.h.orig Wed Mar 30 12:53:01 2011
+++ src/httpinput/httpinput.h Wed Mar 30 12:58:51 2011
@@ -97,9 +97,9 @@ public slots:
virtual void load( const QString& url );
signals:
- virtual void stateChanged( RadioState newState );
+ void stateChanged( RadioState newState );
- virtual void error( int errorCode, const QString& reason );
+ void error( int errorCode, const QString& reason );
/*********************************************************************/ /**
Emitted if the stream has to rebuffer. Buffering finishes when
@@ -108,7 +108,7 @@ signals:
@param size - current buffer size
@param total - total buffer size
**************************************************************************/
- virtual void
+ void
buffering( int size, int total );
private:

12
audio/last.fm/patches/patch-src_iconshack_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_iconshack_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/iconshack.cpp.orig Thu May 27 11:50:48 2010
+++ src/iconshack.cpp Thu May 27 16:48:05 2010
@@ -73,6 +73,33 @@ IconShack::GetDisabledUserIcon( MooseEnums::UserIconCo
}
$OpenBSD: patch-src_iconshack_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/iconshack.cpp.orig Mon Mar 28 15:20:33 2011
+++ src/iconshack.cpp Mon Mar 28 15:20:35 2011
@@ -108,6 +108,33 @@ IconShack::GenerateIpodScrobblingIcons( MooseEnums::Us
}
+#ifdef Q_WS_X11
@ -35,7 +35,7 @@ $OpenBSD: patch-src_iconshack_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
void
IconShack::LoadIcons()
{
@@ -105,6 +132,20 @@ IconShack::LoadIcons()
@@ -140,6 +167,20 @@ IconShack::LoadIcons()
maDisabledIcons[MooseEnums::eGreen].load( MooseUtils::dataPath( "icons/user_disabled.png" ) );
maDisabledIcons[MooseEnums::eOrange].load( MooseUtils::dataPath( "icons/user_disabled.png" ) );
maDisabledIcons[MooseEnums::eBlack].load( MooseUtils::dataPath( "icons/user_disabled.png" ) );

28
audio/last.fm/patches/patch-src_iconshack_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_iconshack_h,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/iconshack.h.orig Thu May 27 16:46:15 2010
+++ src/iconshack.h Thu May 27 16:52:31 2010
@@ -75,6 +75,12 @@ class IconShack (public)
$OpenBSD: patch-src_iconshack_h,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/iconshack.h.orig Mon Mar 28 15:25:29 2011
+++ src/iconshack.h Mon Mar 28 15:48:20 2011
@@ -81,6 +81,12 @@ class IconShack (public)
**************************************************************************/
QPixmap GetDisabledUserIcon( MooseEnums::UserIconColour eColour);
QList<QPixmap> GetIpodScrobblingIcons( MooseEnums::UserIconColour eColour );
+#ifdef Q_WS_X11
+ QPixmap GetTrayIcon( MooseEnums::UserIconColour eColour );
@ -14,14 +14,14 @@ $OpenBSD: patch-src_iconshack_h,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
private:
/*********************************************************************/ /**
@@ -89,6 +95,10 @@ class IconShack (public)
QPixmap maGoodIconsExpanded[5];
QPixmap maExclIcons[5];
QPixmap maDisabledIcons[5];
@@ -95,6 +101,10 @@ class IconShack (public)
QPixmap maGoodIconsExpanded[ MooseEnums::eColorMax ];
QPixmap maExclIcons[ MooseEnums::eColorMax ];
QPixmap maDisabledIcons[ MooseEnums::eColorMax ];
+#ifdef Q_WS_X11
+ QPixmap maTrayIcons[5];
+ QPixmap maDisabledTrayIcons[5];
+ QPixmap maTrayIcons[ MooseEnums::eColorMax ];
+ QPixmap maDisabledTrayIcons[ MooseEnums::eColorMax ];
+#endif
bool mbIconsLoaded;
};
QList<QPixmap> mIpodScrobblingIcons[ MooseEnums::eColorMax ];
/*********************************************************************/ /**

26
audio/last.fm/patches/patch-src_lastfmapplication_cpp
View File

@ -1,14 +1,22 @@
$OpenBSD: patch-src_lastfmapplication_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/lastfmapplication.cpp.orig Fri May 21 10:53:29 2010
+++ src/lastfmapplication.cpp Fri May 21 11:00:25 2010
@@ -211,8 +211,9 @@ LastFmApplication::init()
$OpenBSD: patch-src_lastfmapplication_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/lastfmapplication.cpp.orig Mon Mar 28 18:01:15 2011
+++ src/lastfmapplication.cpp Mon Mar 28 18:04:34 2011
@@ -234,7 +234,8 @@ LastFmApplication::init()
}
if ( The::settings().isFirstRun() )
{
+ QFile mediadevicedb( MooseUtils::savePath( "mediadevice.db" ) );
LOG( 3, "First run, launching config wizard\n" );
LOGL( 3, "First run, launching config wizard" );
- QFile( MooseUtils::savePath( "mediadevice.db" ) ).remove();
+ QFile mediadevicedb( MooseUtils::savePath( "mediadevice.db" ) );
+ mediadevicedb.remove();
ConfigWizard wiz( NULL, ConfigWizard::Login );
if ( wiz.exec() == QDialog::Rejected )
@@ -245,7 +246,7 @@ LastFmApplication::init()
return;
}
}
- #ifndef LINUX
+ #ifndef Q_WS_X11
else
{
#ifdef Q_OS_MAC

6
audio/last.fm/patches/patch-src_lastfmapplication_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_lastfmapplication_h,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/lastfmapplication.h.orig Fri May 21 10:53:52 2010
+++ src/lastfmapplication.h Fri May 21 10:54:14 2010
$OpenBSD: patch-src_lastfmapplication_h,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/lastfmapplication.h.orig Mon Mar 28 15:20:33 2011
+++ src/lastfmapplication.h Mon Mar 28 15:20:35 2011
@@ -24,6 +24,8 @@
#ifndef LAST_FM_APPLICATION_H
#define LAST_FM_APPLICATION_H

6
audio/last.fm/patches/patch-src_libFingerprint_fplib_pro_qmake_fplib_pro
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libFingerprint_fplib_pro_qmake_fplib_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/libFingerprint/fplib/pro_qmake/fplib.pro.orig Fri May 21 12:47:08 2010
+++ src/libFingerprint/fplib/pro_qmake/fplib.pro Fri May 21 13:27:07 2010
$OpenBSD: patch-src_libFingerprint_fplib_pro_qmake_fplib_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/libFingerprint/fplib/pro_qmake/fplib.pro.orig Tue Nov 2 19:13:07 2010
+++ src/libFingerprint/fplib/pro_qmake/fplib.pro Mon Mar 28 15:20:36 2011
@@ -23,10 +23,9 @@ CONFIG(release, release|debug) {
DEFINES += NDEBUG
}

24
audio/last.fm/patches/patch-src_libFingerprint_libFingerprint_pro
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libFingerprint_libFingerprint_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/libFingerprint/libFingerprint.pro.orig Tue Dec 18 15:18:19 2007
+++ src/libFingerprint/libFingerprint.pro Fri May 21 16:05:12 2010
$OpenBSD: patch-src_libFingerprint_libFingerprint_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/libFingerprint/libFingerprint.pro.orig Tue Nov 2 19:13:07 2010
+++ src/libFingerprint/libFingerprint.pro Tue Mar 29 12:30:47 2011
@@ -1,5 +1,5 @@
TEMPLATE = lib
-VERSION = 1.0.0
@ -8,20 +8,22 @@ $OpenBSD: patch-src_libFingerprint_libFingerprint_pro,v 1.1.1.1 2010/05/31 19:37
CONFIG += dll
TARGET = LastFmFingerprint
QT += xml network sql
@@ -12,7 +12,7 @@ DESTDIR = $$BIN_DIR
@@ -11,8 +11,7 @@ DESTDIR = $$BIN_DIR
INCLUDEPATH += \
fplib/include \
../src/ \
- ../src/ \
- $$ROOT_DIR/res/mad
+ ${LOCALBASE}/include
HEADERS += \
MP3_Source_Qt.h \
@@ -40,6 +40,7 @@ unix:mac {
unix:!mac {
LIBPATH += $$BUILD_DIR/../fplib
+ LIBPATH += ${LOCALBASE}/lib
LIBS += $$ROOT_DIR/build/fplib/libfplib$${EXT}.a -lsamplerate -lfftw3f
@@ -39,7 +38,7 @@ unix:mac {
}
unix:!mac {
- LIBPATH += $$BUILD_DIR/../fplib
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
LIBS += $$ROOT_DIR/build/fplib/libfplib$${EXT}.a -lsamplerate -lfftw3f -lmad
}

20
audio/last.fm/patches/patch-src_libMoose_LastFmSettings_h
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_libMoose_LastFmSettings_h,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/libMoose/LastFmSettings.h.orig Tue May 25 15:05:55 2010
+++ src/libMoose/LastFmSettings.h Tue May 25 15:06:44 2010
@@ -209,7 +209,6 @@ class MOOSE_DLLEXPORT LastFmSettings : public AppSetti
// NOTE private as app object has control, the LoginWidget friend is
// unsavoury but the code is safe as long as SettingsDialog is the only
// object that calls save( false ) on it. This sucks on many levels.
- void setCurrentUsername( QString username );
friend class LastFmApplication;
friend class LoginWidget;
@@ -225,6 +224,8 @@ class MOOSE_DLLEXPORT LastFmSettings : public AppSetti
LastFmUserSettings& user( QString username ) const;
LastFmUserSettings& currentUser();
+
+ void setCurrentUsername( QString username );
bool deleteUser( QString username );
bool isExistingUser( QString username ) const { return UsersSettings<QSettings>().contains( username + "/Password" ); }

19
audio/last.fm/patches/patch-src_libMoose_MooseCommon_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_libMoose_MooseCommon_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/libMoose/MooseCommon.cpp.orig Fri May 21 17:11:55 2010
+++ src/libMoose/MooseCommon.cpp Fri May 21 17:14:19 2010
@@ -43,7 +43,7 @@ namespace MooseUtils
$OpenBSD: patch-src_libMoose_MooseCommon_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/libMoose/MooseCommon.cpp.orig Mon Mar 28 17:17:53 2011
+++ src/libMoose/MooseCommon.cpp Mon Mar 28 17:20:44 2011
@@ -47,7 +47,7 @@ namespace MooseUtils
QString
dataPath( QString file )
{
@ -10,7 +10,7 @@ $OpenBSD: patch-src_libMoose_MooseCommon_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcopp
}
@@ -108,7 +108,7 @@ servicePath( QString name )
@@ -112,7 +112,7 @@ servicePath( QString name )
// Hack to get it working with VS2005
dirPath = qApp->applicationDirPath();
#else
@ -19,3 +19,12 @@ $OpenBSD: patch-src_libMoose_MooseCommon_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcopp
#endif
#ifndef QT_NO_DEBUG
@@ -358,7 +358,7 @@ extensionPaths()
// Hack to get it working with VS2005
QString path = qApp->applicationDirPath();
#else
- QString path = qApp->applicationDirPath() + "/extensions";
+ QString path = "${PREFIX}/lib/last.fm/extensions";
#endif
#ifndef QT_NO_DEBUG

6
audio/last.fm/patches/patch-src_libMoose_libMoose_pro
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libMoose_libMoose_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/libMoose/libMoose.pro.orig Fri May 21 15:48:52 2010
+++ src/libMoose/libMoose.pro Fri May 21 15:49:19 2010
$OpenBSD: patch-src_libMoose_libMoose_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/libMoose/libMoose.pro.orig Tue Nov 2 19:11:04 2010
+++ src/libMoose/libMoose.pro Mon Mar 28 15:20:36 2011
@@ -1,5 +1,5 @@
TEMPLATE = lib
-VERSION = 1.0.0

8
audio/last.fm/patches/patch-src_libUnicorn_CachedHttp_cpp
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-src_libUnicorn_CachedHttp_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/libUnicorn/CachedHttp.cpp.orig Thu May 20 20:37:39 2010
+++ src/libUnicorn/CachedHttp.cpp Thu May 20 20:46:36 2010
$OpenBSD: patch-src_libUnicorn_CachedHttp_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/libUnicorn/CachedHttp.cpp.orig Wed Mar 30 13:41:48 2011
+++ src/libUnicorn/CachedHttp.cpp Wed Mar 30 13:43:38 2011
@@ -82,7 +82,8 @@ CachedHttp::~CachedHttp()
void
CachedHttp::init()
{
- QDir( cachePath() ).mkdir( cachePath() ); //rofl@Qt.com
+ QDir cachedir( cachePath() );
+ cachedir.mkdir( cachePath() ); //rofl@Qt.com
+ cachedir.mkdir( cachePath() );
applyProxy();

6
audio/last.fm/patches/patch-src_libUnicorn_Settings_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libUnicorn_Settings_h,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/libUnicorn/Settings.h.orig Thu May 20 20:32:32 2010
+++ src/libUnicorn/Settings.h Thu May 20 20:33:19 2010
$OpenBSD: patch-src_libUnicorn_Settings_h,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/libUnicorn/Settings.h.orig Mon Mar 28 15:20:34 2011
+++ src/libUnicorn/Settings.h Mon Mar 28 15:20:36 2011
@@ -128,19 +128,19 @@ class UNICORN_DLLEXPORT SharedSettings : public QObjec
SharedSettings( QObject* parent ) : QObject( parent ) { }

11
audio/last.fm/patches/patch-src_libUnicorn_UnicornCommon_cpp Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_libUnicorn_UnicornCommon_cpp,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/libUnicorn/UnicornCommon.cpp.orig Mon Mar 28 16:35:25 2011
+++ src/libUnicorn/UnicornCommon.cpp Mon Mar 28 16:34:55 2011
@@ -20,6 +20,7 @@
#include "UnicornCommon.h"
+#include <unistd.h>
#include "logger.h"
#include "md5/md5.h"

6
audio/last.fm/patches/patch-src_libUnicorn_draglabel_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libUnicorn_draglabel_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/libUnicorn/draglabel.cpp.orig Thu May 27 22:50:30 2010
+++ src/libUnicorn/draglabel.cpp Thu May 27 22:50:51 2010
$OpenBSD: patch-src_libUnicorn_draglabel_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/libUnicorn/draglabel.cpp.orig Mon Mar 28 15:20:34 2011
+++ src/libUnicorn/draglabel.cpp Mon Mar 28 15:20:36 2011
@@ -324,6 +324,10 @@ DragLabel::calcFontProperties( DragItem& d, bool isHea
{
rect.setHeight( fm.height() );

11
audio/last.fm/patches/patch-src_libUnicorn_libUnicorn_pro
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-src_libUnicorn_libUnicorn_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/libUnicorn/libUnicorn.pro.orig Fri May 21 16:07:04 2010
+++ src/libUnicorn/libUnicorn.pro Fri May 21 16:07:51 2010
@@ -1,5 +1,5 @@
$OpenBSD: patch-src_libUnicorn_libUnicorn_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/libUnicorn/libUnicorn.pro.orig Tue Nov 2 19:10:49 2010
+++ src/libUnicorn/libUnicorn.pro Mon Mar 28 15:41:21 2011
@@ -1,6 +1,6 @@
TEMPLATE = lib
CONFIG += dll
-VERSION = 1.0.0
+VERSION = ${LIBLastFmTools_VERSION}.0
CONFIG += dll
TARGET = LastFmTools
QT += xml network gui sql

11
audio/last.fm/patches/patch-src_libUnicorn_logger_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_libUnicorn_logger_h,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/libUnicorn/logger.h.orig Mon Mar 28 16:09:11 2011
+++ src/libUnicorn/logger.h Mon Mar 28 16:09:38 2011
@@ -31,6 +31,7 @@
#define COMMON_CHAR char
#endif
+#include <pthread.h>
#include <fstream>
#include <sstream>
#ifdef WIN32

22
audio/last.fm/patches/patch-src_libUnicorn_unicorn_pro_inc Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_libUnicorn_unicorn_pro_inc,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/libUnicorn/unicorn.pro.inc.orig Wed Mar 30 13:49:22 2011
+++ src/libUnicorn/unicorn.pro.inc Wed Mar 30 13:51:17 2011
@@ -4,7 +4,7 @@ BUILD_DIR = $$ROOT_DIR/build/$$TARGET
UI_DIR = $$ROOT_DIR/build
-LIBPATH += $$BIN_DIR
+QMAKE_LIBDIR += $$BIN_DIR
INCLUDEPATH += $$ROOT_DIR/src $$UI_DIR
CONFIG( breakpad ) {
@@ -26,7 +26,9 @@ CONFIG( breakpad ) {
INCLUDEPATH += $$ROOT_DIR/src/breakpad $$ROOT_DIR/src/breakpad/external/src
}
else {
+ QMAKE_CXXFLAGS_RELEASE += !!CXXFLAGS!!
DEFINES += NBREAKPAD
+ DEFINES += NDEBUG
}
CONFIG(debug, debug|release) {

8
audio/last.fm/patches/patch-src_mediadevices_ipod_ipod_pro
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_mediadevices_ipod_ipod_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/mediadevices/ipod/ipod.pro.orig Tue Dec 18 15:18:20 2007
+++ src/mediadevices/ipod/ipod.pro Fri May 21 15:02:54 2010
$OpenBSD: patch-src_mediadevices_ipod_ipod_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/mediadevices/ipod/ipod.pro.orig Tue Nov 2 19:10:37 2010
+++ src/mediadevices/ipod/ipod.pro Tue Mar 29 12:27:37 2011
@@ -8,6 +8,14 @@ include( ../../../definitions.pro.inc )
HEADERS = IpodDevice.h
SOURCES = IpodDevice.cpp
@ -8,7 +8,7 @@ $OpenBSD: patch-src_mediadevices_ipod_ipod_pro,v 1.1.1.1 2010/05/31 19:37:36 dco
+unix:openbsd* {
+ INCLUDEPATH += ${LOCALBASE}/include/gpod-1.0 ${LOCALBASE}/include/glib-2.0 ${LOCALBASE}/lib/glib-2.0/include
+
+ LIBPATH += ${LOCALBASE}/lib
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
+
+ LIBS += -lgpod
+}

6
audio/last.fm/patches/patch-src_output_portAudio_portAudioOutput_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_output_portAudio_portAudioOutput_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/output/portAudio/portAudioOutput.cpp.orig Mon May 24 15:25:28 2010
+++ src/output/portAudio/portAudioOutput.cpp Mon May 24 15:27:04 2010
$OpenBSD: patch-src_output_portAudio_portAudioOutput_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/output/portAudio/portAudioOutput.cpp.orig Mon Mar 28 15:20:33 2011
+++ src/output/portAudio/portAudioOutput.cpp Mon Mar 28 15:20:36 2011
@@ -143,7 +143,7 @@ PortAudioOutput::initAudio( long sampleRate, int chann
p.device = Pa_HostApiDeviceIndexToDeviceIndex( Pa_HostApiTypeIdToHostApiIndex( paCoreAudio ), deviceID++ );
#endif

12
audio/last.fm/patches/patch-src_output_portAudio_portAudioOutput_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_output_portAudio_portAudioOutput_h,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/output/portAudio/portAudioOutput.h.orig Wed Mar 30 14:35:51 2011
+++ src/output/portAudio/portAudioOutput.h Wed Mar 30 14:36:11 2011
@@ -71,7 +71,7 @@ class PortAudioOutput : public OutputInterface
virtual void setVolume( int volume ) { m_volume = (float)volume / 100.0; }
signals:
- virtual void error( int error, const QString& reason );
+ void error( int error, const QString& reason );
private:
PaStream* m_audio;

20
audio/last.fm/patches/patch-src_output_portAudio_portAudio_pro
View File

@ -1,10 +1,13 @@
$OpenBSD: patch-src_output_portAudio_portAudio_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/output/portAudio/portAudio.pro.orig Tue Dec 18 15:18:19 2007
+++ src/output/portAudio/portAudio.pro Tue May 25 20:02:34 2010
@@ -10,21 +10,21 @@ QMAKE_CFLAGS_WARN_ON = ""
INCLUDEPATH += PortAudio/include \
PortAudio/common
$OpenBSD: patch-src_output_portAudio_portAudio_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/output/portAudio/portAudio.pro.orig Tue Nov 2 19:10:51 2010
+++ src/output/portAudio/portAudio.pro Tue Mar 29 12:32:59 2011
@@ -7,24 +7,20 @@ include( ../../../definitions.pro.inc )
# PortAudio = warnings-city
QMAKE_CFLAGS_WARN_ON = ""
-INCLUDEPATH += PortAudio/include \
- PortAudio/common
-
-SOURCES = portAudioOutput.cpp \
- \
- PortAudio/common/pa_skeleton.c \
@ -23,10 +26,9 @@ $OpenBSD: patch-src_output_portAudio_portAudio_pro,v 1.1.1.1 2010/05/31 19:37:36
+
+unix:openbsd* {
+ INCLUDEPATH += ${LOCALBASE}/include \
+ PortAudio/os/unix
+ INCLUDEPATH += ${LOCALBASE}/include
+
+ LIBPATH += ${LOCALBASE}/lib
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
+
+ LIBS += -lportaudio \
+ -lsndio \

12
audio/last.fm/patches/patch-src_playerlistener_cpp
View File

@ -1,12 +1,6 @@
$OpenBSD: patch-src_playerlistener_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
XXX THIS IS A HACK
Our libpthread has bitten me again...
As a workaround, disable the player listener: luckily, it's
kinda useless at the moment.
--- src/playerlistener.cpp.orig Tue May 25 13:22:53 2010
+++ src/playerlistener.cpp Tue May 25 13:24:14 2010
$OpenBSD: patch-src_playerlistener_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/playerlistener.cpp.orig Mon Mar 28 15:20:33 2011
+++ src/playerlistener.cpp Mon Mar 28 15:20:36 2011
@@ -119,6 +119,7 @@ CPlayerListener::run()
void
CPlayerListener::RunListener()

6
audio/last.fm/patches/patch-src_playerlistener_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_playerlistener_h,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/playerlistener.h.orig Fri May 21 13:34:20 2010
+++ src/playerlistener.h Fri May 21 13:34:56 2010
$OpenBSD: patch-src_playerlistener_h,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/playerlistener.h.orig Mon Mar 28 15:20:33 2011
+++ src/playerlistener.h Mon Mar 28 15:20:36 2011
@@ -22,6 +22,8 @@
#ifndef PLAYERLISTENER_H
#define PLAYERLISTENER_H

28
audio/last.fm/patches/patch-src_settingsdialog_connection_ui
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_settingsdialog_connection_ui,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/settingsdialog_connection.ui.orig Fri May 28 08:37:13 2010
+++ src/settingsdialog_connection.ui Fri May 28 08:37:35 2010
@@ -283,16 +283,6 @@
</item>
</layout>
</item>
- <item>
- <widget class="QCheckBox" name="crashReportCheck" >
- <property name="text" >
- <string>Send crash diagnostics on crashing</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -320,7 +310,6 @@
<tabstop>proxyPasswordEdit</tabstop>
<tabstop>downloadMetadataCheck</tabstop>
<tabstop>clearCacheButton</tabstop>
- <tabstop>crashReportCheck</tabstop>
</tabstops>
<resources/>
<connections>

36
audio/last.fm/patches/patch-src_settingsdialog_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_settingsdialog_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/settingsdialog.cpp.orig Fri May 28 08:32:33 2010
+++ src/settingsdialog.cpp Fri May 28 08:32:09 2010
@@ -92,16 +92,11 @@ SettingsDialog::SettingsDialog( QWidget *parent )
$OpenBSD: patch-src_settingsdialog_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/settingsdialog.cpp.orig Tue Mar 29 14:46:10 2011
+++ src/settingsdialog.cpp Tue Mar 29 14:49:31 2011
@@ -99,16 +99,11 @@ SettingsDialog::SettingsDialog( QWidget *parent )
#endif
// Add icons to user icon dropdown
@ -23,8 +23,8 @@ $OpenBSD: patch-src_settingsdialog_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp
// Add languages to language drop-down
ui_account.languageCombo->addItem( tr( "System Language" ), "" );
@@ -129,29 +124,19 @@ SettingsDialog::SettingsDialog( QWidget *parent )
UnicornUtils::qtLanguageToLfmLangCode( QLocale::Chinese ) );
@@ -138,29 +133,19 @@ SettingsDialog::SettingsDialog( QWidget *parent )
UnicornUtils::qtLanguageToLfmLangCode( QLocale::Japanese ) );
// Add icons to sidebar
- pixmap.load( MooseUtils::dataPath( "/icons/options_account.png" ) );
@ -58,27 +58,3 @@ $OpenBSD: patch-src_settingsdialog_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp
#ifdef Q_WS_X11
ui.pageList->setRowHidden( 4, true );
@@ -214,7 +199,6 @@ SettingsDialog::SettingsDialog( QWidget *parent )
connect( ui_connection.automaticProxyButton, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) );
connect( ui_connection.manualProxyButton, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) );
connect( ui_connection.downloadMetadataCheck, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) );
- connect( ui_connection.crashReportCheck, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) );
#ifndef Q_WS_X11
connect( ui_mediadevices.deviceWidget, SIGNAL( currentItemChanged( QTreeWidgetItem*, QTreeWidgetItem* ) ), this, SLOT( mediaDeviceItemSelected( QTreeWidgetItem*, QTreeWidgetItem* ) ) );
@@ -350,7 +334,6 @@ SettingsDialog::populateConnection()
ui_connection.proxyUsernameEdit->setText( The::settings().getProxyUser() );
ui_connection.proxyPasswordEdit->setText( The::settings().getProxyPassword() );
ui_connection.downloadMetadataCheck->setChecked( The::settings().currentUser().isMetaDataEnabled() );
- ui_connection.crashReportCheck->setChecked( The::settings().currentUser().crashReportingEnabled() );
ui_connection.manualProxyButton->setChecked( The::settings().isUseProxy() );
}
@@ -524,7 +507,6 @@ SettingsDialog::saveConnection()
The::settings().setProxyPort( ui_connection.proxyPortEdit->text().toInt() );
The::settings().setUseProxy( ui_connection.manualProxyButton->isChecked() );
The::settings().currentUser().setMetaDataEnabled( ui_connection.downloadMetadataCheck->isChecked() );
- The::settings().currentUser().setCrashReportingEnabled( ui_connection.crashReportCheck->isChecked() );
m_reconnect = ui_connection.proxyHostEdit->text() != originalProxyHost ||
ui_connection.proxyUsernameEdit->text() != originalProxyUsername ||

16
audio/last.fm/patches/patch-src_src_pro
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_src_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/src.pro.orig Tue Dec 18 15:18:19 2007
+++ src/src.pro Tue May 25 12:41:36 2010
$OpenBSD: patch-src_src_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/src.pro.orig Tue Nov 2 19:13:07 2010
+++ src/src.pro Tue Mar 29 12:32:05 2011
@@ -7,10 +7,6 @@ INCLUDEPATH += lib libFingerprint/recommendation-commo
PRECOMPILED_HEADER = precompiled.h
CONFIG += precompile_header
@ -11,8 +11,8 @@ $OpenBSD: patch-src_src_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
-}
#universal binaries cannot be built from precompiled headers
mac*:release:CONFIG -= precompile_header
@@ -27,9 +23,8 @@ unix:!mac*{
mac:release:CONFIG -= precompile_header
@@ -27,9 +23,8 @@ unix:!mac{
include( ../definitions.pro.inc )
@ -24,12 +24,12 @@ $OpenBSD: patch-src_src_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
breakpad {
LIBS += -lbreakpad$$EXT
@@ -206,6 +201,8 @@ unix:!mac* {
@@ -210,6 +205,8 @@ unix:!mac {
SOURCES += simplewizard_mac.cpp \
winstyleoverrides.cpp
+
+ LIBPATH += ${LOCALBASE}/lib
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
LIBS += -lmad -lfftw3f
}

40
audio/last.fm/patches/patch-src_systray_cpp
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-src_systray_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/systray.cpp.orig Thu May 27 11:50:48 2010
+++ src/systray.cpp Thu May 27 16:57:03 2010
@@ -46,6 +46,8 @@ TrayIcon::setUser( LastFmUserSettings& currentUser )
$OpenBSD: patch-src_systray_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/systray.cpp.orig Wed Mar 30 13:41:47 2011
+++ src/systray.cpp Wed Mar 30 13:42:35 2011
@@ -25,6 +25,7 @@
#include "container.h"
#include "LastFmSettings.h"
#include "MooseCommon.h"
+#include <QWheelEvent>
TrayIcon::TrayIcon( QObject* parent )
@@ -55,6 +56,8 @@ TrayIcon::setUser( LastFmUserSettings& currentUser )
{
#ifdef Q_WS_MAC
icon = m_pixmap;
@ -10,7 +18,7 @@ $OpenBSD: patch-src_systray_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
#else
icon = IconShack::instance().GetGoodUserIcon( iconColour );
#endif
@@ -54,6 +56,8 @@ TrayIcon::setUser( LastFmUserSettings& currentUser )
@@ -63,6 +66,8 @@ TrayIcon::setUser( LastFmUserSettings& currentUser )
{
#ifdef Q_WS_MAC
icon = QIcon( m_pixmap ).pixmap( 19, 12, QIcon::Disabled );
@ -19,3 +27,25 @@ $OpenBSD: patch-src_systray_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
#else
icon = IconShack::instance().GetDisabledUserIcon( iconColour );
#endif
@@ -152,4 +157,21 @@ void
TrayIcon::stopIpodScrobblingAnimation()
{
m_animationTimer.stop();
+}
+
+
+bool
+TrayIcon::event( QEvent* e )
+{
+ // Beginning with Qt 4.3, QSystemTrayIcon supports wheel events.
+ // Let's make it adjust the volume.
+ if ( e->type() == QEvent::Wheel )
+ {
+ int numDegrees = ((QWheelEvent*)e)->delta() / 8;
+ int numSteps = numDegrees / 15;
+ int volume = Container::instance().ui.playcontrols.volume->value() + ( 5 * numSteps );
+ Container::instance().ui.playcontrols.volume->setValue( volume );
+ return true;
+ }
+ return QSystemTrayIcon::event( e );
}

11
audio/last.fm/patches/patch-src_systray_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_systray_h,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/systray.h.orig Wed Mar 30 13:09:36 2011
+++ src/systray.h Wed Mar 30 13:11:43 2011
@@ -35,6 +35,7 @@ class TrayIcon : public QSystemTrayIcon (public)
TrayIcon( QObject* parent );
void startIpodScrobblingAnimation();
void stopIpodScrobblingAnimation();
+ virtual bool event( QEvent* e );
public slots:
void setTrack( const class MetaData &track );

10
audio/last.fm/patches/patch-src_transcode_mad_mad_pro
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-src_transcode_mad_mad_pro,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
--- src/transcode/mad/mad.pro.orig Fri May 21 11:57:11 2010
+++ src/transcode/mad/mad.pro Fri May 21 11:58:05 2010
@@ -11,8 +11,8 @@ win32 {
$OpenBSD: patch-src_transcode_mad_mad_pro,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
--- src/transcode/mad/mad.pro.orig Tue Nov 2 19:10:55 2010
+++ src/transcode/mad/mad.pro Tue Mar 29 12:26:43 2011
@@ -10,8 +10,8 @@ win32 {
}
!linux* {
- LIBPATH += $$ROOT_DIR/res/mad
- INCLUDEPATH += $$ROOT_DIR/res/mad
+ LIBPATH += ${LOCALBASE}/lib
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
+ INCLUDEPATH += ${LOCALBASE}/include
}

12
audio/last.fm/patches/patch-src_updatewizard_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_updatewizard_h,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/updatewizard.h.orig Mon Mar 28 22:10:07 2011
+++ src/updatewizard.h Mon Mar 28 20:57:07 2011
@@ -50,7 +50,7 @@ class UpdateWizard : public BaseWizard (public)
CAutoUpdater& updater,
QWidget* parent = NULL);
- UpdateWizard::UpdateWizard( CComponentInfo* );
+ UpdateWizard( CComponentInfo* );
bool shouldShow() const{ return m_showWizard; }

12
audio/last.fm/patches/patch-src_wizardselectupdatespage_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_wizardselectupdatespage_h,v 1.1 2011/03/30 14:00:48 dcoppa Exp $
--- src/wizardselectupdatespage.h.orig Mon Mar 28 22:10:18 2011
+++ src/wizardselectupdatespage.h Mon Mar 28 20:57:07 2011
@@ -58,7 +58,7 @@ class WizardSelectUpdatesPage : public QWidget (public
GetChecked(
std::vector<CComponentInfo*>& vecChecked);
- void WizardSelectUpdatesPage::GetMajorUpdateComponent( std::vector<CComponentInfo*>& vecToUpdate );
+ void GetMajorUpdateComponent( std::vector<CComponentInfo*>& vecToUpdate );
public slots:

5
audio/last.fm/pkg/DESCR
View File

@ -1,4 +1,3 @@
The official Last.fm radio player application.
With Last.fm you can scrobble your tracks, share your music tastes,
listen to personalised radio streams and discover new music and
people.
With Last.fm you can scrobble your tracks, share your music tastes,
listen to personalised radio streams and discover new music and people.

4
audio/last.fm/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.2 2011/03/30 14:00:48 dcoppa Exp $
@bin bin/last.fm
lib/last.fm/
lib/last.fm/services/
@ -9,7 +9,6 @@ lib/last.fm/services/libsrv_output_portaudio.so
@lib lib/libLastFmFingerprint.so.${LIBLastFmFingerprint_VERSION}
@lib lib/libLastFmTools.so.${LIBLastFmTools_VERSION}
@lib lib/libMoose.so.${LIBMoose_VERSION}
share/applications/
share/applications/lastfm.desktop
share/last.fm/
share/last.fm/about.png
@ -48,6 +47,7 @@ share/last.fm/icons/my_bookmarks.png
share/last.fm/icons/my_friends.png
share/last.fm/icons/my_neighbours.png
share/last.fm/icons/my_tags.png
share/last.fm/icons/mymix_radio.png
share/last.fm/icons/neighbour_radio.png
share/last.fm/icons/options_account.png
share/last.fm/icons/options_connection.png