Index: head/audio/mous/Makefile =================================================================== --- head/audio/mous/Makefile (revision 394642) +++ head/audio/mous/Makefile (revision 394643) @@ -1,121 +1,123 @@ # Created by: Yanhui Shen # $FreeBSD$ PORTNAME= mous PORTVERSION= 1.1a -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://cloud.github.com/downloads/bsdelf/mous/ MAINTAINER= shen.elf@gmail.com COMMENT= Simple yet powerful audio player LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= cmake +USE_LDCONFIG= yes 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 WMA OPTIONS_DEFAULT_amd64= ASSEMBLY OPTIONS_DEFAULT_i386= ASSEMBLY OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CMAKE_ON= -DWithPluginAlsaRenderer=1 ALSA_CMAKE_OFF= -DWithPluginAlsaRenderer=0 AO_LIB_DEPENDS= libao.so:${PORTSDIR}/audio/libao AO_CMAKE_ON= -DWithPluginAoRenderer=1 AO_CMAKE_OFF= -DWithPluginAoRenderer=0 ASSEMBLY_DESC= Enable assembly optimizations ASSEMBLY_BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm ASSEMBLY_CMAKE_ON= -DWithAssembly=1 ASSEMBLY_CMAKE_OFF= -DWithAssembly=0 CUE_LIB_DEPENDS= libcue.so:${PORTSDIR}/textproc/libcue CUE_CMAKE_ON= -DWithPluginCuePack=1 CUE_CMAKE_OFF= -DWithPluginCuePack=0 FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CMAKE_ON= -DWithPluginFaacEncoder=1 FAAC_CMAKE_OFF= -DWithPluginFaacEncoder=0 FAAD_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad FAAD_CMAKE_ON= -DWithPluginFaadDecoder=1 FAAD_CMAKE_OFF= -DWithPluginFaadEncoder=0 FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CMAKE_ON= -DWithPluginFlacDecoder=1 FLAC_CMAKE_OFF= -DWithPluginFlacDecoder=0 LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CMAKE_ON= -DWithPluginLameEncoder=1 LAME_CMAKE_OFF= -DWithPluginLameEncoder=0 MPG123_LIB_DEPENDS= libmpg123.so:${PORTSDIR}/audio/mpg123 MPG123_CMAKE_ON= -DWithPluginMpg123Decoder=1 MPG123_CMAKE_OFF= -DWithPluginMpg123Decoder=0 MAC4DECODER_DESC= Newest mac4.11 decoder (*.ape) MAC4DECODER_CMAKE_ON= -DWithPluginMac4Decoder=1 MAC4DECODER_CMAKE_OFF= -DWithPluginMac4Decoder=0 MACDECODER_DESC= Old mac3.99 ape decoder (*.ape) MACDECODER_LIB_DEPENDS= libmac.so:${PORTSDIR}/audio/mac MACDECODER_CMAKE_ON= -DWithPluginMacDecoder=1 MACDECODER_CMAKE_OFF= -DWithPluginMacDecoder=0 NCURSES_DESC= Ncurses frontend NCURSES_USES= ncurses NCURSES_CMAKE_ON= -DWithFrontendNcurses=1 NCURSES_CMAKE_OFF= -DWithFrontendNcurses=0 OSS_CMAKE_ON= -DWithPluginOssRenderer=1 OSS_CMAKE_OFF= -DWithPluginOssRenderer=0 QT4_DESC= QT4 frontend -QT4_USE= QT4=gui,linguist,moc_build,qmake_build,rcc_build,uic_build +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 SDK_DESC= Install SDK SDK_CMAKE_ON= -DWithHeadFiles=1 SDK_CMAKE_OFF= -DWithHeadFiles=0 TAGLIB_DESC= TagLib plugin (recommended) TAGLIB_LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib TAGLIB_CMAKE_ON= -DWithPluginTagLibParser=1 TAGLIB_CMAKE_OFF= -DWithPluginTagLibParser=0 VORBIS_LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis VORBIS_CMAKE_ON= -DWithPluginOggDecoder=1 VORBIS_CMAKE_OFF= -DWithPluginOggDecoder=0 WAVDECODER_DESC= Decode Wav WAVDECODER_CMAKE_ON= -DWithPluginWavDecoder=1 WAVDECODER_CMAKE_OFF= -DWithPluginWavEncoder=0 WAVENCODER_DESC= Encode Wav WAVENCODER_CMAKE_ON= -DWithPluginWavEncoder=1 WAVENCODER_CMAKE_OFF= -DWithPluginWavEncoder=0 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 Index: head/audio/mous/files/patch-CMakeLists.txt =================================================================== --- head/audio/mous/files/patch-CMakeLists.txt (revision 394642) +++ head/audio/mous/files/patch-CMakeLists.txt (revision 394643) @@ -1,20 +1,20 @@ ---- CMakeLists.txt.orig 2012-06-15 04:46:40.000000000 +0200 -+++ CMakeLists.txt 2012-07-18 17:04:03.462575000 +0200 -@@ -292,7 +292,7 @@ +--- 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() -@@ -307,7 +307,7 @@ +@@ -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}) Index: head/audio/mous/files/patch-contrib__ffmpeg-strip-wma__common.h =================================================================== --- head/audio/mous/files/patch-contrib__ffmpeg-strip-wma__common.h (revision 394642) +++ head/audio/mous/files/patch-contrib__ffmpeg-strip-wma__common.h (revision 394643) @@ -1,14 +1,14 @@ ---- ./contrib/ffmpeg-strip-wma/common.h.orig 2014-07-02 10:52:02.000000000 -0400 -+++ ./contrib/ffmpeg-strip-wma/common.h 2014-07-02 10:52:39.000000000 -0400 -@@ -1150,11 +1150,6 @@ +--- 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);\