Attachment #169754 for bug #209095

View | Details | Raw Unified | Return to bug 209095
Collapse All | Expand All




# $FreeBSD$

PORTNAME=		cantata
PORTVERSION=		2.0.0
DISTVERSIONPREFIX=	v
CATEGORIES=		audio kde
MASTER_SITES=		https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8&dummy=

MAINTAINER=		kde@FreeBSD.org
COMMENT=		Graphical client for MPD using Qt5

LICENSE=		GPLv3
LICENSE_FILE=		${WRKSRC}/LICENSE

USE_QT5=		buildtools_build concurrent core dbus gui network \
			qmake_build svg sql sql-sqlite3_run widgets xml
USE_GITHUB=		yes
GH_ACCOUNT=		cdrummond

FETCH_BEFORE_ARGS=	-o ${DISTFILES}

CMAKE_ARGS=		-DENABLE_QT5:BOOL=TRUE	\
			-DENABLE_KDE:BOOL=FALSE
			-DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \
			-DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease

USES=			cmake:outsource cpe pkgconfig shebangfix tar:bzip2
SHEBANG_FILES=		dynamic/cantata-dynamic cantata-remote.cmake


INSTALLS_ICONS=		yes

OPTIONS_DEFINE=		CDPARANOIA MTP NLS PROXY TAGLIB
OPTIONS_GROUP=		CDINFO REPLAYGAIN
OPTIONS_GROUP_CDINFO=	CDDB MUSICBRAINZ
OPTIONS_GROUP_REPLAYGAIN=	FFMPEG MPG123
OPTIONS_RADIO=		HSP
OPTIONS_RADIO_HSP=	QT5 VLC
OPTIONS_DEFAULT=	TAGLIB
OPTIONS_SUB=		yes

CDINFO_DESC=		AudioCD support
REPLAYGAIN_DESC=	Replaygain calculation support
HSP_DESC=		MPD HTTP stream playback

QT5_USE=		QT5=multimedia
QT5_DESC=		HTTP streams support via QtMultimedia

VLC_LIB_DEPENDS=	libvlc.so:multimedia/vlc
VLC_CMAKE_ON=		-DENABLE_LIBVLC:BOOL=TRUE
VLC_CMAKE_OFF=		-DENABLE_LIBVLC:BOOL=FALSE
VLC_DESC=		HTTP streams support via libVLC

CDDB_IMPLIES=		CDPARANOIA
CDDB_LIB_DEPENDS=	libcddb.so:audio/libcddb
CDDB_CMAKE_ON=		-DENABLE_CDDB:BOOL=TRUE
CDDB_CMAKE_OFF=		-DENABLE_CDDB:BOOL=FALSE
CDDB_DESC=		CD info retrieval via CDDB

CDPARANOIA_IMPLIES=	TAGLIB
CDPARANOIA_LIB_DEPENDS=	libcdda_interface.so:audio/cdparanoia
CDPARANOIA_CMAKE_ON=	-DENABLE_CDPARANOIA:BOOL=TRUE
CDPARANOIA_CMAKE_OFF=	-DENABLE_CDPARANOIA:BOOL=FALSE

FFMPEG_IMPLIES=		TAGLIB
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
FFMPEG_CMAKE_ON=	-DENABLE_FFMPEG:BOOL=TRUE
FFMPEG_CMAKE_OFF=	-DENABLE_FFMPEG:BOOL=FALSE
FFMPEG_DESC=		ReplayGain calculation support via FFmpeg

MPG123_IMPLIES=		TAGLIB
MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
MPG123_CMAKE_ON=	-DENABLE_MPG123:BOOL=TRUE
MPG123_CMAKE_OFF=	-DENABLE_MPG123:BOOL=FALSE
MPG123_DESC=		ReplayGain calculation support via mpg123

MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
MTP_CMAKE_ON=		-DENABLE_MTP:BOOL=TRUE
MTP_CMAKE_OFF=		-DENABLE_MTP:BOOL=FALSE

