1 files changed, 59 insertions, 22 deletions

diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 8cbecca1323a..283f9c6648d1 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmmp
-PORTVERSION=	0.5.6
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 		${MASTER_SITE_GOOGLE_CODE}
@@ -18,39 +18,42 @@ LICENSE=	GPLv2
 
 USE_BZIP2=	yes
 USE_CMAKE=	yes
-USE_QT4=	corelib gui network xml dbus \
+USE_QT4=	corelib gui network xml \
 		qmake_build rcc_build uic_build moc_build linguist_build
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	SKINNEDUI APIDOC PULSEAUDIO ALSA OSS OSS4 JACK NULLOUT \
-		FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD VORBIS SNDFILE \
-		WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B STEREO SRCONV \
-		MPLAYER CURL MMS PROJECTM ANALYZER ENCA MPRIS SCROBBLER \
-		STATICON NOTIFIER LYRICS HOTKEY FILEOPS COVER KDENOTIFY HAL \
-		UDISKS QMMP_DIALOG
-OPTIONS_DEFAULT=	SKINNEDUI PULSEAUDIO ALSA OSS4 JACK NULLOUT FLAC \
-		MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD VORBIS SNDFILE \
-		WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B STEREO SRCONV \
-		MPLAYER CURL MMS PROJECTM ANALYZER ENCA MPRIS SCROBBLER \
-		STATICON NOTIFIER LYRICS HOTKEY FILEOPS COVER KDENOTIFY HAL \
-		UDISKS QMMP_DIALOG
+OPTIONS_DEFINE=	SKINNEDUI DIR_ASSOC APIDOC PULSEAUDIO ALSA OSS OSS4 \
+		JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \
+		VORBIS SNDFILE WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B \
+		STEREO SRCONV MPLAYER CURL MMS PROJECTM ANALYZER ENCA \
+		CONVERTER MPRIS SCROBBLER STATICON SB NOTIFIER LYRICS HOTKEY \
+		FILEOPS COVER KDENOTIFY HAL UDISKS QMMP_DIALOG
+OPTIONS_DEFAULT=	SKINNEDUI DIR_ASSOC PULSEAUDIO ALSA OSS4 \
+		JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \
+		VORBIS SNDFILE WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B \
+		STEREO SRCONV MPLAYER CURL MMS PROJECTM ANALYZER ENCA \
+		CONVERTER MPRIS SCROBBLER STATICON SB NOTIFIER LYRICS HOTKEY \
+		FILEOPS COVER KDENOTIFY HAL UDISKS QMMP_DIALOG
 SKINNEDUI_DESC=	Skinned GUI
+DIR_ASSOC_DESC=	inode/directory mime type association
 APIDOC_DESC=	Doxygen generated doc (libqmmp libqmmpui)
-OSS4_DESC=	Enable Open Sound System (ver4) support
+OSS4_DESC=		Open Sound System (ver4) support
 NULLOUT_DESC=	Support a null output
 WILDMIDI_DESC=	Support to playback MIDI files
-GME_DESC=	Support video game music files
-CDIO_DESC=	Support to playback compact discs
+GME_DESC=		Support video game music files
+CDIO_DESC=		Support to playback compact discs
 CROSSFADE_DESC=	Support cross-fade effect
-BS2B_DESC=	Support the Bauer stereophonic2binaural effect
+BS2B_DESC=		Support the Bauer stereophonic2binaural effect
 STEREO_DESC=	Support stereo effect
 SRCONV_DESC=	Support the sample rate converter
 PROJECTM_DESC=	Support the projectM music visualiser
 ANALYZER_DESC=	Supoort spectrum analyzer visualization
-ENCA_DESC=	Support automatic character set detection
+ENCA_DESC=		Support automatic character set detection
+CONVERTER_DESC=	Support file type converter
 MPRIS_DESC=	Support the Media Player Remote
 SCROBBLER_DESC=	Support Libre.fm/Last.fm scrobbler feature
 STATICON_DESC=	Support to show status icon
+SB_DESC=	Browser for IceCast stream directory
 NOTIFIER_DESC=	Support to popup notifier
 LYRICS_DESC=	Support to show lyrics using lyrics.wikia.com
 HOTKEY_DESC=	Support to set shortcut keys
@@ -74,6 +77,14 @@ PLIST_SUB+=	SKINNEDUI="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_SKINNED:BOOL=FALSE
 .endif
 
