svn commit: r447021 - in head/audio/cantata: . files

Tobias C. Berner tcberner at FreeBSD.org
Tue Aug 1 14:30:45 UTC 2017 

Author: tcberner
Date: Tue Aug  1 14:30:43 2017
New Revision: 447021
URL: https://svnweb.freebsd.org/changeset/ports/447021

Log:
  Update audio/cantata to 2.1.0
  
  Reviewed by:	rakuco
  Differential Revision:	https://reviews.freebsd.org/D11802

Added:
  head/audio/cantata/files/patch-devices_cddbinterface.cpp   (contents, props changed)
  head/audio/cantata/files/patch-mpd-interface_httpstream.cpp   (contents, props changed)
  head/audio/cantata/files/patch-mpd-interface_mpdstats.h   (contents, props changed)
Deleted:
  head/audio/cantata/files/patch-git_2cb8d7f
  head/audio/cantata/files/patch-git_a13f957
Modified:
  head/audio/cantata/Makefile
  head/audio/cantata/distinfo
  head/audio/cantata/pkg-plist

Modified: head/audio/cantata/Makefile
==============================================================================
--- head/audio/cantata/Makefile	Tue Aug  1 12:36:20 2017	(r447020)
+++ head/audio/cantata/Makefile	Tue Aug  1 14:30:43 2017	(r447021)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=		cantata
-PORTVERSION=		2.0.1
+PORTVERSION=		2.1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=		audio kde
 
 MAINTAINER=		kde at FreeBSD.org
@@ -19,7 +18,8 @@ USE_QT5=		buildtools_build concurrent core dbus gui ne
 			qmake_build sql sql-sqlite3_run svg widgets xml
 
 CMAKE_ARGS=		-DENABLE_QT5:BOOL=TRUE	\
-			-DENABLE_KDE:BOOL=FALSE
+			-DENABLE_KDE:BOOL=FALSE	\
+			-DCMAKE_DISABLE_FIND_PACKAGE_UDev:BOOL=TRUE
 
 USES=			cmake:outsource cpe pkgconfig shebangfix
 SHEBANG_FILES=		dynamic/cantata-dynamic cantata-remote.cmake

Modified: head/audio/cantata/distinfo
==============================================================================
--- head/audio/cantata/distinfo	Tue Aug  1 12:36:20 2017	(r447020)
+++ head/audio/cantata/distinfo	Tue Aug  1 14:30:43 2017	(r447021)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465799840
-SHA256 (CDrummond-cantata-v2.0.1_GH0.tar.gz) = 294fc96944dd2bb6056525a49ae9db1b1da1b7902ac63286ed6c01622b8e3b52
-SIZE (CDrummond-cantata-v2.0.1_GH0.tar.gz) = 2711833
+TIMESTAMP = 1501534413
+SHA256 (CDrummond-cantata-v2.1.0_GH0.tar.gz) = ad679d10f013a427e0af2ed92ed3ab435f60071aef71b271467f3947b4852c8b
+SIZE (CDrummond-cantata-v2.1.0_GH0.tar.gz) = 2925024

Added: head/audio/cantata/files/patch-devices_cddbinterface.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/cantata/files/patch-devices_cddbinterface.cpp	Tue Aug  1 14:30:43 2017	(r447021)
@@ -0,0 +1,13 @@
+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);
+                     }

Added: head/audio/cantata/files/patch-mpd-interface_httpstream.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/cantata/files/patch-mpd-interface_httpstream.cpp	Tue Aug  1 14:30:43 2017	(r447021)
@@ -0,0 +1,14 @@
+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;

Added: head/audio/cantata/files/patch-mpd-interface_mpdstats.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/cantata/files/patch-mpd-interface_mpdstats.h	Tue Aug  1 14:30:43 2017	(r447021)
@@ -0,0 +1,12 @@
+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>
+ 

Modified: head/audio/cantata/pkg-plist
==============================================================================
--- head/audio/cantata/pkg-plist	Tue Aug  1 12:36:20 2017	(r447020)
+++ head/audio/cantata/pkg-plist	Tue Aug  1 14:30:43 2017	(r447021)
@@ -7,7 +7,7 @@ share/applications/cantata.desktop
 %%DATADIR%%/config/scrobblers.xml
 %%DATADIR%%/config/tag_fixes.xml
 %%DATADIR%%/config/weblinks.xml
