7 files changed, 46 insertions, 31 deletions

diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile
index 6d3a23f68f1c..b20795a0a8d4 100644
--- a/audio/last.fm/Makefile
+++ b/audio/last.fm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	last.fm
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTVERSION=	1.3.0.58
 CATEGORIES=	audio net
 MASTER_SITES=	http://static.last.fm/client/Linux/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -28,6 +27,8 @@ CONFIGURE_ENV+=	X11BASE=${X11BASE}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-build:
+	cd ${WRKSRC}/src/output/RtAudio && \
+	${QMAKE} -spec freebsd-g++ && make
 	${REINPLACE_CMD} -e 's|`dirname $$0`|${DATADIR}|g' \
 		${WRKSRC}/bin/last.fm
 
diff --git a/audio/last.fm/distinfo b/audio/last.fm/distinfo
index e6203f8265f9..3ee02be5f196 100644
--- a/audio/last.fm/distinfo
+++ b/audio/last.fm/distinfo
@@ -1,3 +1,3 @@
-MD5 (last.fm-1.1.3.src.tar.bz2) = 237531e1b30f75c4c0c07e7e39e9a250
-SHA256 (last.fm-1.1.3.src.tar.bz2) = e05f9b1e177f6c4801295d33246e891690447c594b1138a292779dcef7d85cec
-SIZE (last.fm-1.1.3.src.tar.bz2) = 856755
+MD5 (last.fm-1.3.0.58.src.tar.bz2) = ba4c05af37006815a55eaa508169b6c2
+SHA256 (last.fm-1.3.0.58.src.tar.bz2) = e8d3fa8359a9d62548cafa65e1bcbf20e65dc3cc151d423bcabca1ae305ec4c9
+SIZE (last.fm-1.3.0.58.src.tar.bz2) = 1410799
diff --git a/audio/last.fm/files/patch-src-AudioController.cpp b/audio/last.fm/files/patch-src-AudioController.cpp
new file mode 100644
index 000000000000..29efbebc50a9
--- /dev/null
+++ b/audio/last.fm/files/patch-src-AudioController.cpp
@@ -0,0 +1,16 @@
+--- src/AudioController.cpp.orig	Sat Jul 14 09:50:13 2007
++++ src/AudioController.cpp	Sat Jul 14 09:50:28 2007
+@@ -160,13 +160,7 @@
+     }
+     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
+ 
+     if ( m_output == 0 )
+     {
diff --git a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.cpp b/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.cpp
index f1d1f6a57b65..3e57ec73e6f3 100644
--- a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.cpp
+++ b/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.cpp
@@ -1,5 +1,5 @@
---- src/rtaudioplayback/rtaudioplayback.cpp.orig	Tue Feb  6 00:09:15 2007
-+++ src/rtaudioplayback/rtaudioplayback.cpp	Tue Feb  6 00:09:41 2007
+--- src/output/RtAudio/rtaudioplayback.cpp.orig	Tue Feb  6 00:09:15 2007
++++ src/output/RtAudio/rtaudioplayback.cpp	Tue Feb  6 00:09:41 2007
 @@ -204,7 +204,7 @@
          LOGL( 3, "Card ID " << settingsService()->soundCard() << " - translated to internal ID " << card );
  
diff --git a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro b/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro
index b0a0eff47048..216db3b9fb50 100644
--- a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro
+++ b/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro
@@ -1,13 +1,13 @@
---- src/rtaudioplayback/rtaudioplayback.pro.orig	Tue Feb  6 00:13:48 2007
-+++ src/rtaudioplayback/rtaudioplayback.pro	Tue Feb  6 00:14:18 2007
-@@ -25,10 +25,6 @@
- 
- QT += gui xml network
+--- src/output/RtAudio/RtAudio.pro.orig	Sat Jul 14 09:37:38 2007
++++ src/output/RtAudio/RtAudio.pro	Sat Jul 14 09:37:51 2007
+@@ -8,10 +8,6 @@
+ HEADERS = rtaudioplayback.h
+ SOURCES = rtaudioplayback.cpp rtaudio/RtAudio.cpp
  
 -unix:!mac {
--   LIBS += -lasound
+-    LIBS += -lasound
 -}
 -
  win32 {
-    LIBS += -lwinmm -ldsound -lole32 -lgdi32 -luser32 -lshfolder
-    INCLUDEPATH += "c:\program files\microsoft directx sdk (april 2006)\include"
+    LIBS += -lwinmm -Ldsound -ldsound -lole32 -lgdi32 -luser32 -lshfolder
+    INCLUDEPATH += dsound
diff --git a/audio/last.fm/files/patch-src_rtaudioplayback_rtaudio-RtAudio.cpp b/audio/last.fm/files/patch-src_rtaudioplayback_rtaudio-RtAudio.cpp
index 442f2cd5b4b1..5997308d6eef 100644
--- a/audio/last.fm/files/patch-src_rtaudioplayback_rtaudio-RtAudio.cpp
+++ b/audio/last.fm/files/patch-src_rtaudioplayback_rtaudio-RtAudio.cpp
@@ -1,5 +1,5 @@
---- src/rtaudioplayback/rtaudio/RtAudio.cpp.orig	Tue Feb  6 00:07:31 2007
-+++ src/rtaudioplayback/rtaudio/RtAudio.cpp	Tue Feb  6 00:08:41 2007
+--- src/output/RtAudio/rtaudio/RtAudio.cpp.orig	Tue Feb  6 00:07:31 2007
++++ src/output/RtAudio/rtaudio/RtAudio.cpp	Tue Feb  6 00:08:41 2007
 @@ -42,7 +42,7 @@
  #include <QtGui>
  
diff --git a/audio/last.fm/pkg-plist b/audio/last.fm/pkg-plist
index d17e83247845..4cd7479874c3 100644
--- a/audio/last.fm/pkg-plist
+++ b/audio/last.fm/pkg-plist
@@ -1,4 +1,5 @@
 bin/last.fm
+%%DATADIR%%/LastFMHelper
 %%DATADIR%%/data/about.png
 %%DATADIR%%/data/about_generic.png
 %%DATADIR%%/data/about_mac.png
@@ -46,6 +47,7 @@ bin/last.fm
 %%DATADIR%%/data/icons/neighbour_radio.png
 %%DATADIR%%/data/icons/options_account.png
 %%DATADIR%%/data/icons/options_connection.png
+%%DATADIR%%/data/icons/options_mediadevices.png
 %%DATADIR%%/data/icons/options_radio.png
 %%DATADIR%%/data/icons/options_scrobbling.png
 %%DATADIR%%/data/icons/orangeprofile24.png
@@ -53,7 +55,9 @@ bin/last.fm
 %%DATADIR%%/data/icons/qt_cross.png
 %%DATADIR%%/data/icons/recent_tracks.png
 %%DATADIR%%/data/icons/recently_banned.png
+%%DATADIR%%/data/icons/recently_banned16.png
 %%DATADIR%%/data/icons/recently_loved.png
+%%DATADIR%%/data/icons/recently_loved16.png
 %%DATADIR%%/data/icons/recommended_radio.png
 %%DATADIR%%/data/icons/redprofile24.png
 %%DATADIR%%/data/icons/scrobble16.png
@@ -92,23 +96,17 @@ bin/last.fm
 %%DATADIR%%/data/wizard.png
 %%DATADIR%%/data/wizard_generic.png
 %%DATADIR%%/data/wizard_mac.png
-%%DATADIR%%/extensions/libextension_metadata.so
-%%DATADIR%%/extensions/libextension_search.so
-%%DATADIR%%/extensions/libextension_sidebar.so
-%%DATADIR%%/extensions/libextension_userinfo.so
 %%DATADIR%%/last.fm
 %%DATADIR%%/last.fm.app
 %%DATADIR%%/last.fm.bak
-%%DATADIR%%/libLastFMTools.so
-%%DATADIR%%/libLastFMTools.so.1
-%%DATADIR%%/libLastFMTools.so.1.0
-%%DATADIR%%/libLastFMTools.so.1.0.0
-%%DATADIR%%/services/libinput_http.so
-%%DATADIR%%/services/libmediadevice_itunes.so
-%%DATADIR%%/services/libplayback_rtaudio.so
-%%DATADIR%%/services/libservice_settings.so
-%%DATADIR%%/services/libservice_web.so
-%%DATADIR%%/services/libtranscode_mp3.so
+%%DATADIR%%/libLastFmTools.so
+%%DATADIR%%/libLastFmTools.so.1
+%%DATADIR%%/libLastFmTools.so.1.0
+%%DATADIR%%/libLastFmTools.so.1.0.0
+%%DATADIR%%/services/libsrv_httpinput.so
+%%DATADIR%%/services/libsrv_itunesdevice.so
+%%DATADIR%%/services/libsrv_mp3transcode.so
+%%DATADIR%%/services/libsrv_rtaudioplayback.so
 share/services/lastfm.protocol
 @dirrmtry share/services
 @dirrm %%DATADIR%%/services