MUSICBRAINZ_IMPLIES=	CDPARANOIA
MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5
MUSICBRAINZ_CMAKE_ON=	-DENABLE_MUSICBRAINZ:BOOL=TRUE
MUSICBRAINZ_CMAKE_OFF=	-DENABLE_MUSICBRAINZ:BOOL=FALSE
MUSICBRAINZ_DESC=	CD info retrieval via MusicBrainz

NLS_USE=		QT5=linguisttools_build
NLS_CMAKE_ON=		-DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \
			-DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease
NLS_CMAKE_OFF=		-DLCONVERT_EXECUTABLE:BOOL=FALSE \
			-DLRELEASE_EXECUTABLE:BOOL=FALSE

PROXY_CMAKE_ON=		-DENABLE_PROXY_CONFIG:BOOL=TRUE
PROXY_CMAKE_OFF=	-DENABLE_PROXY_CONFIG:BOOL=FALSE
PROXY_DESC=		Proxy configuration in settings dialog

TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib \
			libtag-extras.so:audio/taglib-extras
TAGLIB_USES=		localbase
TAGLIB_CMAKE_ON=	-DENABLE_TAGLIB_EXTRAS:BOOL=TRUE \
			-DENABLE_TAGLIB:BOOL=TRUE
TAGLIB_CMAKE_OFF=	-DENABLE_TAGLIB_EXTRAS:BOOL=FALSE \


.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MMPG123}
LIB_DEPENDS+=		libebur128.so:audio/libebur128
PLIST_SUB+=		REPLAYGAIN=""
.else
PLIST_SUB+=		REPLAYGAIN="@comment "
.endif

.if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MVLC}
CMAKE_ARGS+=		-DENABLE_HTTP_STREAM_PLAYBACK:BOOL=TRUE
.else
CMAKE_ARGS+=		-DENABLE_HTTP_STREAM_PLAYBACK:BOOL=FALSE
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)audio/cantata/distinfo (-2 / +2 lines)
1	SHA256 (cantata-1.5.1.tar.bz2) = 57173bdd0033a2c0c2829a6e05f7579b0f13ae7794d843167c013e1c971dfe78	1	SHA256 (cdrummond-cantata-v2.0.0_GH0.tar.gz) = 5f280306c9a52d42bbcd976aef2b547d5242faadcce4cf8fc02ad2760060e55b
2	SIZE (cantata-1.5.1.tar.bz2) = 1986772	2	SIZE (cdrummond-cantata-v2.0.0_GH0.tar.gz) = 2704951




diff --git a/cmake/FindTaglib.cmake b/cmake/FindTaglib.cmake
index 132b311..5d8c3db 100644
--- cmake/FindTaglib.cmake
+++ cmake/FindTaglib.cmake
@@ -31,10 +31,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
 
   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
 
-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
+  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
      set(TAGLIB_FOUND FALSE)
-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
+  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
 
      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
 
@@ -44,7 +44,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
         set(TAGLIB_FOUND TRUE)
      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
+  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") 
   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
 
 else(TAGLIBCONFIG_EXECUTABLE)

Lines 1-10 Link Here

(-)audio/cantata/files/patch-replaygain_ffmpeginput.cpp (-10 lines)
1	--- replaygain/ffmpeginput.cpp.orig 2015-01-21 18:44:15 UTC
2	+++ replaygain/ffmpeginput.cpp
3	@@ -8,7 +8,6 @@
4	*/
5
6	/* See LICENSE file for copyright and license details. */
7	-#define _POSIX_C_SOURCE 1
8	#ifdef __cplusplus
9	#define __STDC_CONSTANT_MACROS
10	#ifdef _STDINT_H

Lines 1-10 Link Here