+.if ${PORT_OPTIONS:MDIR_ASSOC}
+PLIST_SUB+=	DIR_ASSOC=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_DIR_ASSOC:BOOL=TRUE
+.else
+PLIST_SUB+=	DIR_ASSOC="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_DIR_ASSOC:BOOL=FALSE
+.endif
+
 .if ${PORT_OPTIONS:MJACK}
 PLIST_SUB+=	JACK=""
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
@@ -178,7 +189,8 @@ PLIST_SUB+=	CDIO="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_CDA:BOOL=FALSE
 .endif
 
-.if ${PORT_OPTIONS:MENCA}
+.if ${PORT_OPTIONS:MENCA} || \
+	(exists(${LOCALBASE}/include/enca.h) && ${PORT_OPTIONS:MCUE})
 PLIST_SUB+=	ENCA=""
 LIB_DEPENDS+=	enca:${PORTSDIR}/converters/enca
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_ENCA:BOOL=TRUE
@@ -199,6 +211,7 @@ PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPLAYER:BOOL=FALSE
 .if ${PORT_OPTIONS:MPROJECTM}
 PLIST_SUB+=	PROJECTM=""
 LIB_DEPENDS+=	projectM.2:${PORTSDIR}/graphics/libprojectm
+USE_QT4+=	opengl
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_PROJECTM:BOOL=TRUE
 .else
 PLIST_SUB+=	PROJECTM="@comment "
@@ -342,6 +355,14 @@ PLIST_SUB+=	ANALYZER="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_ANALYZER:BOOL=FALSE
 .endif
 
+.if ${PORT_OPTIONS:MCONVERTER}
+PLIST_SUB+=	CONVERTER=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CONVERTER:BOOL=TRUE
+.else
+PLIST_SUB+=	CONVERTER="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CONVERTER:BOOL=FALSE
+.endif
+
 .if ${PORT_OPTIONS:MMPRIS}
 PLIST_SUB+=	MPRIS=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPRIS:BOOL=TRUE
@@ -366,6 +387,14 @@ PLIST_SUB+=	STATICON="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_STATICON:BOOL=FALSE
 .endif
 
+.if ${PORT_OPTIONS:MSB}
+PLIST_SUB+=	SB=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SB:BOOL=TRUE
+.else
+PLIST_SUB+=	SB="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SB:BOOL=FALSE
+.endif
+
 .if ${PORT_OPTIONS:MNOTIFIER}
 PLIST_SUB+=	NOTIFIER=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_NOTIFIER:BOOL=TRUE
@@ -440,9 +469,13 @@ PLUGIN_OPTIONS_CMAKE+=	-DUSE_QMMP_DIALOG:BOOL=FALSE
 
 .if ${PORT_OPTIONS:MFAAD} || ${PORT_OPTIONS:MMAD} \
 	|| ${PORT_OPTIONS:MMUSEPACK} || ${PORT_OPTIONS:MFLAC} \
-	|| ${PORT_OPTIONS:MVORBIS}
+	|| ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MCONVERTER}
 LIB_DEPENDS+=	tag:${PORTSDIR}/audio/taglib
 .endif
+.if ${PORT_OPTIONS:MKDENOTIFY} || ${PORT_OPTIONS:MUDISKS} \
+	|| ${PORT_OPTIONS:MHAL}  || ${PORT_OPTIONS:MMPRIS}
+USE_QT4+=	dbus
+.endif
 
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
 
@@ -458,6 +491,9 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt
+	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_DIR}|libdata|' \
+		${WRKSRC}/src/qmmp/CMakeLists.txt \
+		${WRKSRC}/src/qmmpui/CMakeLists.txt
 
 pre-configure:
 	${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
@@ -474,7 +510,8 @@ post-install:
 .endif
 .if ${PORT_OPTIONS:MAPIDOC}
 	${MKDIR} ${DOCSDIR}/html/search ; \
-	cd ${WRKSRC}/doc/html && ${INSTALL_MAN} *.html *.png *.css ${DOCSDIR}/html ; \
+	cd ${WRKSRC}/doc/html && \
+		${INSTALL_MAN} *.html *.png *.css ${DOCSDIR}/html ; \
 	cd ${WRKSRC}/doc/html/search && \
 		${INSTALL_MAN} *.html *.png *.css *.js ${DOCSDIR}/html/search ; \
 	${RM} -f ${WRKDIR}/PLIST.doc ; \