Index: head/audio/clementine-player/Makefile =================================================================== --- head/audio/clementine-player/Makefile (revision 355423) +++ head/audio/clementine-player/Makefile (revision 355424) @@ -1,155 +1,160 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= clementine -PORTVERSION= 1.2.1 -PORTREVISION= 7 +PORTVERSION= 1.2.3 CATEGORIES= audio -MASTER_SITES= GOOGLE_CODE PKGNAMESUFFIX= -player +USE_GITHUB= yes +GH_ACCOUNT= ${PORTNAME}${PKGNAMESUFFIX} +GH_PROJECT= Clementine +GH_TAGNAME= ${PORTVERSION} +GH_COMMIT= c189ee5 + MAINTAINER= sbruno@FreeBSD.org COMMENT= Cross-platform music player based on Amarok 1.4 LICENSE= GPLv3 LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libtag.so:${PORTSDIR}/audio/taglib \ libchromaprint.so:${PORTSDIR}/audio/chromaprint \ libprotobuf.so:${PORTSDIR}/devel/protobuf \ libqca.so:${PORTSDIR}/devel/qca \ libqjson.so:${PORTSDIR}/devel/qjson \ - libfftw3.so:${PORTSDIR}/math/fftw3 + libfftw3.so:${PORTSDIR}/math/fftw3 \ + libechonest.so:${PORTSDIR}/audio/libechonest BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs # avoid clash with x11-wm/clementine LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX} USES= compiler:c++11-lib cmake pkgconfig desktop-file-utils USE_GL= glew USE_QT4= dbus gui xml qmake_build uic_build moc_build rcc_build \ linguist_build network sql opengl qtestlib corelib webkit \ imageformats INSTALLS_ICONS= yes USE_GSTREAMER= gio ogg mp3 flac soup vorbis CONFLICTS_BUILD= qt-3.* CFLAGS+= -Wno-deprecated-register CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \ -DENABLE_DBUS=ON -DENABLE_SPARKLE=OFF \ -DENABLE_SOUNDMENU=OFF -DENABLE_SPOTIFY_BLOB=OFF \ -DENABLE_UBUNTU_ONE=OFF -DENABLE_SKYDRIVE=OFF OPTIONS_DEFINE= AUDIOCD BREAKPAD DEVICEKIT DROPBOX BOX GIO GOOGLE_DRIVE \ GPOD LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR OPTIONS_SUB= VISUALISATION AUDIOCD_DESC= Devices: Audio CD support BREAKPAD_DESC= Crash reporting BOX_DESC= Box Drive support DEVICEKIT_DESC= Devices: DeviceKit backend DROPBOX_DESC= Dropbox Support GIO_DESC= Devices: GIO device backend GOOGLE_DRIVE_DESC= Google Drive support GPOD_DESC= iPod support LASTFM_DESC= Support Last.fm service (requires ruby) MTP_DESC= MTP device support VISUALISATION_DESC= Visualisations from projectM WIIMOTEDEV_DESC= Wiimote support MOODBAR_DESC= Moodbar Support OPTIONS_DEFAULT= AUDIOCD BOX DEVICEKIT DROPBOX GIO GOOGLE_DRIVE GPOD \ LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR .include .if ${PORT_OPTIONS:MDROPBOX} CMAKE_ARGS+= -DENABLE_DROPBOX=ON .else CMAKE_ARGS+= -DENABLE_DROPBOX=OFF .endif .if ${PORT_OPTIONS:MMOODBAR} CMAKE_ARGS+= -DENABLE_MOODBAR=ON .else CMAKE_ARGS+= -DENABLE_MOODBAR=OFF .endif .if ${PORT_OPTIONS:MAUDIOCD} CMAKE_ARGS+= -DENABLE_AUDIOCD=ON LIB_DEPENDS+= libcdio.so:${PORTSDIR}/sysutils/libcdio .else CMAKE_ARGS+= -DENABLE_AUDIOCD=OFF .endif .if ${PORT_OPTIONS:MBOX} CMAKE_ARGS+= -DENABLE_BOX=ON .else CMAKE_ARGS+= -DENABLE_BOX=OFF .endif .if ${PORT_OPTIONS:MBREAKPAD} CMAKE_ARGS+= -DENABLE_BREAKPAD=ON .else CMAKE_ARGS+= -DENABLE_BREAKPAD=OFF .endif .if ${PORT_OPTIONS:MDEVICEKIT} CMAKE_ARGS+= -DENABLE_DEVICEKIT=ON .else CMAKE_ARGS+= -DENABLE_DEVICEKIT=OFF .endif .if ${PORT_OPTIONS:MGIO} CMAKE_ARGS+= -DENABLE_GIO=ON USE_GNOME= glib20 .else CMAKE_ARGS+= -DENABLE_GIO=OFF .endif .if ${PORT_OPTIONS:MGOOGLE_DRIVE} CMAKE_ARGS+= -DENABLE_GOOGLE_DRIVE=ON BUILD_DEPENDS+= google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash .else CMAKE_ARGS+= -DENABLE_GOOGLE_DRIVE=OFF .endif .if ${PORT_OPTIONS:MGPOD} CMAKE_ARGS+= -DENABLE_LIBGPOD=ON LIB_DEPENDS+= libgpod.so:${PORTSDIR}/audio/libgpod .else CMAKE_ARGS+= -DENABLE_LIBGPOD=OFF .endif .if ${PORT_OPTIONS:MLASTFM} CMAKE_ARGS+= -DENABLE_LIBLASTFM=ON LIB_DEPENDS+= liblastfm.so:${PORTSDIR}/audio/liblastfm .else CMAKE_ARGS+= -DENABLE_LIBLASTFM=OFF .endif .if ${PORT_OPTIONS:MMTP} CMAKE_ARGS+= -DENABLE_LIBMTP=ON LIB_DEPENDS+= libmtp.so:${PORTSDIR}/multimedia/libmtp .else CMAKE_ARGS+= -DENABLE_LIBMTP=OFF .endif .if ${PORT_OPTIONS:MVISUALISATION} CMAKE_ARGS+= -DENABLE_VISUALISATIONS=ON .else CMAKE_ARGS+= -DENABLE_VISUALISATIONS=OFF .endif .if ${PORT_OPTIONS:MWIIMOTEDEV} CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=ON .else CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=OFF .endif .include Index: head/audio/clementine-player/distinfo =================================================================== --- head/audio/clementine-player/distinfo (revision 355423) +++ head/audio/clementine-player/distinfo (revision 355424) @@ -1,2 +1,2 @@ -SHA256 (clementine-1.2.1.tar.gz) = db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e -SIZE (clementine-1.2.1.tar.gz) = 9274351 +SHA256 (clementine-1.2.3.tar.gz) = b7e4813b54f2cb586e80c27945240c11d884082459248e87b7359689a0f0dffb +SIZE (clementine-1.2.3.tar.gz) = 9075813 Index: head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.cpp =================================================================== --- head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.cpp (revision 355423) +++ head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- ./ext/libclementine-common/core/closure.cpp.orig 2013-11-24 15:58:51.321696435 -0800 -+++ ./ext/libclementine-common/core/closure.cpp 2013-11-24 15:59:00.552695416 -0800 -@@ -33,7 +33,7 @@ - CallbackClosure::CallbackClosure( - QObject* sender, - const char* signal, -- std::tr1::function callback) -+ std::function callback) - : ClosureBase(new ObjectHelper(sender, signal, this)), - callback_(callback) { - } -@@ -67,7 +67,7 @@ - _detail::ClosureBase* NewClosure( - QObject* sender, - const char* signal, -- std::tr1::function callback) { -+ std::function callback) { - return new _detail::CallbackClosure( - sender, signal, callback); - } Property changes on: head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.h =================================================================== --- head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.h (revision 355423) +++ head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.h (nonexistent) @@ -1,42 +0,0 @@ ---- ./ext/libclementine-common/core/closure.h.orig 2013-11-24 15:58:19.241698287 -0800 -+++ ./ext/libclementine-common/core/closure.h 2013-11-24 15:58:38.634697259 -0800 -@@ -18,7 +18,7 @@ - #ifndef CLOSURE_H - #define CLOSURE_H - --#include -+#include - - #include - #include -@@ -158,12 +158,12 @@ - CallbackClosure( - QObject* sender, - const char* signal, -- std::tr1::function callback); -+ std::function callback); - - virtual void Invoke(); - - private: -- std::tr1::function callback_; -+ std::function callback_; - }; - - } // namespace _detail -@@ -194,13 +194,13 @@ - _detail::ClosureBase* NewClosure( - QObject* sender, - const char* signal, -- std::tr1::function callback); -+ std::function callback); - - template - _detail::ClosureBase* NewClosure( - QObject* sender, - const char* signal, -- std::tr1::function callback, -+ std::function callback, - const Args&... args) { - return NewClosure(sender, signal, boost::bind(callback, args...)); - } Property changes on: head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/clementine-player/files/patch-src__playlistparsers__plsparser.cpp =================================================================== --- head/audio/clementine-player/files/patch-src__playlistparsers__plsparser.cpp (revision 355423) +++ head/audio/clementine-player/files/patch-src__playlistparsers__plsparser.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- ./src/playlistparsers/plsparser.cpp.orig 2013-11-24 16:01:13.247686715 -0800 -+++ ./src/playlistparsers/plsparser.cpp 2013-11-24 16:03:24.812677689 -0800 -@@ -46,7 +46,7 @@ - // Use the title and length we've already loaded if any - if (!songs[n].title().isEmpty()) - song.set_title(songs[n].title()); -- if (!songs[n].length_nanosec() != -1) -+ if (songs[n].length_nanosec() != -1) - song.set_length_nanosec(songs[n].length_nanosec()); - - songs[n] = song; Property changes on: head/audio/clementine-player/files/patch-src__playlistparsers__plsparser.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/clementine-player/files/patch-src__library_groupbydialog.h =================================================================== --- head/audio/clementine-player/files/patch-src__library_groupbydialog.h (nonexistent) +++ head/audio/clementine-player/files/patch-src__library_groupbydialog.h (revision 355424) @@ -0,0 +1,11 @@ +--- ./src/library/groupbydialog.h.orig 2014-05-25 10:38:37.378768447 -0700 ++++ ./src/library/groupbydialog.h 2014-05-25 10:39:12.641759778 -0700 +@@ -22,6 +22,8 @@ + + #include + ++#include ++ + using std::placeholders::_1; + using std::placeholders::_2; + Property changes on: head/audio/clementine-player/files/patch-src__library_groupbydialog.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property