diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile index ca6e177369aa..c303d532d160 100644 --- a/audio/last.fm/Makefile +++ b/audio/last.fm/Makefile @@ -1,77 +1,79 @@ # New ports collection makefile for: last.fm # Date created: February 5th, 2007 # Whom: Michael Nottebrock # # $FreeBSD$ # PORTNAME= last.fm -PORTVERSION= 1.4.2.58240 -PORTREVISION= 6 +PORTVERSION= 1.5.4.26862 CATEGORIES= audio net MASTER_SITES= http://cdn.last.fm/client/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= arved@FreeBSD.org COMMENT= Official last.fm radio player BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash LIB_DEPENDS= gpod.7:${PORTSDIR}/audio/libgpod \ mad.2:${PORTSDIR}/audio/libmad \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ fftw3f:${PORTSDIR}/math/fftw3-float LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-install pkg-deinstall USE_BZIP2= yes USE_QT4= gui imageformats_run moc_build network qmake_build rcc_build \ sql uic_build xml HAS_CONFIGURE= yes USE_LDCONFIG= yes -USE_DOS2UNIX= yes +USE_DOS2UNIX= *.h WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include .if ${ARCH} == "amd64" USE_GCC=4.2+ .endif post-patch: + ${CP} ${WRKSRC}/dist/tarball_files/configure ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|/bin/bash|/${LOCALBASE}/bin/bash|g' \ -E -e 's|(.*"CONFIG-=debug")|\1 ${QMAKEFLAGS}|g' \ -e 's|function header|header()|g' \ -e 's|function middle|middle()|g' \ -e 's|-pthread|-pthread -R/usr/local/share/last.fm|g' \ ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|linux\*|unix|g' ${WRKSRC}/src/src.pro ${REINPLACE_CMD} -e 's|/usr/include/gpod|${LOCALBASE}/include/gpod|; \ s|/usr/include/glib|${LOCALBASE}/include/glib|;s|linux|freebsd|' \ ${WRKSRC}/src/mediadevices/ipod/ipod.pro ${REINPLACE_CMD} -e 's|^RUNDIR.*|RUNDIR=${DATADIR}|' ${WRKSRC}/bin/last.fm.sh ${RM} ${WRKSRC}/bin/libmad.1.dylib ${WRKSRC}/bin/libmad.dylib \ - ${WRKSRC}/bin/last.fm.sh.bak + ${WRKSRC}/bin/last.fm.sh.bak \ + ${WRKSRC}/bin/*.dll ${WRKSRC}/bin/LastFM.exe.config + ${RM} -rf ${WRKSRC}/bin/Microsoft* ${WRKSRC}/bin/sqldrivers post-build: cd ${WRKSRC}/src/output/RtAudio && \ ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} && make do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/last.fm.sh ${PREFIX}/bin/last.fm ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/services ${INSTALL_DATA} ${FILESDIR}/last.fm.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${FILESDIR}/lastfm.protocol ${PREFIX}/share/services ${MKDIR} ${DATADIR} ${CP} -Rp ${WRKSRC}/bin/* ${DATADIR}/ post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .include diff --git a/audio/last.fm/distinfo b/audio/last.fm/distinfo index 2c3e4bcec097..df68b41d7c74 100644 --- a/audio/last.fm/distinfo +++ b/audio/last.fm/distinfo @@ -1,2 +1,2 @@ -SHA256 (last.fm-1.4.2.58240.src.tar.bz2) = 6e66f3408021b3ea512224451599e81bd0fb9ede464575d9acae2cc16d5b6429 -SIZE (last.fm-1.4.2.58240.src.tar.bz2) = 7302117 +SHA256 (last.fm-1.5.4.26862.src.tar.bz2) = 5c110ab6e7a4c4ec950fb65912bc5ddfd106ce969c4b7376a7603cf7b3720e2a +SIZE (last.fm-1.5.4.26862.src.tar.bz2) = 11415025 diff --git a/audio/last.fm/files/patch-LastFM.pro b/audio/last.fm/files/patch-LastFM.pro new file mode 100644 index 000000000000..519abaf586e0 --- /dev/null +++ b/audio/last.fm/files/patch-LastFM.pro @@ -0,0 +1,11 @@ +--- LastFM.pro.orig 2012-12-02 14:23:24.000000000 +0100 ++++ LastFM.pro 2012-12-02 14:23:37.000000000 +0100 +@@ -37,7 +37,7 @@ + SUBDIRS -= src/mediadevices/ipod + } + +-linux* { ++unix:!mac* { + SUBDIRS -= src/Twiddly \ + src/Bootstrapper/ITunesDevice + diff --git a/audio/last.fm/files/patch-src-Helper-mediadevicewather.cpp b/audio/last.fm/files/patch-src-Helper-mediadevicewather.cpp deleted file mode 100644 index d5d6da6f7f4b..000000000000 --- a/audio/last.fm/files/patch-src-Helper-mediadevicewather.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Helper/mediadevicewatcher.cpp.orig 2009-11-04 22:48:51.000000000 +0100 -+++ src/Helper/mediadevicewatcher.cpp 2009-11-04 22:50:13.000000000 +0100 -@@ -73,6 +73,7 @@ - QString appExe = "Last.fm_debug"; - #endif - #endif -+ QString appExe = "last.fm"; - - QString app = QCoreApplication::applicationDirPath() + "/" + appExe; - QStringList params( "-tray" ); diff --git a/audio/last.fm/files/patch-src-mediadevice-itunes-itunesdevice.cpp b/audio/last.fm/files/patch-src-mediadevice-itunes-itunesdevice.cpp deleted file mode 100644 index 59dce4a1dcb0..000000000000 --- a/audio/last.fm/files/patch-src-mediadevice-itunes-itunesdevice.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/mediadevices/itunes/itunesdevice.cpp.orig 2009-11-04 22:07:06.000000000 +0100 -+++ src/mediadevices/itunes/itunesdevice.cpp 2009-11-04 22:07:12.000000000 +0100 -@@ -589,8 +589,9 @@ - //HACK - #ifdef WIN32 - QDir qcd = m_path; -- #endif - QSettings().setValue( "devicePaths/" + uid + "/path", qcd.absolutePath() ); -+ #endif -+ - //HACK - } - else diff --git a/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c b/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c new file mode 100644 index 000000000000..385a3b6a823c --- /dev/null +++ b/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c @@ -0,0 +1,10 @@ +--- src/output/alsa-playback/xconvert.c.orig 2012-12-02 14:30:50.000000000 +0100 ++++ src/output/alsa-playback/xconvert.c 2012-12-02 14:33:58.000000000 +0100 +@@ -57,6 +57,7 @@ + + #endif + ++#define uint size_t + + struct buffer { + void *buffer; diff --git a/audio/last.fm/files/patch-src-updatewizard.h b/audio/last.fm/files/patch-src-updatewizard.h new file mode 100644 index 000000000000..91f6896c163c --- /dev/null +++ b/audio/last.fm/files/patch-src-updatewizard.h @@ -0,0 +1,11 @@ +--- src/updatewizard.h.orig 2012-12-02 14:01:31.000000000 +0100 ++++ src/updatewizard.h 2012-12-02 14:01:42.000000000 +0100 +@@ -50,7 +50,7 @@ + CAutoUpdater& updater, + QWidget* parent = NULL); + +- UpdateWizard::UpdateWizard( CComponentInfo* ); ++ UpdateWizard( CComponentInfo* ); + + bool shouldShow() const{ return m_showWizard; } + diff --git a/audio/last.fm/files/patch-src-wizardselectupdatespage.h b/audio/last.fm/files/patch-src-wizardselectupdatespage.h new file mode 100644 index 000000000000..630a18a8afb3 --- /dev/null +++ b/audio/last.fm/files/patch-src-wizardselectupdatespage.h @@ -0,0 +1,11 @@ +--- src/wizardselectupdatespage.h.orig 2012-12-02 13:59:46.000000000 +0100 ++++ src/wizardselectupdatespage.h 2012-12-02 14:00:17.000000000 +0100 +@@ -58,7 +58,7 @@ + GetChecked( + std::vector& vecChecked); + +- void WizardSelectUpdatesPage::GetMajorUpdateComponent( std::vector& vecToUpdate ); ++ void GetMajorUpdateComponent( std::vector& vecToUpdate ); + + public slots: + diff --git a/audio/last.fm/files/patch-src_LastFMHelper-controlinterface.h b/audio/last.fm/files/patch-src_LastFMHelper-controlinterface.h deleted file mode 100644 index a9d30beadad3..000000000000 --- a/audio/last.fm/files/patch-src_LastFMHelper-controlinterface.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Helper/controlinterface.h.orig 2007-09-24 23:41:54.000000000 +0200 -+++ src/Helper/controlinterface.h 2007-09-24 23:42:01.000000000 +0200 -@@ -24,6 +24,7 @@ - - #include - #include -+#include - - class ControlInterface : public QObject - { diff --git a/audio/last.fm/pkg-plist b/audio/last.fm/pkg-plist index 15d10a7c818a..d37a8df70d34 100644 --- a/audio/last.fm/pkg-plist +++ b/audio/last.fm/pkg-plist @@ -1,121 +1,121 @@ bin/last.fm -%%DATADIR%%/LastFmHelper %%DATADIR%%/data/about.png %%DATADIR%%/data/about_generic.png %%DATADIR%%/data/about_mac.png %%DATADIR%%/data/app_55.png %%DATADIR%%/data/buttons/action_edit.png %%DATADIR%%/data/buttons/action_edit_down.png %%DATADIR%%/data/buttons/action_edit_hover.png %%DATADIR%%/data/buttons/action_tag.png %%DATADIR%%/data/buttons/action_tag_down.png %%DATADIR%%/data/buttons/action_tag_hover.png %%DATADIR%%/data/buttons/action_upload.png %%DATADIR%%/data/buttons/action_upload_down.png %%DATADIR%%/data/buttons/action_upload_hover.png %%DATADIR%%/data/buttons/closebutton.png %%DATADIR%%/data/buttons/myprofile.png %%DATADIR%%/data/buttons/scrobble.png %%DATADIR%%/data/icons/as.ico %%DATADIR%%/data/icons/as.png %%DATADIR%%/data/icons/blackprofile24.png %%DATADIR%%/data/icons/blueprofile24.png %%DATADIR%%/data/icons/buy_album.png %%DATADIR%%/data/icons/buy_track.png %%DATADIR%%/data/icons/greenprofile24.png %%DATADIR%%/data/icons/history16.png %%DATADIR%%/data/icons/history32.png %%DATADIR%%/data/icons/icon_radio.png %%DATADIR%%/data/icons/icon_tag.png %%DATADIR%%/data/icons/icon_track.png %%DATADIR%%/data/icons/icon_user.png %%DATADIR%%/data/icons/loved_radio.png %%DATADIR%%/data/icons/my_bookmarks.png %%DATADIR%%/data/icons/my_friends.png %%DATADIR%%/data/icons/my_neighbours.png %%DATADIR%%/data/icons/my_tags.png +%%DATADIR%%/data/icons/mymix_radio.png %%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 %%DATADIR%%/data/icons/personal_radio.png %%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 %%DATADIR%%/data/icons/scrobbling_graphic.png %%DATADIR%%/data/icons/systray_mac.png %%DATADIR%%/data/icons/user_black.png %%DATADIR%%/data/icons/user_black32_collapse.png %%DATADIR%%/data/icons/user_black32_expand.png %%DATADIR%%/data/icons/user_blue.png %%DATADIR%%/data/icons/user_blue32_collapse.png %%DATADIR%%/data/icons/user_blue32_expand.png %%DATADIR%%/data/icons/user_disabled.png %%DATADIR%%/data/icons/user_green.png %%DATADIR%%/data/icons/user_green32_collapse.png %%DATADIR%%/data/icons/user_green32_expand.png %%DATADIR%%/data/icons/user_orange.png %%DATADIR%%/data/icons/user_orange32_collapse.png %%DATADIR%%/data/icons/user_orange32_expand.png %%DATADIR%%/data/icons/user_purple.png %%DATADIR%%/data/icons/user_red.png %%DATADIR%%/data/icons/user_red32_collapse.png %%DATADIR%%/data/icons/user_red32_expand.png %%DATADIR%%/data/install_mac.png %%DATADIR%%/data/logo.png %%DATADIR%%/data/no_artist.gif %%DATADIR%%/data/no_cover.gif %%DATADIR%%/data/progress.mng %%DATADIR%%/data/progress_active.mng %%DATADIR%%/data/slider_knob.png %%DATADIR%%/data/slider_left.png %%DATADIR%%/data/slider_middle.png %%DATADIR%%/data/slider_right.png %%DATADIR%%/data/speaker_high.png %%DATADIR%%/data/speaker_low.png %%DATADIR%%/data/watermark.png %%DATADIR%%/data/wizard.png %%DATADIR%%/data/wizard_generic.png %%DATADIR%%/data/wizard_mac.png %%DATADIR%%/glib-2.0.lib %%DATADIR%%/gpod.lib %%DATADIR%%/last.fm %%DATADIR%%/last.fm.sh %%DATADIR%%/libLastFmFingerprint.so.1.0.0 %%DATADIR%%/libLastFmFingerprint.so.1.0 %%DATADIR%%/libLastFmFingerprint.so.1 %%DATADIR%%/libLastFmFingerprint.so %%DATADIR%%/libLastFmTools.so.1.0.0 %%DATADIR%%/libLastFmTools.so.1.0 %%DATADIR%%/libLastFmTools.so.1 %%DATADIR%%/libLastFmTools.so %%DATADIR%%/libMoose.so.1.0.0 %%DATADIR%%/libMoose.so.1.0 %%DATADIR%%/libMoose.so.1 %%DATADIR%%/libMoose.so %%DATADIR%%/libfftw3f-3.lib %%DATADIR%%/services/libsrv_Ipod_device.so %%DATADIR%%/services/libsrv_httpinput.so -%%DATADIR%%/services/libsrv_itunesdevice.so %%DATADIR%%/services/libsrv_madtranscode.so %%DATADIR%%/services/libsrv_rtaudioplayback.so -%%DATADIR%%/updater-autorestart.sh +%%DATADIR%%/services/libsrv_output_alsa.so +%%DATADIR%%/services/libsrv_output_portaudio.so %%DATADIR%%/zlibwapi.lib share/applications/last.fm.desktop share/services/lastfm.protocol @dirrmtry share/services @dirrmtry share/applications @dirrm %%DATADIR%%/services @dirrm %%DATADIR%%/data/icons @dirrm %%DATADIR%%/data/buttons @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%