--- Makefile (revision 467243) +++ Makefile (working copy) @@ -2,126 +2,113 @@ # $FreeBSD$ PORTNAME= mous -PORTVERSION= 1.1a -PORTREVISION= 6 +PORTVERSION= 2.0.1 +DISTVERSIONPREFIX= v CATEGORIES= audio -MASTER_SITES= GHC +MASTER_SITES= GH MAINTAINER= shen.elf@gmail.com COMMENT= Simple yet powerful audio player LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/COPYRIGHT +LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build: sdk/scx/Socket.hpp:188:5: invalid operands to binary expression +USES= cmake:outsource,noninja compiler:c++14-lang -USES= cmake USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= bsdelf +GH_TAGNAME= v2.0.1 -OPTIONS_DEFINE= ALSA ASSEMBLY FAAC FAAD FLAC LAME AO CUE MAC4DECODER \ - MACDECODER MPG123 NCURSES OSS QT4 SDK TAGLIB VORBIS \ - WAVDECODER WAVENCODER WMA -OPTIONS_DEFAULT= FAAC FAAD FLAC LAME CUE MAC4DECODER \ - MPG123 NCURSES OSS QT4 TAGLIB VORBIS WAVDECODER \ - WAVENCODER -OPTIONS_DEFAULT_amd64= ASSEMBLY WMA -OPTIONS_DEFAULT_i386= ASSEMBLY WMA +OPTIONS_GROUP= APPLICATION GENERIC_PLUGIN CODEC_PLUGIN +OPTIONS_GROUP_APPLICATION= CLI NCURSES QT5 +OPTIONS_GROUP_GENERIC_PLUGIN= LIBCUE TAGLIB +OPTIONS_GROUP_CODEC_PLUGIN= FDK_AAC FLAC LAME MAC \ + MPG123 VORBIS WAV WAVPACK -OPTIONS_SUB= yes +OPTIONS_RADIO= OUTPUT_PLUGIN +OPTIONS_RADIO_OUTPUT_PLUGIN= OSS SNDIO -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CMAKE_ON= -DWithPluginAlsaRenderer=1 -ALSA_CMAKE_OFF= -DWithPluginAlsaRenderer=0 +OPTIONS_DEFAULT= CLI NCURSES \ + LIBCUE TAGLIB \ + FDK_AAC FLAC LAME LIBCUE MAC \ + MPG123 VORBIS WAV WAVPACK \ + OSS -AO_LIB_DEPENDS= libao.so:audio/libao -AO_CMAKE_ON= -DWithPluginAoRenderer=1 -AO_CMAKE_OFF= -DWithPluginAoRenderer=0 +OPTIONS_SUB= yes -ASSEMBLY_DESC= Enable assembly optimizations -ASSEMBLY_BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:devel/yasm -ASSEMBLY_CMAKE_ON= -DWithAssembly=1 -ASSEMBLY_CMAKE_OFF= -DWithAssembly=0 +CMAKE_ARGS+= -DWITH_PLUGIN_ALSA=0 \ + -DWITH_PLUGIN_LIBAO=0 \ + -DWITH_PLUGIN_COREAUDIO=0 \ + -DWITH_PLUGIN_FAAC=0 \ + -DWITH_PLUGIN_FAAD=0 \ + -DWITH_PLUGIN_WMA=0 -CUE_LIB_DEPENDS= libcue.so:textproc/libcue -CUE_CMAKE_ON= -DWithPluginCuePack=1 -CUE_CMAKE_OFF= -DWithPluginCuePack=0 +CLI_DESC= Command line interface support +CLI_CMAKE_ON= -DWITH_APP_CLI=1 +CLI_CMAKE_OFF= -DWITH_APP_CLI=0 -FAAC_LIB_DEPENDS= libfaac.so:audio/faac -FAAC_CMAKE_ON= -DWithPluginFaacEncoder=1 -FAAC_CMAKE_OFF= -DWithPluginFaacEncoder=0 +NCURSES_USE= ncurses +NCURSES_CMAKE_ON= -DWITH_APP_NCURSES=1 +NCURSES_CMAKE_OFF= -DWITH_APP_NCURSES=0 -FAAD_LIB_DEPENDS= libfaad.so:audio/faad -FAAD_CMAKE_ON= -DWithPluginFaadDecoder=1 -FAAD_CMAKE_OFF= -DWithPluginFaadEncoder=0 +QT5_USE= qt5=core,gui,widgets,qmake_build +QT5_CMAKE_ON= -DWITH_APP_QT5=1 +QT5_CMAKE_OFF= -DWITH_APP_QT5=0 -FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CMAKE_ON= -DWithPluginFlacDecoder=1 -FLAC_CMAKE_OFF= -DWithPluginFlacDecoder=0 +TAGLIB_DESC= TagLib support +TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib +TAGLIB_CMAKE_ON= -DWITH_PLUGIN_TAGLIB=1 +TAGLIB_CMAKE_OFF= -DWITH_PLUGIN_TAGLIB=0 -LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -LAME_CMAKE_ON= -DWithPluginLameEncoder=1 -LAME_CMAKE_OFF= -DWithPluginLameEncoder=0 +OSS_CMAKE_ON= -DWITH_PLUGIN_OSS=1 +OSS_CMAKE_OFF= -DWITH_PLUGIN_OSS=0 -MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 -MPG123_CMAKE_ON= -DWithPluginMpg123Decoder=1 -MPG123_CMAKE_OFF= -DWithPluginMpg123Decoder=0 +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_CMAKE_ON= -DWITH_PLUGIN_SNDIO=1 +SNDIO_CMAKE_OFF= -DWITH_PLUGIN_SNDIO=0 -MAC4DECODER_DESC= Newest mac4.11 decoder (*.ape) -MAC4DECODER_CMAKE_ON= -DWithPluginMac4Decoder=1 -MAC4DECODER_CMAKE_OFF= -DWithPluginMac4Decoder=0 +LIBCUE_DESC= CUE sheet support +LIBCUE_LIB_DEPENDS= libcue.so:textproc/libcue +LIBCUE_CMAKE_ON= -DWITH_PLUGIN_LIBCUE=1 +LIBCUE_CMAKE_OFF= -DWITH_PLUGIN_LIBCUE=0 -MACDECODER_DESC= Old mac3.99 ape decoder (*.ape) -MACDECODER_LIB_DEPENDS= libmac.so:audio/mac -MACDECODER_CMAKE_ON= -DWithPluginMacDecoder=1 -MACDECODER_CMAKE_OFF= -DWithPluginMacDecoder=0 +FDK_AAC_DESC= FDK AAC codec support +FDK_AAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac \ + libmp4v2.so:multimedia/mp4v2 +FDK_AAC_CMAKE_ON= -DWITH_PLUGIN_FDK_AAC=1 +FDK_AAC_CMAKE_OFF= -DWITH_PLUGIN_FDK_AAC=0 -NCURSES_DESC= Ncurses frontend -NCURSES_USES= ncurses -NCURSES_CMAKE_ON= -DWithFrontendNcurses=1 -NCURSES_CMAKE_OFF= -DWithFrontendNcurses=0 +FLAC_LIB_DEPENDS= libFLAC.so:audio/flac +FLAC_CMAKE_ON= -DWITH_PLUGIN_FLAC=1 +FLAC_CMAKE_OFF= -DWITH_PLUGIN_FLAC=0 -OSS_CMAKE_ON= -DWithPluginOssRenderer=1 -OSS_CMAKE_OFF= -DWithPluginOssRenderer=0 +LAME_LIB_DEPENDS= libmp3lame.so:audio/lame +LAME_CMAKE_ON= -DWITH_PLUGIN_LAME=1 +LAME_CMAKE_OFF= -DWITH_PLUGIN_LAME=0 -QT4_DESC= QT4 frontend -QT4_USE= QT4=corelib,gui,linguisttools_build -QT4_USE+= QT4=qmake_build,moc_build,rcc_build,uic_build -QT4_CMAKE_ON= -DWithFrontendQt=1 -QT4_CMAKE_OFF= -DWithFrontendQt=0 +MAC_DESC= Monkey's Audio codec support +MAC_CMAKE_ON= -DWITH_PLUGIN_MAC=1 +MAC_CMAKE_OFF= -DWITH_PLUGIN_MAC=0 -SDK_DESC= Install SDK -SDK_CMAKE_ON= -DWithHeadFiles=1 -SDK_CMAKE_OFF= -DWithHeadFiles=0 +MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 +MPG123_CMAKE_ON= -DWITH_PLUGIN_MPG123=1 +MPG123_CMAKE_OFF= -DWITH_PLUGIN_MPG123=0 -TAGLIB_DESC= TagLib plugin (recommended) -TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib -TAGLIB_CMAKE_ON= -DWithPluginTagLibParser=1 -TAGLIB_CMAKE_OFF= -DWithPluginTagLibParser=0 +VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \ + libvorbis.so:audio/libvorbis\ + libvorbisenc.so:audio/libvorbis\ + libvorbisfile.so:audio/libvorbis +VORBIS_CMAKE_ON= -DWITH_PLUGIN_OGG_VORBIS=1 +VORBIS_CMAKE_OFF= -DWITH_PLUGIN_OGG_VORBIS=0 -VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis -VORBIS_CMAKE_ON= -DWithPluginOggDecoder=1 -VORBIS_CMAKE_OFF= -DWithPluginOggDecoder=0 +WAV_CMAKE_ON= -DWITH_PLUGIN_WAV=1 +WAV_CMAKE_OFF= -DWITH_PLUGIN_WAV=0 -WAVDECODER_DESC= Decode Wav -WAVDECODER_CMAKE_ON= -DWithPluginWavDecoder=1 -WAVDECODER_CMAKE_OFF= -DWithPluginWavEncoder=0 +WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack +WAVPACK_CMAKE_ON= -DWITH_PLUGIN_WAVPACK=1 +WAVPACK_CMAKE_OFF= -DWITH_PLUGIN_WAVPACK=0 -WAVENCODER_DESC= Encode Wav -WAVENCODER_CMAKE_ON= -DWithPluginWavEncoder=1 -WAVENCODER_CMAKE_OFF= -DWithPluginWavEncoder=0 +INSTALL_TARGET= install/strip -WMA_DESC= WMA decoder plugin -WMA_CMAKE_ON= -DWithPluginWmaDecoder=1 -WMA_CMAKE_OFF= -DWithPluginWmaDecoder=0 - -post-patch: - @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/CMakeLists.txt - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mous/* - .include --- distinfo (revision 467243) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (mous-1.1a.tar.gz) = 55826f30567a11d1c54af335b4290329b680c9e64ef9f46c0b7e3a4427414b56 -SIZE (mous-1.1a.tar.gz) = 677884 +SHA256 (bsdelf-mous-v2.0.1_GH0.tar.gz) = b8866049c225fab2033617908d3c3b353533bc20c274b1fa0d7c034ea1c15cef +SIZE (bsdelf-mous-v2.0.1_GH0.tar.gz) = 2735960 --- files/patch-CMakeLists.txt (revision 467243) +++ files/patch-CMakeLists.txt (nonexistent) @@ -1,20 +0,0 @@ ---- CMakeLists.txt.orig 2012-06-28 14:58:11 UTC -+++ CMakeLists.txt -@@ -306,7 +306,7 @@ if(WithFrontendQt) - RUNTIME DESTINATION bin) - install( - CODE "file(GLOB TRANSLATION_FILES \"${PROJECT_BINARY_DIR}/*.qm\")" -- CODE "file(INSTALL \${TRANSLATION_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mous/qt)" -+ CODE "file(INSTALL \${TRANSLATION_FILES} DESTINATION %%DATADIR%%/qt)" - ) - endif() - -@@ -321,7 +321,7 @@ install( - ) - - file(GLOB RESOURCE_FILES "${MOUS_SOURCE_DIR}/resource/*") --install(DIRECTORY ${RESOURCE_FILES} DESTINATION share/mous) -+install(DIRECTORY ${RESOURCE_FILES} DESTINATION %%DATADIR%%) - - #==== Messages ====# - message("CMake: " ${CMAKE_VERSION}) --- files/patch-contrib_ffmpeg-strip-wma_common.h (revision 467243) +++ files/patch-contrib_ffmpeg-strip-wma_common.h (nonexistent) @@ -1,14 +0,0 @@ ---- contrib/ffmpeg-strip-wma/common.h.orig 2012-06-28 14:58:11 UTC -+++ contrib/ffmpeg-strip-wma/common.h -@@ -1150,11 +1150,6 @@ if(256*256*256*64%(tcount+tskip_count)== - - #define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d) - --/* avoid usage of various functions */ --#define malloc please_use_av_malloc --#define free please_use_av_free --#define realloc please_use_av_realloc -- - #define CHECKED_ALLOCZ(p, size)\ - {\ - p= av_mallocz(size);\ --- files/patch-plugins_CuePack_CuePack.cpp (revision 467243) +++ files/patch-plugins_CuePack_CuePack.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- plugins/CuePack/CuePack.cpp.orig 2012-06-28 14:58:11 UTC -+++ plugins/CuePack/CuePack.cpp -@@ -55,7 +55,7 @@ void CuePack::DumpCue(const string& dir, - string genre; - int year = -1; - -- char* data = NULL; -+ const char* data = NULL; - Cdtext* cdt = cd_get_cdtext(cd); - Rem* rem = cd_get_rem(cd); - --- files/patch-plugins_CuePack_CuePack.h (revision 467243) +++ files/patch-plugins_CuePack_CuePack.h (nonexistent) @@ -1,11 +0,0 @@ ---- plugins/CuePack/CuePack.h.orig 2012-06-28 14:58:11 UTC -+++ plugins/CuePack/CuePack.h -@@ -1,7 +1,6 @@ - #include - extern "C" { --#include --#include -+#include - } - using namespace std; - using namespace mous; --- pkg-descr (revision 467243) +++ pkg-descr (working copy) @@ -1,3 +1,3 @@ Mous is a simpe yet powerful audio player. -WWW: https://github.com/0x02/mous +WWW: https://github.com/bsdelf/mous --- pkg-message (revision 467243) +++ pkg-message (working copy) @@ -1,6 +1,6 @@ ======================================================================== -For mous-ncurses frontend, you can check its usage +For mous-ncurses, you can check its usage with 'H' after starting. ======================================================================== --- pkg-plist (revision 467243) +++ pkg-plist (working copy) @@ -1,70 +1,18 @@ +lib/libMousCore.so +%%CLI%%bin/mous-cli %%NCURSES%%bin/mous-ncurses -%%QT4%%bin/mous-qt -%%SDK%%include/mous/charset/CharsetConvInf.h -%%SDK%%include/mous/charset/ICharsetConv.h -%%SDK%%include/mous/core/IConvTask.h -%%SDK%%include/mous/core/IConvTaskFactory.h -%%SDK%%include/mous/core/IMediaLoader.h -%%SDK%%include/mous/core/IPlayer.h -%%SDK%%include/mous/core/IPluginAgent.h -%%SDK%%include/mous/core/IPluginManager.h -%%SDK%%include/mous/core/ITagParserFactory.h -%%SDK%%include/mous/plugin/IDecoder.h -%%SDK%%include/mous/plugin/IEncoder.h -%%SDK%%include/mous/plugin/IEventWatcher.h -%%SDK%%include/mous/plugin/IFilter.h -%%SDK%%include/mous/plugin/IMediaPack.h -%%SDK%%include/mous/plugin/IRenderer.h -%%SDK%%include/mous/plugin/ITagParser.h -%%SDK%%include/mous/scx/BufObj.hpp -%%SDK%%include/mous/scx/CharsetHelper.hpp -%%SDK%%include/mous/scx/CondVar.hpp -%%SDK%%include/mous/scx/ConfigFile.hpp -%%SDK%%include/mous/scx/Conv.hpp -%%SDK%%include/mous/scx/Dir.hpp -%%SDK%%include/mous/scx/Env.hpp -%%SDK%%include/mous/scx/FileHelper.hpp -%%SDK%%include/mous/scx/FileInfo.hpp -%%SDK%%include/mous/scx/Function.hpp -%%SDK%%include/mous/scx/IconvHelper.hpp -%%SDK%%include/mous/scx/LPVBuffer.hpp -%%SDK%%include/mous/scx/Mutex.hpp -%%SDK%%include/mous/scx/PVBuffer.hpp -%%SDK%%include/mous/scx/RunTimer.hpp -%%SDK%%include/mous/scx/SemVar.hpp -%%SDK%%include/mous/scx/Signal.hpp -%%SDK%%include/mous/scx/Singleton.hpp -%%SDK%%include/mous/scx/Socket.hpp -%%SDK%%include/mous/scx/SoftSemVar.hpp -%%SDK%%include/mous/scx/TaskSchedule.hpp -%%SDK%%include/mous/scx/Thread.hpp -%%SDK%%include/mous/scx/UniPinYin.hpp -%%SDK%%include/mous/util/AudioMode.h -%%SDK%%include/mous/util/ErrorCode.h -%%SDK%%include/mous/util/MediaItem.h -%%SDK%%include/mous/util/MediaTag.h -%%SDK%%include/mous/util/Option.h -%%SDK%%include/mous/util/Playlist.h -%%SDK%%include/mous/util/PlaylistSerializer.h -%%SDK%%include/mous/util/PluginDef.h -%%SDK%%include/mous/util/PluginHelper.h -%%SDK%%include/mous/util/PluginOption.h -lib/libMousCore.so -%%ALSA%%lib/mous/libAlsaRenderer.so -%%AO%%lib/mous/libAoRenderer.so -%%CUE%%lib/mous/libCuePack.so -%%FAAC%%lib/mous/libFaacEncoder.so -%%FAAD%%lib/mous/libFaadDecoder.so +%%QT5%%bin/mous-qt +%%LIBCUE%%lib/mous/libCueParser.so +%%FDK_AAC%%lib/mous/libFdkDecoder.so %%FLAC%%lib/mous/libFlacDecoder.so %%LAME%%lib/mous/libLameEncoder.so -%%MAC4DECODER%%lib/mous/libMac4Decoder.so -%%MACDECODER%%lib/mous/libMacDecoder.so -%%VORBIS%%lib/mous/libOggDecoder.so +%%MAC%%lib/mous/libMacDecoder.so +%%VORBIS%%lib/mous/libVorbisDecoder.so +%%VORBIS%%lib/mous/libVorbisEncoder.so %%MPG123%%lib/mous/libMpg123Decoder.so %%OSS%%lib/mous/libOssRenderer.so +%%SNDIO%%lib/mous/libSndioOutput.so %%TAGLIB%%lib/mous/libTagLibParser.so -%%WAVDECODER%%lib/mous/libWavDecoder.so -%%WAVENCODER%%lib/mous/libWavEncoder.so -%%WMA%%lib/mous/libWmaDecoder.so -%%DATADIR%%/pinyin/unipy.map -%%QT4%%share/mous/qt/mous-qt_zh_CN.qm +%%WAV%%lib/mous/libWavDecoder.so +%%WAV%%lib/mous/libWavEncoder.so +%%WAVPACK%%lib/mous/libWvDecoder.so