-%%DATADIR%%/fonts/fontawesome-4.3.0.ttf
+%%DATADIR%%/fonts/fontawesome-webfont.ttf
 %%DATADIR%%/icons/bbc.svg
 %%DATADIR%%/icons/cbc.svg
 %%DATADIR%%/icons/npr.svg
@@ -19,7 +19,6 @@ share/applications/cantata.desktop
 %%DATADIR%%/icons/cantata/index.theme
 %%DATADIR%%/icons/cantata/svg/audio-x-generic.svg
 %%DATADIR%%/icons/cantata/svg/cantata.svg
-%%DATADIR%%/icons/cantata/svg/dynamic-playlist.svg
 %%TAGLIB%%%%DATADIR%%/icons/cantata/svg/drive-removable-media-usb-pendrive.svg
 %%DATADIR%%/icons/cantata/svg/folder-downloads.svg
 %%DATADIR%%/icons/cantata/svg/folder-temp.svg
@@ -28,7 +27,6 @@ share/applications/cantata.desktop
 %%DATADIR%%/icons/cantata/svg/inode-directory.svg
 %%TAGLIB%%%%DATADIR%%/icons/cantata/svg/multimedia-player.svg
 %%DATADIR%%/icons/cantata/svg/network-server-database.svg
-%%DATADIR%%/icons/cantata/svg/playlist.svg
 %%DATADIR%%/icons/cantata/svg/preferences-desktop-keyboard.svg
 %%DATADIR%%/icons/cantata/svg/preferences-other.svg
 %%PROXY%%%%DATADIR%%/icons/cantata/svg/preferences-system-network.svg
@@ -40,28 +38,27 @@ share/applications/cantata.desktop
 %%DATADIR%%/mpd/mpd.conf.template
 %%DATADIR%%/scripts/cantata-dynamic
 %%DATADIR%%/scripts/cantata-remote
-%%DATADIR%%/themes/adwaita.css
-%%DATADIR%%/themes/ambiance-dt.css
-%%DATADIR%%/themes/ambiance.css
-%%DATADIR%%/themes/elementary.css
-%%DATADIR%%/themes/faience.css
-%%DATADIR%%/themes/mint-x.css
-%%DATADIR%%/themes/radiance-dt.css
-%%DATADIR%%/themes/radiance.css
+%%NLS%%%%DATADIR%%/translations/blank.qm
 %%NLS%%%%DATADIR%%/translations/cantata_cs.qm
 %%NLS%%%%DATADIR%%/translations/cantata_de.qm
 %%NLS%%%%DATADIR%%/translations/cantata_en_GB.qm
 %%NLS%%%%DATADIR%%/translations/cantata_es.qm
 %%NLS%%%%DATADIR%%/translations/cantata_fr.qm
 %%NLS%%%%DATADIR%%/translations/cantata_hu.qm
+%%NLS%%%%DATADIR%%/translations/cantata_it.qm
+%%NLS%%%%DATADIR%%/translations/cantata_ja.qm
 %%NLS%%%%DATADIR%%/translations/cantata_ko.qm
 %%NLS%%%%DATADIR%%/translations/cantata_pl.qm
 %%NLS%%%%DATADIR%%/translations/cantata_ru.qm
 %%NLS%%%%DATADIR%%/translations/cantata_zh_CN.qm
+share/icons/hicolor/128x128/apps/cantata.png
 share/icons/hicolor/16x16/apps/cantata.png
 share/icons/hicolor/22x22/apps/cantata.png
 share/icons/hicolor/24x24/apps/cantata.png
+share/icons/hicolor/256x256/apps/cantata.png
 share/icons/hicolor/32x32/apps/cantata.png
 share/icons/hicolor/48x48/apps/cantata.png
+share/icons/hicolor/512x512/apps/cantata.png
 share/icons/hicolor/64x64/apps/cantata.png
 share/icons/hicolor/scalable/apps/cantata.svg
+share/icons/hicolor/scalable/apps/cantata-symbolic.svg

More information about the svn-ports-all mailing list