(-)audio/cantata/files/patch-replaygain_mpg123input.cpp (-10 lines)
1	--- replaygain/mpg123input.cpp.orig 2015-01-21 18:46:32 UTC
2	+++ replaygain/mpg123input.cpp
3	@@ -8,7 +8,6 @@
4	*/
5
6	/* See LICENSE file for copyright and license details. */
7	-#define _POSIX_C_SOURCE 1
8	#ifdef __cplusplus
9	extern "C" {
10	#endif




Look for icons in more than just /usr/share -- upstream svn patch:
Log message

- When checking for icon themes, also check in $PREFIX
- Also ensure path is in QIcon's theme path

https://code.google.com/p/cantata/source/detail?r=5740


Index: gui/application_qt.cpp
===================================================================
--- gui/application_qt.cpp	(revision 5739)
+++ gui/application_qt.cpp	(working copy)
@@ -45,11 +45,21 @@
     // or gnome icon themes are installed, and set theme to one of those.
     if (!QIcon::hasThemeIcon("document-save-as")) {
         QStringList themes=QStringList() << QLatin1String("oxygen") << QLatin1String("gnome");
+        QStringList prefixes=QStringList() << QLatin1String("/usr") << QLatin1String("/usr/local");
+        if (!prefixes.contains(QLatin1String(INSTALL_PREFIX))) {
+            prefixes+=QLatin1String(INSTALL_PREFIX);
+        }
         foreach (const QString &theme, themes) {
-            QString dir(QLatin1String("/usr/share/icons/")+theme);
-            if (QDir(dir).exists()) {
-                QIcon::setThemeName(theme);
-                return;
+            foreach (const QString &prefix, prefixes) {
+                QString dir(prefix+QLatin1String("/share/icons/")+theme);
+                if (QDir(dir).exists()) {
+                    QIcon::setThemeName(theme);
+                    // Add to theme search paths, if it is not there already...
+                    if (!QIcon::themeSearchPaths().contains(prefix+QLatin1String("/share/icons"))) {
+                        QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QString(prefix+QLatin1String("/share/icons")));
+                    }
+                    return;
+                }
             }
         }
     }

Lines 1-3 Link Here

(-)audio/cantata/pkg-descr (-1 / +1 lines)
1	Cantata is a graphical client for MPD.	1	Cantata is a graphical client for MPD.
2		2
3	WWW: https://code.google.com/p/cantata/	3	WWW: https://github.com/cdrummond/cantata




share/cantata/config/scrobblers.xml
share/cantata/config/tag_fixes.xml
share/cantata/config/weblinks.xml
share/cantata/fonts/fontawesome-4.3.0.ttf
share/cantata/icons/bbc.svg
share/cantata/icons/cbc.svg
share/cantata/icons/npr.svg

share/cantata/icons/podcasts.png
share/cantata/icons/soundcloud.png
share/cantata/icons/stream.png
share/cantata/icons/cantata/AUTHORS
share/cantata/icons/cantata/LICENSE
share/cantata/icons/cantata/index.theme
share/cantata/icons/cantata/svg/audio-x-generic.svg
share/cantata/icons/cantata/svg/cantata.svg
share/cantata/icons/cantata/svg/dynamic-playlist.svg
%%TAGLIB%%share/cantata/icons/cantata/svg/drive-removable-media-usb-pendrive.svg
share/cantata/icons/cantata/svg/folder-downloads.svg
share/cantata/icons/cantata/svg/folder-temp.svg
share/cantata/icons/cantata/svg/fork.svg
share/cantata/icons/cantata/svg/information.svg
share/cantata/icons/cantata/svg/inode-directory.svg
%%TAGLIB%%share/cantata/icons/cantata/svg/multimedia-player.svg
share/cantata/icons/cantata/svg/network-server-database.svg
share/cantata/icons/cantata/svg/playlist.svg
share/cantata/icons/cantata/svg/preferences-desktop-keyboard.svg
share/cantata/icons/cantata/svg/preferences-other.svg
share/cantata/icons/cantata/svg/speaker.svg
share/cantata/icons/cantata/svg64/dialog-error.svg
share/cantata/icons/cantata/svg64/dialog-information.svg
share/cantata/icons/cantata/svg64/dialog-question.svg
share/cantata/icons/cantata/svg64/dialog-warning.svg
share/cantata/mpd/mpd.conf.template
share/cantata/scripts/cantata-dynamic
share/cantata/scripts/cantata-remote

share/cantata/themes/mint-x.css
share/cantata/themes/radiance-dt.css
share/cantata/themes/radiance.css
%%NLS%%share/cantata/translations/cantata_cs.qm
%%NLS%%share/cantata/translations/cantata_de.qm
%%NLS%%share/cantata/translations/cantata_en_GB.qm
%%NLS%%share/cantata/translations/cantata_es.qm
%%NLS%%share/cantata/translations/cantata_fr.qm
%%NLS%%share/cantata/translations/cantata_hu.qm
%%NLS%%share/cantata/translations/cantata_ko.qm
%%NLS%%share/cantata/translations/cantata_pl.qm
%%NLS%%share/cantata/translations/cantata_ru.qm
%%NLS%%share/cantata/translations/cantata_zh_CN.qm
share/icons/hicolor/16x16/apps/cantata.png
share/icons/hicolor/22x22/apps/cantata.png
share/icons/hicolor/24x24/apps/cantata.png
share/icons/hicolor/32x32/apps/cantata.png
share/icons/hicolor/48x48/apps/cantata.png
share/icons/hicolor/64x64/apps/cantata.png
share/icons/hicolor/scalable/apps/cantata.svg

Return to bug 209095

Lines 1-10 Link Here

(-)audio/cantata/Makefile (-15 / +54 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cantata	3	PORTNAME= cantata
4	PORTVERSION= 1.5.1	4	PORTVERSION= 2.0.0
5	PORTREVISION= 3	5	DISTVERSIONPREFIX= v
6	CATEGORIES= audio kde	6	CATEGORIES= audio kde
7	MASTER_SITES= https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8&dummy=
8		7
9	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
10	COMMENT= Graphical client for MPD using Qt5	9	COMMENT= Graphical client for MPD using Qt5
Lines 12-27 Link Here
12	LICENSE= GPLv3	11	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
14		13
15	USE_KDE4= oxygen	14	USE_QT5= buildtools_build concurrent core dbus gui network \
16	USE_QT5= buildtools_build concurrent core dbus gui \	15	qmake_build svg sql sql-sqlite3_run widgets xml
17	network qmake_build linguisttools svg widgets xml	16	USE_GITHUB= yes
		17	GH_ACCOUNT= cdrummond
18		18
19	FETCH_BEFORE_ARGS= -o ${DISTFILES}
20
21	CMAKE_ARGS= -DENABLE_QT5:BOOL=TRUE \	19	CMAKE_ARGS= -DENABLE_QT5:BOOL=TRUE \
22	-DENABLE_KDE:BOOL=FALSE \	20	-DENABLE_KDE:BOOL=FALSE
23	-DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \
24	-DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease
25		21
26	USES= cmake:outsource cpe pkgconfig shebangfix tar:bzip2	22	USES= cmake:outsource cpe pkgconfig shebangfix tar:bzip2
27	SHEBANG_FILES= dynamic/cantata-dynamic cantata-remote.cmake	23	SHEBANG_FILES= dynamic/cantata-dynamic cantata-remote.cmake
Lines 30-66 Link Here
30		26
31	INSTALLS_ICONS= yes	27	INSTALLS_ICONS= yes
32		28
33	OPTIONS_DEFINE= CDDB CDPARANOIA FFMPEG MPG123 MTP MUSICBRAINZ TAGLIB	29	OPTIONS_DEFINE= CDPARANOIA MTP NLS PROXY TAGLIB
		30	OPTIONS_GROUP= CDINFO REPLAYGAIN
		31	OPTIONS_GROUP_CDINFO= CDDB MUSICBRAINZ
		32	OPTIONS_GROUP_REPLAYGAIN= FFMPEG MPG123
		33	OPTIONS_RADIO= HSP
		34	OPTIONS_RADIO_HSP= QT5 VLC
34	OPTIONS_DEFAULT= TAGLIB	35	OPTIONS_DEFAULT= TAGLIB
35	OPTIONS_SUB= yes	36	OPTIONS_SUB= yes
36		37
		38	CDINFO_DESC= AudioCD support
		39	REPLAYGAIN_DESC= Replaygain calculation support
		40	HSP_DESC= MPD HTTP stream playback
		41
		42	QT5_USE= QT5=multimedia
		43	QT5_DESC= HTTP streams support via QtMultimedia
		44
		45	VLC_LIB_DEPENDS= libvlc.so:multimedia/vlc
		46	VLC_CMAKE_ON= -DENABLE_LIBVLC:BOOL=TRUE
		47	VLC_CMAKE_OFF= -DENABLE_LIBVLC:BOOL=FALSE
		48	VLC_DESC= HTTP streams support via libVLC
		49
		50	CDDB_IMPLIES= CDPARANOIA
37	CDDB_LIB_DEPENDS= libcddb.so:audio/libcddb	51	CDDB_LIB_DEPENDS= libcddb.so:audio/libcddb
38	CDDB_CMAKE_ON= -DENABLE_CDDB:BOOL=TRUE	52	CDDB_CMAKE_ON= -DENABLE_CDDB:BOOL=TRUE
39	CDDB_CMAKE_OFF= -DENABLE_CDDB:BOOL=FALSE	53	CDDB_CMAKE_OFF= -DENABLE_CDDB:BOOL=FALSE
		54	CDDB_DESC= CD info retrieval via CDDB
40		55
		56	CDPARANOIA_IMPLIES= TAGLIB
41	CDPARANOIA_LIB_DEPENDS= libcdda_interface.so:audio/cdparanoia	57	CDPARANOIA_LIB_DEPENDS= libcdda_interface.so:audio/cdparanoia
42	CDPARANOIA_CMAKE_ON= -DENABLE_CDPARANOIA:BOOL=TRUE	58	CDPARANOIA_CMAKE_ON= -DENABLE_CDPARANOIA:BOOL=TRUE
43	CDPARANOIA_CMAKE_OFF= -DENABLE_CDPARANOIA:BOOL=FALSE	59	CDPARANOIA_CMAKE_OFF= -DENABLE_CDPARANOIA:BOOL=FALSE
44		60
		61	FFMPEG_IMPLIES= TAGLIB
45	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg	62	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
46	FFMPEG_CMAKE_ON= -DENABLE_FFMPEG:BOOL=TRUE	63	FFMPEG_CMAKE_ON= -DENABLE_FFMPEG:BOOL=TRUE
47	FFMPEG_CMAKE_OFF= -DENABLE_FFMPEG:BOOL=FALSE	64	FFMPEG_CMAKE_OFF= -DENABLE_FFMPEG:BOOL=FALSE
		65	FFMPEG_DESC= ReplayGain calculation support via FFmpeg
48		66
		67	MPG123_IMPLIES= TAGLIB
49	MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123	68	MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123
50	MPG123_CMAKE_ON= -DENABLE_MPG123:BOOL=TRUE	69	MPG123_CMAKE_ON= -DENABLE_MPG123:BOOL=TRUE
51	MPG123_CMAKE_OFF= -DENABLE_MPG123:BOOL=FALSE	70	MPG123_CMAKE_OFF= -DENABLE_MPG123:BOOL=FALSE
		71	MPG123_DESC= ReplayGain calculation support via mpg123
52		72
53	MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp	73	MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp
54	MTP_CMAKE_ON= -DENABLE_MTP:BOOL=TRUE	74	MTP_CMAKE_ON= -DENABLE_MTP:BOOL=TRUE
55	MTP_CMAKE_OFF= -DENABLE_MTP:BOOL=FALSE	75	MTP_CMAKE_OFF= -DENABLE_MTP:BOOL=FALSE
56		76
		77	MUSICBRAINZ_IMPLIES= CDPARANOIA
57	MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5	78	MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5
58	MUSICBRAINZ_CMAKE_ON= -DENABLE_MUSICBRAINZ:BOOL=TRUE	79	MUSICBRAINZ_CMAKE_ON= -DENABLE_MUSICBRAINZ:BOOL=TRUE
59	MUSICBRAINZ_CMAKE_OFF= -DENABLE_MUSICBRAINZ:BOOL=FALSE	80	MUSICBRAINZ_CMAKE_OFF= -DENABLE_MUSICBRAINZ:BOOL=FALSE
60	MUSICBRAINZ_DESC= Access MusicBrainz database for metadata lookup	81	MUSICBRAINZ_DESC= CD info retrieval via MusicBrainz
61		82
62	TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib\	83	NLS_USE= QT5=linguisttools_build
		84	NLS_CMAKE_ON= -DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \
		85	-DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease
		86	NLS_CMAKE_OFF= -DLCONVERT_EXECUTABLE:BOOL=FALSE \
		87	-DLRELEASE_EXECUTABLE:BOOL=FALSE
		88
		89	PROXY_CMAKE_ON= -DENABLE_PROXY_CONFIG:BOOL=TRUE
		90	PROXY_CMAKE_OFF= -DENABLE_PROXY_CONFIG:BOOL=FALSE
		91	PROXY_DESC= Proxy configuration in settings dialog
		92
		93	TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib \
63	libtag-extras.so:audio/taglib-extras	94	libtag-extras.so:audio/taglib-extras
		95	TAGLIB_USES= localbase
64	TAGLIB_CMAKE_ON= -DENABLE_TAGLIB_EXTRAS:BOOL=TRUE \	96	TAGLIB_CMAKE_ON= -DENABLE_TAGLIB_EXTRAS:BOOL=TRUE \
65	-DENABLE_TAGLIB:BOOL=TRUE	97	-DENABLE_TAGLIB:BOOL=TRUE
66	TAGLIB_CMAKE_OFF= -DENABLE_TAGLIB_EXTRAS:BOOL=FALSE \	98	TAGLIB_CMAKE_OFF= -DENABLE_TAGLIB_EXTRAS:BOOL=FALSE \
Lines 69-78 Link Here
69		101
70	.include <bsd.port.options.mk>	102	.include <bsd.port.options.mk>
71		103
72	.if ${PORT_OPTIONS:MTAGLIB} && ( ${PORT_OPTIONS:MFFMPEG} \|\| ${PORT_OPTIONS:MMPG123} )	104	.if ${PORT_OPTIONS:MFFMPEG} \|\| ${PORT_OPTIONS:MMPG123}
		105	LIB_DEPENDS+= libebur128.so:audio/libebur128
73	PLIST_SUB+= REPLAYGAIN=""	106	PLIST_SUB+= REPLAYGAIN=""
74	.else	107	.else
75	PLIST_SUB+= REPLAYGAIN="@comment "	108	PLIST_SUB+= REPLAYGAIN="@comment "
76	.endif	109	.endif
77		110
		111	.if ${PORT_OPTIONS:MQT5} \|\| ${PORT_OPTIONS:MVLC}
		112	CMAKE_ARGS+= -DENABLE_HTTP_STREAM_PLAYBACK:BOOL=TRUE
		113	.else
		114	CMAKE_ARGS+= -DENABLE_HTTP_STREAM_PLAYBACK:BOOL=FALSE
		115	.endif
		116
78	.include <bsd.port.mk>	117	.include <bsd.port.mk>

Lines 1-26 Link Here

(-)audio/cantata/files/patch-git_c0a75da (-26 lines)
1	diff --git a/cmake/FindTaglib.cmake b/cmake/FindTaglib.cmake
2	index 132b311..5d8c3db 100644
3	--- cmake/FindTaglib.cmake
4	+++ cmake/FindTaglib.cmake
5	@@ -31,10 +31,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
6
7	exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
8
9	- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
10	+ if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
11	message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
12	set(TAGLIB_FOUND FALSE)
13	- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
14	+ else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
15
16	exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
17
18	@@ -44,7 +44,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
19	set(TAGLIB_FOUND TRUE)
20	endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
21	string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
22	- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
23	+ endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
24	mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
25
26	else(TAGLIBCONFIG_EXECUTABLE)

Lines 1-39 Link Here

(-)audio/cantata/files/patch-svn-5739-gui__application_qt.cpp (-39 lines)
1	Look for icons in more than just /usr/share -- upstream svn patch:
2	Log message
3
4	- When checking for icon themes, also check in $PREFIX
5	- Also ensure path is in QIcon's theme path
6
7	https://code.google.com/p/cantata/source/detail?r=5740
8
9
10	Index: gui/application_qt.cpp
11	===================================================================
12	--- gui/application_qt.cpp (revision 5739)
13	+++ gui/application_qt.cpp (working copy)
14	@@ -45,11 +45,21 @@
15	// or gnome icon themes are installed, and set theme to one of those.
16	if (!QIcon::hasThemeIcon("document-save-as")) {
17	QStringList themes=QStringList() << QLatin1String("oxygen") << QLatin1String("gnome");
18	+ QStringList prefixes=QStringList() << QLatin1String("/usr") << QLatin1String("/usr/local");
19	+ if (!prefixes.contains(QLatin1String(INSTALL_PREFIX))) {
20	+ prefixes+=QLatin1String(INSTALL_PREFIX);
21	+ }
22	foreach (const QString &theme, themes) {
23	- QString dir(QLatin1String("/usr/share/icons/")+theme);
24	- if (QDir(dir).exists()) {
25	- QIcon::setThemeName(theme);
26	- return;
27	+ foreach (const QString &prefix, prefixes) {
28	+ QString dir(prefix+QLatin1String("/share/icons/")+theme);
29	+ if (QDir(dir).exists()) {
30	+ QIcon::setThemeName(theme);
31	+ // Add to theme search paths, if it is not there already...
32	+ if (!QIcon::themeSearchPaths().contains(prefix+QLatin1String("/share/icons"))) {
33	+ QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QString(prefix+QLatin1String("/share/icons")));
34	+ }
35	+ return;
36	+ }
37	}
38	}
39	}

Lines 7-12 Link Here

(-)audio/cantata/pkg-plist (-16 / +33 lines)
7	share/cantata/config/scrobblers.xml	7	share/cantata/config/scrobblers.xml
8	share/cantata/config/tag_fixes.xml	8	share/cantata/config/tag_fixes.xml
9	share/cantata/config/weblinks.xml	9	share/cantata/config/weblinks.xml
		10	share/cantata/fonts/fontawesome-4.3.0.ttf
10	share/cantata/icons/bbc.svg	11	share/cantata/icons/bbc.svg
11	share/cantata/icons/cbc.svg	12	share/cantata/icons/cbc.svg
12	share/cantata/icons/npr.svg	13	share/cantata/icons/npr.svg
Lines 13-18 Link Here
13	share/cantata/icons/podcasts.png	14	share/cantata/icons/podcasts.png
14	share/cantata/icons/soundcloud.png	15	share/cantata/icons/soundcloud.png
15	share/cantata/icons/stream.png	16	share/cantata/icons/stream.png
		17	share/cantata/icons/cantata/AUTHORS
		18	share/cantata/icons/cantata/LICENSE
		19	share/cantata/icons/cantata/index.theme
		20	share/cantata/icons/cantata/svg/audio-x-generic.svg
		21	share/cantata/icons/cantata/svg/cantata.svg
		22	share/cantata/icons/cantata/svg/dynamic-playlist.svg
		23	%%TAGLIB%%share/cantata/icons/cantata/svg/drive-removable-media-usb-pendrive.svg
		24	share/cantata/icons/cantata/svg/folder-downloads.svg
		25	share/cantata/icons/cantata/svg/folder-temp.svg
		26	share/cantata/icons/cantata/svg/fork.svg
		27	share/cantata/icons/cantata/svg/information.svg
		28	share/cantata/icons/cantata/svg/inode-directory.svg
		29	%%TAGLIB%%share/cantata/icons/cantata/svg/multimedia-player.svg
		30	share/cantata/icons/cantata/svg/network-server-database.svg
		31	share/cantata/icons/cantata/svg/playlist.svg
		32	share/cantata/icons/cantata/svg/preferences-desktop-keyboard.svg
		33	share/cantata/icons/cantata/svg/preferences-other.svg
		34	share/cantata/icons/cantata/svg/speaker.svg
		35	share/cantata/icons/cantata/svg64/dialog-error.svg
		36	share/cantata/icons/cantata/svg64/dialog-information.svg
		37	share/cantata/icons/cantata/svg64/dialog-question.svg
		38	share/cantata/icons/cantata/svg64/dialog-warning.svg
16	share/cantata/mpd/mpd.conf.template	39	share/cantata/mpd/mpd.conf.template
17	share/cantata/scripts/cantata-dynamic	40	share/cantata/scripts/cantata-dynamic
18	share/cantata/scripts/cantata-remote	41	share/cantata/scripts/cantata-remote
Lines 24-43 Link Here
24	share/cantata/themes/mint-x.css	47	share/cantata/themes/mint-x.css
25	share/cantata/themes/radiance-dt.css	48	share/cantata/themes/radiance-dt.css
26	share/cantata/themes/radiance.css	49	share/cantata/themes/radiance.css
27	share/cantata/translations/cantata_cs.qm	50	%%NLS%%share/cantata/translations/cantata_cs.qm
28	share/cantata/translations/cantata_de.qm	51	%%NLS%%share/cantata/translations/cantata_de.qm
29	share/cantata/translations/cantata_en_GB.qm	52	%%NLS%%share/cantata/translations/cantata_en_GB.qm
30	share/cantata/translations/cantata_es.qm	53	%%NLS%%share/cantata/translations/cantata_es.qm
31	share/cantata/translations/cantata_fr.qm	54	%%NLS%%share/cantata/translations/cantata_fr.qm
32	share/cantata/translations/cantata_hu.qm	55	%%NLS%%share/cantata/translations/cantata_hu.qm
33	share/cantata/translations/cantata_ko.qm	56	%%NLS%%share/cantata/translations/cantata_ko.qm
34	share/cantata/translations/cantata_pl.qm	57	%%NLS%%share/cantata/translations/cantata_pl.qm
35	share/cantata/translations/cantata_ru.qm	58	%%NLS%%share/cantata/translations/cantata_ru.qm
36	share/cantata/translations/cantata_zh_CN.qm	59	%%NLS%%share/cantata/translations/cantata_zh_CN.qm
37	share/icons/hicolor/16x16/apps/cantata.png
38	share/icons/hicolor/22x22/apps/cantata.png
39	share/icons/hicolor/24x24/apps/cantata.png
40	share/icons/hicolor/32x32/apps/cantata.png
41	share/icons/hicolor/48x48/apps/cantata.png
42	share/icons/hicolor/64x64/apps/cantata.png
43	share/icons/hicolor/scalable/apps/cantata.svg	60	share/icons/hicolor/scalable/apps/cantata.svg