diff options
| author | adridg <adridg@FreeBSD.org> | 2017-10-01 18:49:13 +0000 |
|---|---|---|
| committer | adridg <adridg@FreeBSD.org> | 2017-10-01 18:49:13 +0000 |
| commit | df1fcb3f3d783c8b2394301ff4c7fc012f774bb5 (patch) | |
| tree | e2445cd6d71f738d0fdfef9defb20f8e1c9e4369 | |
| parent | acaf0b7fa01ef35e41539640ccc032bdc9798e1b (diff) | |
| download | FreeBSD-ports-df1fcb3f3d783c8b2394301ff4c7fc012f774bb5.zip FreeBSD-ports-df1fcb3f3d783c8b2394301ff4c7fc012f774bb5.tar.gz | |
Update audio/cantata to 2.2.0
- All previous patches have been upstreamed
- Switch to DISTVERSION
Approved by: tcberner (mentor), rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D12550
| -rw-r--r-- | audio/cantata/Makefile | 4 | ||||
| -rw-r--r-- | audio/cantata/distinfo | 6 | ||||
| -rw-r--r-- | audio/cantata/files/patch-devices_cddbinterface.cpp | 13 | ||||
| -rw-r--r-- | audio/cantata/files/patch-mpd-interface_httpstream.cpp | 14 | ||||
| -rw-r--r-- | audio/cantata/files/patch-mpd-interface_mpdstats.h | 12 |
5 files changed, 5 insertions, 44 deletions
diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile index 80766de..3a6568c 100644 --- a/audio/cantata/Makefile +++ b/audio/cantata/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cantata -PORTVERSION= 2.1.0 +DISTVERSION= 2.2.0 DISTVERSIONPREFIX= v CATEGORIES= audio kde @@ -22,7 +22,7 @@ CMAKE_ARGS= -DENABLE_QT5:BOOL=TRUE \ -DCMAKE_DISABLE_FIND_PACKAGE_UDev:BOOL=TRUE USES= cmake:outsource cpe pkgconfig shebangfix -SHEBANG_FILES= dynamic/cantata-dynamic cantata-remote.cmake +SHEBANG_FILES= playlists/cantata-dynamic cantata-remote.cmake CPE_VENDOR= craig_drummond USE_LDCONFIG= yes diff --git a/audio/cantata/distinfo b/audio/cantata/distinfo index e09405e..81e85da 100644 --- a/audio/cantata/distinfo +++ b/audio/cantata/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501534413 -SHA256 (CDrummond-cantata-v2.1.0_GH0.tar.gz) = ad679d10f013a427e0af2ed92ed3ab435f60071aef71b271467f3947b4852c8b -SIZE (CDrummond-cantata-v2.1.0_GH0.tar.gz) = 2925024 +TIMESTAMP = 1506781584 +SHA256 (CDrummond-cantata-v2.2.0_GH0.tar.gz) = 000f7a8561667fc8d15fad3b8bf0ada8f693a76fed0afafa166a0225cc93e9de +SIZE (CDrummond-cantata-v2.2.0_GH0.tar.gz) = 2955660 diff --git a/audio/cantata/files/patch-devices_cddbinterface.cpp b/audio/cantata/files/patch-devices_cddbinterface.cpp deleted file mode 100644 index be98334..0000000 --- a/audio/cantata/files/patch-devices_cddbinterface.cpp +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/CDrummond/cantata/pull/1052 - ---- devices/cddbinterface.cpp.orig 2017-07-30 19:13:05 UTC -+++ devices/cddbinterface.cpp -@@ -158,7 +158,7 @@ void CddbInterface::readDisc() - cddb_track_t *track = cddb_track_new(); - if (track) { - cddb_track_set_frame_offset(track, te.entry.addr.lba + SECONDS_TO_FRAMES(2)); -- cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1", i).toUtf8().constData()); -+ cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1").arg(i).toUtf8().constData()); - cddb_track_set_artist(track, unknown.constData()); - cddb_disc_add_track(disc, track); - } diff --git a/audio/cantata/files/patch-mpd-interface_httpstream.cpp b/audio/cantata/files/patch-mpd-interface_httpstream.cpp deleted file mode 100644 index 081666d..0000000 --- a/audio/cantata/files/patch-mpd-interface_httpstream.cpp +++ /dev/null @@ -1,14 +0,0 @@ -https://github.com/CDrummond/cantata/pull/1052 - ---- mpd-interface/httpstream.cpp.orig 2017-08-01 10:50:50 UTC -+++ mpd-interface/httpstream.cpp -@@ -25,7 +25,9 @@ - #include "mpdconnection.h" - #include "mpdstatus.h" - #include "gui/settings.h" -+#ifndef LIBVLC_FOUND - #include <QtMultimedia/QMediaPlayer> -+#endif - #include <QTimer> - - static const int constPlayerCheckPeriod=250; diff --git a/audio/cantata/files/patch-mpd-interface_mpdstats.h b/audio/cantata/files/patch-mpd-interface_mpdstats.h deleted file mode 100644 index 3c5f941..0000000 --- a/audio/cantata/files/patch-mpd-interface_mpdstats.h +++ /dev/null @@ -1,12 +0,0 @@ -https://github.com/CDrummond/cantata/pull/1052 - ---- mpd-interface/mpdstats.h.orig 2017-07-30 19:13:05 UTC -+++ mpd-interface/mpdstats.h -@@ -27,6 +27,7 @@ - #ifndef MPD_STATS_H - #define MPD_STATS_H - -+#include <ctime> - #include <QDateTime> - #include <QObject> - |
