Index: audio/lastfm-desktop/Makefile =================================================================== --- audio/lastfm-desktop/Makefile +++ audio/lastfm-desktop/Makefile @@ -2,12 +2,9 @@ # $FreeBSD$ PORTNAME= lastfm -PORTVERSION= 2.1.30 -PORTREVISION= 5 +PORTVERSION= 2.1.36 CATEGORIES= audio -MASTER_SITES= http://cdn.last.fm/client/Linux/ PKGNAMESUFFIX= -desktop -DISTNAME= Last.fm-${PORTVERSION} MAINTAINER= vg@FreeBSD.org COMMENT= Official Last.fm desktop application suite @@ -16,22 +13,36 @@ LIB_DEPENDS= liblastfm.so:audio/liblastfm \ libavcodec.so:multimedia/ffmpeg \ - libgpod.so:audio/libgpod - -USES= pkgconfig qmake tar:bzip2 gmake -USE_QT4= gui linguist_build moc_build network phonon \ - rcc_build uic_build webkit xml + libgpod.so:audio/libgpod \ + libimobiledevice.so:comms/libimobiledevice \ + libplist.so:devel/libplist + +USE_GITHUB= yes +GH_PROJECT= ${LASTFM} + +USES= gettext pkgconfig qmake tar:bzip2 gmake +USE_QT4= corelib gui linguist_build moc_build network phonon \ + rcc_build sql uic_build webkit xml LASTFM= ${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= ${LASTFM}.sh WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} +DESKTOP_ENTRIES="Last.fm Scrobbler" \ + "${COMMENT}" \ + "${PREFIX}/share/pixmaps/audioscrobbler.ico" \ + "${LASTFM}" \ + "AudioVideo;Audio;" \ + true + do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/${LASTFM}.sh ${STAGEDIR}${PREFIX}/bin/${LASTFM} - ${INSTALL_PROGRAM} ${WRKSRC}/_bin/Last.fm\ Scrobbler ${STAGEDIR}${DATADIR} - ${INSTALL_LIB} ${WRKSRC}/_bin/lib*.so* ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/_bin/fingerprinter ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/_bin/lastfm-scrobbler ${STAGEDIR}${DATADIR} + ${INSTALL_LIB} ${WRKSRC}/_bin/lib*.a* ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/app/client/Last.fm\ Scrobbler.css \ ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/app/client/audioscrobbler.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ .include Index: audio/lastfm-desktop/distinfo =================================================================== --- audio/lastfm-desktop/distinfo +++ audio/lastfm-desktop/distinfo @@ -1,2 +1,3 @@ -SHA256 (Last.fm-2.1.30.tar.bz2) = a8591930af2c76100840fa94082e831d5aeb2893c264528a15ec5151bf0cc2a4 -SIZE (Last.fm-2.1.30.tar.bz2) = 5970748 +TIMESTAMP = 1466108531 +SHA256 (lastfm-lastfm-desktop-2.1.36_GH0.tar.gz) = 2c33e8b8d6442da768bad3fb96e52a67ee17e3e64c5899ad81a893075635b969 +SIZE (lastfm-lastfm-desktop-2.1.36_GH0.tar.gz) = 4087375 Index: audio/lastfm-desktop/files/lastfm-desktop.sh.in =================================================================== --- audio/lastfm-desktop/files/lastfm-desktop.sh.in +++ audio/lastfm-desktop/files/lastfm-desktop.sh.in @@ -1,3 +1,3 @@ #!/bin/sh -LASTFM='Last.fm Scrobbler' -LD_LIBRARY_PATH=%%DATADIR%% %%DATADIR%%/"${LASTFM}" +LASTFM='lastfm-scrobbler' +LD_LIBRARY_PATH=%%DATADIR%% %%DATADIR%%/"${LASTFM}" -stylesheet %%DATADIR%%/"Last.fm Scrobbler.css" Index: audio/lastfm-desktop/files/patch-app_client_Fingerprinter_LAV_Source.cpp =================================================================== --- audio/lastfm-desktop/files/patch-app_client_Fingerprinter_LAV_Source.cpp +++ audio/lastfm-desktop/files/patch-app_client_Fingerprinter_LAV_Source.cpp @@ -1,11 +0,0 @@ ---- app/client/Fingerprinter/LAV_Source.cpp.orig 2013-10-27 10:26:00.699715369 -0200 -+++ app/client/Fingerprinter/LAV_Source.cpp 2013-10-27 10:26:26.826714410 -0200 -@@ -44,6 +44,8 @@ - - using namespace std; - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+ - - /* - Don't change these values! Index: audio/lastfm-desktop/files/patch-app_client_MediaDevices_IpodDevice_linux.cpp =================================================================== --- audio/lastfm-desktop/files/patch-app_client_MediaDevices_IpodDevice_linux.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- app/client/MediaDevices/IpodDevice_linux.cpp.orig 2013-03-20 13:01:09.893307620 +0000 -+++ app/client/MediaDevices/IpodDevice_linux.cpp 2013-03-20 13:01:18.972308216 +0000 -@@ -34,7 +34,7 @@ - extern "C" - { - #include -- #include -+ #include - } - - IpodTracksFetcher::IpodTracksFetcher( Itdb_iTunesDB *itdb, QSqlDatabase scrobblesdb, Index: audio/lastfm-desktop/files/patch-app_client_Services_RadioService_RadioService.cpp =================================================================== --- audio/lastfm-desktop/files/patch-app_client_Services_RadioService_RadioService.cpp +++ audio/lastfm-desktop/files/patch-app_client_Services_RadioService_RadioService.cpp @@ -1,11 +1,11 @@ ---- ./app/client/Services/RadioService/RadioService.cpp.orig 2014-08-29 11:45:14.000000000 +0200 -+++ ./app/client/Services/RadioService/RadioService.cpp 2014-08-29 11:45:43.000000000 +0200 -@@ -309,7 +309,7 @@ +--- app/client/Services/RadioService/RadioService.cpp.orig 2016-06-16 20:32:08 UTC ++++ app/client/Services/RadioService/RadioService.cpp +@@ -307,7 +307,7 @@ RadioService::mute() void RadioService::onPhononStateChanged( Phonon::State newstate, Phonon::State oldstate ) { - qDebug() << oldstate << " -> " << newstate; -+ //qDebug() << oldstate << " -> " << newstate; ++ qDebug() << (int)oldstate << " -> " << (int)newstate; if (m_mediaObject == 0) { qDebug() << "m_mediaObject is null!"; return; Index: audio/lastfm-desktop/files/patch-app_fingerprinter_LAV__Source.cpp =================================================================== --- audio/lastfm-desktop/files/patch-app_fingerprinter_LAV__Source.cpp +++ audio/lastfm-desktop/files/patch-app_fingerprinter_LAV__Source.cpp @@ -1,11 +1,40 @@ ---- app/client/Fingerprinter/LAV_Source.cpp.orig 2013-10-27 10:26:00.699715369 -0200 -+++ app/client/Fingerprinter/LAV_Source.cpp 2013-10-27 10:26:26.826714410 -0200 -@@ -44,6 +44,8 @@ - - using namespace std; +--- app/fingerprinter/LAV_Source.cpp.orig 2013-09-03 12:19:10 UTC ++++ app/fingerprinter/LAV_Source.cpp +@@ -23,6 +23,10 @@ + #define __STDC_CONSTANT_MACROS 1 + #endif ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++#endif + + extern "C" { + #include + #include +@@ -113,7 +117,7 @@ uint8_t * LAV_SourcePrivate::decodeOneFr + { + char buf[256]; + AVPacket packet; +- AVFrame *decodedFrame = avcodec_alloc_frame(); ++ AVFrame *decodedFrame = av_frame_alloc(); + av_init_packet(&packet); + + int frameFinished = 0; +@@ -288,7 +292,7 @@ uint8_t * LAV_SourcePrivate::decodeOneFr + av_free_packet(&packet); + } + timestamp += (double)nSamples / decodedFrame->sample_rate; +- avcodec_free_frame(&decodedFrame); ++ av_frame_free(&decodedFrame); + return outBuffer; + } + +@@ -405,7 +409,7 @@ void LAV_Source::getInfo(int& lengthSecs - /* - Don't change these values! + void LAV_Source::release() + { +- if ( d->inCodecContext && d->inCodecContext->codec_id != CODEC_ID_NONE ) ++ if ( d->inCodecContext && d->inCodecContext->codec_id != AV_CODEC_ID_NONE ) + { + avcodec_close(d->inCodecContext); + } Index: audio/lastfm-desktop/pkg-plist =================================================================== --- audio/lastfm-desktop/pkg-plist +++ audio/lastfm-desktop/pkg-plist @@ -1,15 +1,8 @@ bin/lastfm-desktop -%%DATADIR%%/Last.fm Scrobbler +%%DATADIR%%/fingerprinter +%%DATADIR%%/lastfm-scrobbler %%DATADIR%%/Last.fm Scrobbler.css -%%DATADIR%%/liblistener.so -%%DATADIR%%/liblistener.so.1 -%%DATADIR%%/liblistener.so.1.0 -%%DATADIR%%/liblistener.so.1.0.0 -%%DATADIR%%/liblogger.so -%%DATADIR%%/liblogger.so.1 -%%DATADIR%%/liblogger.so.1.0 -%%DATADIR%%/liblogger.so.1.0.0 -%%DATADIR%%/libunicorn.so -%%DATADIR%%/libunicorn.so.1 -%%DATADIR%%/libunicorn.so.1.0 -%%DATADIR%%/libunicorn.so.1.0.0 +%%DATADIR%%/liblistener.a +%%DATADIR%%/liblogger.a +%%DATADIR%%/libunicorn.a +share/pixmaps/audioscrobbler.ico