Date: Sat, 25 Mar 2017 09:59:05 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436890 - in head/multimedia: qmmp qmmp-qt5 Message-ID: <201703250959.v2P9x5vo014762@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Sat Mar 25 09:59:04 2017 New Revision: 436890 URL: https://svnweb.freebsd.org/changeset/ports/436890 Log: multimedia/qmmp[-qt5]: remove expired optional dependency on multimedia/mplayer2 Modified: head/multimedia/qmmp-qt5/Makefile head/multimedia/qmmp/Makefile Modified: head/multimedia/qmmp-qt5/Makefile ============================================================================== --- head/multimedia/qmmp-qt5/Makefile Sat Mar 25 09:02:01 2017 (r436889) +++ head/multimedia/qmmp-qt5/Makefile Sat Mar 25 09:59:04 2017 (r436890) @@ -55,7 +55,7 @@ PLUGIN_NETWORKING_DESC= Features via the OPTIONS_GROUP_PLUGIN_NETWORKING= COVER CURL LYRICS MMS SB SCROBBLER MISC_DESC= Other features -OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER1 MPLAYER2 MPRIS RGSCAN SID +OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER1 MPRIS RGSCAN SID OPTIONS_DEFAULT= ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \ CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \ @@ -129,11 +129,7 @@ ENCA_LIB_DEPENDS= libenca.so:converters/ ENCA_CMAKE_BOOL= USE_ENCA MPLAYER1_DESC= mplayer-1.x (multimedia/mplayer) -MPLAYER2_DESC= mplayer-2.x (multimedia/mplayer2) MPLAYER1_RUN_DEPENDS= mplayer:multimedia/mplayer -MPLAYER2_RUN_DEPENDS= mplayer:multimedia/mplayer2 -MPLAYER1_PREVENTS= MPLAYER2 -MPLAYER2_PREVENTS= MPLAYER1 PROJECTM_DESC= Support the projectM music visualiser PROJECTM_LIB_DEPENDS= libprojectM.so.2:graphics/libprojectm @@ -267,7 +263,7 @@ TWOPANELDIALOG_CMAKE_BOOL= USE_TWO_PANEL .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MMPLAYER1} || ${PORT_OPTIONS:MMPLAYER2} +.if ${PORT_OPTIONS:MMPLAYER1} CMAKE_ARGS+= -DUSE_MPLAYER:BOOL=TRUE PLIST_SUB+= MPLAYER="" .else Modified: head/multimedia/qmmp/Makefile ============================================================================== --- head/multimedia/qmmp/Makefile Sat Mar 25 09:02:01 2017 (r436889) +++ head/multimedia/qmmp/Makefile Sat Mar 25 09:59:04 2017 (r436890) @@ -54,7 +54,7 @@ PLUGIN_NETWORKING_DESC= Features via the OPTIONS_GROUP_PLUGIN_NETWORKING= COVER CURL LYRICS MMS SB SCROBBLER MISC_DESC= Other features -OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER1 MPLAYER2 MPRIS RGSCAN SID +OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER1 MPRIS RGSCAN SID OPTIONS_DEFAULT= ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \ CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \ @@ -129,11 +129,7 @@ ENCA_LIB_DEPENDS= libenca.so:converters/ ENCA_CMAKE_BOOL= USE_ENCA MPLAYER1_DESC= mplayer-1.x (multimedia/mplayer) -MPLAYER2_DESC= mplayer-2.x (multimedia/mplayer2) MPLAYER1_RUN_DEPENDS= mplayer:multimedia/mplayer -MPLAYER2_RUN_DEPENDS= mplayer:multimedia/mplayer2 -MPLAYER1_PREVENTS= MPLAYER2 -MPLAYER2_PREVENTS= MPLAYER1 PROJECTM_DESC= Support the projectM music visualiser PROJECTM_LIB_DEPENDS= libprojectM.so.2:graphics/libprojectm @@ -270,7 +266,7 @@ TWOPANELDIALOG_CMAKE_BOOL= USE_TWO_PANEL .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MMPLAYER1} || ${PORT_OPTIONS:MMPLAYER2} +.if ${PORT_OPTIONS:MMPLAYER1} CMAKE_ARGS+= -DUSE_MPLAYER:BOOL=TRUE PLIST_SUB+= MPLAYER="" .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703250959.v2P9x5vo014762>