diff options
| -rw-r--r-- | audio/Makefile | 1 | ||||
| -rw-r--r-- | audio/liblastfm-qt5/Makefile | 6 | ||||
| -rw-r--r-- | audio/liblastfm/Makefile | 23 | ||||
| -rw-r--r-- | audio/liblastfm/distinfo | 5 | ||||
| -rw-r--r-- | audio/liblastfm/files/patch-src_UrlBuilder.h | 8 | ||||
| -rw-r--r-- | audio/liblastfm/pkg-plist | 72 |
6 files changed, 70 insertions, 45 deletions
diff --git a/audio/Makefile b/audio/Makefile index 1ab82d5c861e..877d6a63d42b 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -412,6 +412,7 @@ SUBDIR += libkcompactdisc SUBDIR += libkcompactdisc-kde4 SUBDIR += liblastfm + SUBDIR += liblastfm-qt5 SUBDIR += liblo SUBDIR += liblscp SUBDIR += libltc diff --git a/audio/liblastfm-qt5/Makefile b/audio/liblastfm-qt5/Makefile new file mode 100644 index 000000000000..5127282c433c --- /dev/null +++ b/audio/liblastfm-qt5/Makefile @@ -0,0 +1,6 @@ +# $FreeBSD$ + +SLAVE= qt5 +MASTERDIR= ${.CURDIR}/../../audio/liblastfm + +.include "${MASTERDIR}/Makefile" diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile index b5607760dbad..84df07c7c9a3 100644 --- a/audio/liblastfm/Makefile +++ b/audio/liblastfm/Makefile @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= liblastfm -PORTVERSION= 1.0.9 -PORTREVISION= 2 +DISTVERSION= 1.0.9-5 +DISTVERSIONSUFFIX= -g4433165 CATEGORIES= audio +PKGNAMESUFFIX= -${SLAVE} MAINTAINER= jhale@FreeBSD.org COMMENT= Qt C++ library for the Last.fm webservices @@ -16,10 +17,20 @@ USES= cmake pkgconfig USE_GITHUB= yes GH_ACCOUNT= lastfm USE_LDCONFIG= yes + +SLAVE?= qt4 +.if ${SLAVE} == qt4 USE_QT4= corelib dbus network sql xml \ moc_build qmake_build rcc_build +CMAKE_ON+= BUILD_WITH_QT4 +.else +USE_QT5= core dbus network sql xml \ + buildtools_build qmake_build +CMAKE_OFF+= BUILD_WITH_QT4 +QTVER_SUFFIX= 5 +.endif -CMAKE_ON= BUILD_WITH_QT4 +PLIST_SUB= QTVER_SUFFIX="${QTVER_SUFFIX}" OPTIONS_DEFINE= FINGERPRINT TEST OPTIONS_DEFAULT= FINGERPRINT @@ -33,8 +44,12 @@ FINGERPRINT_CMAKE_BOOL= BUILD_FINGERPRINT FINGERPRINT_BUILD_DEPENDS= ${NONEXISTENT}:math/fftw3:patch FINGERPRINT_CMAKE_ON= -DLIBFFTW3_INCLUDE_DIR:PATH=`${MAKE} -C ${PORTSDIR}/math/fftw3 -VWRKSRC`/api +.if ${SLAVE} == qt4 TEST_USE= QT4=qtestlib_build +.else +TEST_USE= QT5=testlib_build +.endif TEST_CMAKE_BOOL= BUILD_TESTS -TEST_TARGET= test +TEST_TEST_TARGET= test .include <bsd.port.mk> diff --git a/audio/liblastfm/distinfo b/audio/liblastfm/distinfo index 9131cd0a0f13..439c17edb2ed 100644 --- a/audio/liblastfm/distinfo +++ b/audio/liblastfm/distinfo @@ -1,2 +1,3 @@ -SHA256 (lastfm-liblastfm-1.0.9_GH0.tar.gz) = 5276b5fe00932479ce6fe370ba3213f3ab842d70a7d55e4bead6e26738425f7b -SIZE (lastfm-liblastfm-1.0.9_GH0.tar.gz) = 119320 +TIMESTAMP = 1524002793 +SHA256 (lastfm-liblastfm-1.0.9-5-g4433165_GH0.tar.gz) = 8cf1835af3f38f0c7c576e8a01c2d19ee32c7006a44d2d183fb64ed228bc5ca6 +SIZE (lastfm-liblastfm-1.0.9-5-g4433165_GH0.tar.gz) = 119427 diff --git a/audio/liblastfm/files/patch-src_UrlBuilder.h b/audio/liblastfm/files/patch-src_UrlBuilder.h index 88626358b253..06ed8a3b666e 100644 --- a/audio/liblastfm/files/patch-src_UrlBuilder.h +++ b/audio/liblastfm/files/patch-src_UrlBuilder.h @@ -1,9 +1,9 @@ Add prototype for localePath() and adjust comments to reflect current website layout ---- src/UrlBuilder.h.orig 2014-10-02 14:05:46 UTC +--- src/UrlBuilder.h.orig 2015-02-06 16:49:40 UTC +++ src/UrlBuilder.h -@@ -44,9 +44,11 @@ namespace lastfm +@@ -44,10 +44,12 @@ namespace lastfm QUrl url() const; @@ -11,12 +11,14 @@ website layout + /** www.last.fm becomes the local version, e.g. www.last.fm/de */ static QUrl localize( QUrl ); - /** www.last.fm becomes m.last.fm, localisation is preserved */ +- static QUrl mobilize( QUrl ); + + /** DEPRECATED: Returns url as-is since the mobile website redirects + * to the main website */ - static QUrl mobilize( QUrl ); ++ Q_DECL_DEPRECATED static QUrl mobilize( QUrl ); /** Use this to URL encode any database item (artist, track, album). It + * internally calls UrlEncodeSpecialChars to double encode some special @@ -60,7 +62,10 @@ namespace lastfm */ static QByteArray encode( QString ); diff --git a/audio/liblastfm/pkg-plist b/audio/liblastfm/pkg-plist index 21d4a29cdc86..54eab15cee05 100644 --- a/audio/liblastfm/pkg-plist +++ b/audio/liblastfm/pkg-plist @@ -1,36 +1,36 @@ -include/lastfm/AbstractType.h -include/lastfm/Album.h -include/lastfm/Artist.h -include/lastfm/Audioscrobbler.h -include/lastfm/Auth.h -include/lastfm/Chart.h -%%FINGERPRINT%%include/lastfm/Fingerprint.h -include/lastfm/FingerprintId.h -%%FINGERPRINT%%include/lastfm/FingerprintableSource.h -include/lastfm/InternetConnectionMonitor.h -include/lastfm/Library.h -include/lastfm/Mbid.h -include/lastfm/NetworkAccessManager.h -include/lastfm/NetworkConnectionMonitor.h -include/lastfm/Playlist.h -include/lastfm/RadioStation.h -include/lastfm/RadioTuner.h -include/lastfm/ScrobbleCache.h -include/lastfm/ScrobblePoint.h -include/lastfm/Tag.h -include/lastfm/Tasteometer.h -include/lastfm/Track.h -include/lastfm/Url.h -include/lastfm/UrlBuilder.h -include/lastfm/User.h -include/lastfm/XmlQuery.h -include/lastfm/Xspf.h -include/lastfm/global.h -include/lastfm/misc.h -include/lastfm/ws.h -lib/liblastfm.so -lib/liblastfm.so.1 -lib/liblastfm.so.1.0.9 -%%FINGERPRINT%%lib/liblastfm_fingerprint.so -%%FINGERPRINT%%lib/liblastfm_fingerprint.so.1 -%%FINGERPRINT%%lib/liblastfm_fingerprint.so.1.0.9 +include/lastfm%%QTVER_SUFFIX%%/AbstractType.h +include/lastfm%%QTVER_SUFFIX%%/Album.h +include/lastfm%%QTVER_SUFFIX%%/Artist.h +include/lastfm%%QTVER_SUFFIX%%/Audioscrobbler.h +include/lastfm%%QTVER_SUFFIX%%/Auth.h +include/lastfm%%QTVER_SUFFIX%%/Chart.h +%%FINGERPRINT%%include/lastfm%%QTVER_SUFFIX%%/Fingerprint.h +include/lastfm%%QTVER_SUFFIX%%/FingerprintId.h +%%FINGERPRINT%%include/lastfm%%QTVER_SUFFIX%%/FingerprintableSource.h +include/lastfm%%QTVER_SUFFIX%%/InternetConnectionMonitor.h +include/lastfm%%QTVER_SUFFIX%%/Library.h +include/lastfm%%QTVER_SUFFIX%%/Mbid.h +include/lastfm%%QTVER_SUFFIX%%/NetworkAccessManager.h +include/lastfm%%QTVER_SUFFIX%%/NetworkConnectionMonitor.h +include/lastfm%%QTVER_SUFFIX%%/Playlist.h +include/lastfm%%QTVER_SUFFIX%%/RadioStation.h +include/lastfm%%QTVER_SUFFIX%%/RadioTuner.h +include/lastfm%%QTVER_SUFFIX%%/ScrobbleCache.h +include/lastfm%%QTVER_SUFFIX%%/ScrobblePoint.h +include/lastfm%%QTVER_SUFFIX%%/Tag.h +include/lastfm%%QTVER_SUFFIX%%/Tasteometer.h +include/lastfm%%QTVER_SUFFIX%%/Track.h +include/lastfm%%QTVER_SUFFIX%%/Url.h +include/lastfm%%QTVER_SUFFIX%%/UrlBuilder.h +include/lastfm%%QTVER_SUFFIX%%/User.h +include/lastfm%%QTVER_SUFFIX%%/XmlQuery.h +include/lastfm%%QTVER_SUFFIX%%/Xspf.h +include/lastfm%%QTVER_SUFFIX%%/global.h +include/lastfm%%QTVER_SUFFIX%%/misc.h +include/lastfm%%QTVER_SUFFIX%%/ws.h +lib/liblastfm%%QTVER_SUFFIX%%.so +lib/liblastfm%%QTVER_SUFFIX%%.so.1 +lib/liblastfm%%QTVER_SUFFIX%%.so.1.1.0 +%%FINGERPRINT%%lib/liblastfm_fingerprint%%QTVER_SUFFIX%%.so +%%FINGERPRINT%%lib/liblastfm_fingerprint%%QTVER_SUFFIX%%.so.1 +%%FINGERPRINT%%lib/liblastfm_fingerprint%%QTVER_SUFFIX%%.so.1.1.0 |