Index: multimedia/qmmp/Makefile =================================================================== --- multimedia/qmmp/Makefile (revision 315766) +++ multimedia/qmmp/Makefile (working copy) @@ -1,12 +1,7 @@ -# New ports collection Makefile for: qmmp -# Date created: Fri Jan 30 01:13:20 JST 2009 -# Whom: SimaMoto,RyoTa -# # $FreeBSD$ -# PORTNAME= qmmp -PORTVERSION= 0.6.3 +PORTVERSION= 0.7.0 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ ${MASTER_SITE_GOOGLE_CODE} @@ -16,25 +11,30 @@ LICENSE= GPLv2 +USES= cmake:outsource USE_BZIP2= yes -USES= cmake:outsource USE_QT4= corelib gui network xml \ qmake_build rcc_build uic_build moc_build linguist_build USE_LDCONFIG= yes USE_PKGCONFIG= build -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 +OPTIONS_SINGLE= FFMPEG MPLAYER +OPTIONS_SINGLE_FFMPEG= FFMPEG1 FFMPEGDEVEL +OPTIONS_SINGLE_MPLAYER= MPLAYER1 MPLAYER2 +OPTIONS_DEFINE= ALSA ANALYZER APIDOC BS2B CDIO CONVERTER COPYPASTE \ + COVER CROSSFADE CUE CURL DIR_ASSOC DOCS ENCA FAAD \ + FFMPEG_LEGACY FFMPEG FILEOPS FLAC GME HAL HOTKEY JACK KDENOTIFY \ + LADSPA LYRICS MAD MMS MODPLUG MPLAYER MPRIS MUSEPACK \ + NOTIFIER NULLOUT OPUS OSS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG \ + SB SCROBBLER SKINNEDUI SNDFILE SRCONV STATICON STEREO \ + TRACKCHANGE UDISKS UDISKS2 VORBIS WAVPACK WILDMIDI +OPTIONS_DEFAULT= ALSA ANALYZER BS2B CDIO CONVERTER COPYPASTE COVER \ + CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD \ + FFMPEG FFMPEG1 FILEOPS FLAC GME HAL HOTKEY JACK KDENOTIFY \ + LADSPA LYRICS MAD MMS MODPLUG MPRIS MPLAYER MPLAYER1 MUSEPACK \ + NOTIFIER NULLOUT OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG \ + SB SCROBBLER SKINNEDUI SNDFILE SRCONV STATICON STEREO \ + TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI SKINNEDUI_DESC= Skinned GUI DIR_ASSOC_DESC= inode/directory mime type association APIDOC_DESC= Doxygen generated doc (libqmmp libqmmpui) @@ -42,27 +42,35 @@ 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 CROSSFADE_DESC= Support cross-fade 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 +COPYPASTE_DESC= Enable copy/paste track infos between playlists ENCA_DESC= Support automatic character set detection +OPUS_DESC= Enable reading opusfile tags 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 +TRACKCHANGE_DESC= Enable to run external command each track switching NOTIFIER_DESC= Support to popup notifier LYRICS_DESC= Support to show lyrics using lyrics.wikia.com HOTKEY_DESC= Support to set shortcut keys FILEOPS_DESC= Support file operation COVER_DESC= Support to show cover images KDENOTIFY_DESC= Support to popup notifier for KDE -UDISKS_DESC= Support removable disc detection using UDisks +UDISKS_DESC= Support removable disc detection (obsolete) +UDISKS2_DESC= Support removable disc detection using UDisks QMMP_DIALOG_DESC= An original dialog +FFMPEG_LEGACY_DESC= FFmpeg (ver0.6 - ver0.8) support +FFMPEG1_DESC= ffmpeg-1.x (multimedia/ffmpeg1) +FFMPEGDEVEL_DESC= ffmpeg-devel (multimedia/ffmpeg-devel) +MPLAYER1_DESC= mplayer-1.1.x (multimedia/mplayer) +MPLAYER2_DESC= mplayer-2.0.x (multimedia/mplayer2) .include @@ -150,13 +158,24 @@ PLUGIN_OPTIONS_CMAKE+= -DUSE_GME:BOOL=FALSE .endif +.if ${PORT_OPTIONS:MFFMPEG_LEGACY} +LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg +PLIST_SUB+= FFMPEG_LEGACY="" +PLUGIN_OPTIONS_CMAKE+= -DUSE_FFMPEG_LEGACY:BOOL=TRUE +.else +PLIST_SUB+= FFMPEG_LEGACY="@comment " +PLUGIN_OPTIONS_CMAKE+= -DUSE_FFMPEG_LEGACY:BOOL=FALSE +.endif + .if ${PORT_OPTIONS:MFFMPEG} +. if ${PORT_OPTIONS:MFFMPEGDEVEL} +LIB_DEPENDS+= avcodec-devel:${PORTSDIR}/multimedia/ffmpeg-devel +FFMPEG_SUFFIX= -devel +. else # ${PORT_OPTIONS:MFFMPEG1} +LIB_DEPENDS+= avcodec1:${PORTSDIR}/multimedia/ffmpeg1 +FFMPEG_SUFFIX= 1 +. endif PLIST_SUB+= FFMPEG="" -. if exists(${LOCALBASE}/include/libavcodec/vda.h) -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg-devel -. else -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg -. endif PLUGIN_OPTIONS_CMAKE+= -DUSE_FFMPEG:BOOL=TRUE .else PLIST_SUB+= FFMPEG="@comment " @@ -201,8 +220,12 @@ .endif .if ${PORT_OPTIONS:MMPLAYER} +. if ${PORT_OPTIONS:MMPLAYER2} +RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer2 +. else +RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer +. endif PLIST_SUB+= MPLAYER="" -RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer PLUGIN_OPTIONS_CMAKE+= -DUSE_MPLAYER:BOOL=TRUE .else PLIST_SUB+= MPLAYER="@comment " @@ -263,6 +286,15 @@ PLUGIN_OPTIONS_CMAKE+= -DUSE_MAD:BOOL=FALSE .endif +.if ${PORT_OPTIONS:MOPUS} +PLIST_SUB+= OPUS="" +LIB_DEPENDS+= opusfile:${PORTSDIR}/audio/opusfile +PLUGIN_OPTIONS_CMAKE+= -DUSE_OPUS:BOOL=TRUE +.else +PLIST_SUB+= OPUS="@comment " +PLUGIN_OPTIONS_CMAKE+= -DUSE_OPUS:BOOL=FALSE +.endif + .if ${PORT_OPTIONS:MSNDFILE} PLIST_SUB+= SNDFILE="" LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile @@ -364,6 +396,14 @@ PLUGIN_OPTIONS_CMAKE+= -DUSE_CONVERTER:BOOL=FALSE .endif +.if ${PORT_OPTIONS:MCOPYPASTE} +PLIST_SUB+= COPYPASTE="" +PLUGIN_OPTIONS_CMAKE+= -DUSE_COPYPASTE:BOOL=TRUE +.else +PLIST_SUB+= COPYPASTE="@comment " +PLUGIN_OPTIONS_CMAKE+= -DUSE_COPYPASTE:BOOL=FALSE +.endif + .if ${PORT_OPTIONS:MMPRIS} PLIST_SUB+= MPRIS="" PLUGIN_OPTIONS_CMAKE+= -DUSE_MPRIS:BOOL=TRUE @@ -452,6 +492,14 @@ PLUGIN_OPTIONS_CMAKE+= -DUSE_KDENOTIFY:BOOL=FALSE .endif +.if ${PORT_OPTIONS:MTRACKCHANGE} +PLIST_SUB+= TRACKCHANGE="" +PLUGIN_OPTIONS_CMAKE+= -DUSE_TRACKCHANGE:BOOL=TRUE +.else +PLIST_SUB+= TRACKCHANGE="@comment " +PLUGIN_OPTIONS_CMAKE+= -DUSE_TRACKCHANGE:BOOL=FALSE +.endif + .if ${PORT_OPTIONS:MUDISKS} PLIST_SUB+= UDISKS="" PLUGIN_OPTIONS_CMAKE+= -DUSE_UDISKS:BOOL=TRUE @@ -460,6 +508,14 @@ PLUGIN_OPTIONS_CMAKE+= -DUSE_UDISKS:BOOL=FALSE .endif +.if ${PORT_OPTIONS:MUDISKS2} +PLIST_SUB+= UDISKS2="" +PLUGIN_OPTIONS_CMAKE+= -DUSE_UDISKS2:BOOL=TRUE +.else +PLIST_SUB+= UDISKS2="@comment " +PLUGIN_OPTIONS_CMAKE+= -DUSE_UDISKS2:BOOL=FALSE +.endif + .if ${PORT_OPTIONS:MQMMP_DIALOG} PLIST_SUB+= QMMP_DIALOG="" PLUGIN_OPTIONS_CMAKE+= -DUSE_QMMP_DIALOG:BOOL=TRUE @@ -470,10 +526,12 @@ .if ${PORT_OPTIONS:MFAAD} || ${PORT_OPTIONS:MMAD} \ || ${PORT_OPTIONS:MMUSEPACK} || ${PORT_OPTIONS:MFLAC} \ - || ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MCONVERTER} + || ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MCONVERTER} \ + || ${PORT_OPTIONS:MOPUS} LIB_DEPENDS+= tag:${PORTSDIR}/audio/taglib .endif -.if ${PORT_OPTIONS:MKDENOTIFY} || ${PORT_OPTIONS:MUDISKS} \ +.if ${PORT_OPTIONS:MKDENOTIFY} \ + || ${PORT_OPTIONS:MUDISKS} || ${PORT_OPTIONS:MUDISKS2} \ || ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MMPRIS} USE_QT4+= dbus .endif @@ -483,20 +541,23 @@ PORTDOCS= README README.RUS AUTHORS INSTALLS_ICONS= yes -CMAKE_ARGS+= ${PLUGIN_OPTIONS_CMAKE} \ +CMAKE_ARGS+= ${PLUGIN_OPTIONS_CMAKE} -DUSE_RPATH:BOOL=TRUE \ -DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib post-patch: - ${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' \ + @${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' \ ${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt - ${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_DIR}|libdata|' \ + @${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 + ${REINPLACE_CMD} -E -e '/pkg_check_modules/ { \ + s/(libavcodec|libavformat|libavutil)[^ ]*>=/\1${FFMPEG_SUFFIX}>=/g; }' \ + ${WRKSRC}/src/plugins/Input/ffmpeg/CMakeLists.txt post-build: .if ${PORT_OPTIONS:MAPIDOC} @@ -504,7 +565,7 @@ .endif post-install: -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR}; \ cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${DOCSDIR} .endif Index: multimedia/qmmp/distinfo =================================================================== --- multimedia/qmmp/distinfo (revision 315766) +++ multimedia/qmmp/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (qmmp-0.6.3.tar.bz2) = 98f5b8121d475ead81c788ec9d5346c8da537e342c0d99eaff08586af4c92ca8 -SIZE (qmmp-0.6.3.tar.bz2) = 775285 +SHA256 (qmmp-0.7.0.tar.bz2) = 2f9a67821a711f925e27d7254eb3039d31019fe1a2aaa7a901be0d2f9066183d +SIZE (qmmp-0.7.0.tar.bz2) = 846257 Index: multimedia/qmmp/files/patch-SET_RPATH =================================================================== --- multimedia/qmmp/files/patch-SET_RPATH (revision 315766) +++ multimedia/qmmp/files/patch-SET_RPATH (working copy) @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2012-06-30 17:56:52.000000000 +0900 -+++ CMakeLists.txt 2012-06-30 19:52:52.000000000 +0900 -@@ -7,6 +7,8 @@ - link_directories(/usr/local/lib64) - SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include) - -+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ - #extract version from qmmp.h - FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h" - QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$") Index: multimedia/qmmp/pkg-descr =================================================================== --- multimedia/qmmp/pkg-descr (revision 315766) +++ multimedia/qmmp/pkg-descr (working copy) @@ -2,9 +2,9 @@ Supported formats: MPEG1 layer 2/3, Ogg Vorbis, Native FLAC, Ogg FLAC, Musepack, WavePack, tracker modules (mod, s3m, it, xm, etc.), ADTS AAC, CD Audio, MIDI, - WMA-Monkey's Audio (and other formats provided by FFmpeg library), PCM - Wave (and other formats provided by libsndfile library), and Chiptune - formats (AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ, VTX) + Opus tags, WMA-Monkey's Audio (and other formats via FFmpeg), + PCM Wave (and other formats via libsndfile), and Chiptune formats + (AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ, VTX) DSP effects: Bauer Stereophonic-to-Binaural effect, sample rate conversion, LADSPA effects, extra stereo effect, and crossfade effect Index: multimedia/qmmp/pkg-plist =================================================================== --- multimedia/qmmp/pkg-plist (revision 315766) +++ multimedia/qmmp/pkg-plist (working copy) @@ -17,7 +17,6 @@ include/qmmp/outputfactory.h include/qmmp/qmmp.h include/qmmp/qmmpsettings.h -include/qmmp/recycler.h include/qmmp/soundcore.h include/qmmp/statehandler.h include/qmmp/tagmodel.h @@ -34,6 +33,7 @@ include/qmmpui/generalfactory.h include/qmmpui/mediaplayer.h include/qmmpui/metadataformatter.h +include/qmmpui/playlistdownloader.h include/qmmpui/playlistformat.h include/qmmpui/playlistitem.h include/qmmpui/playlistmanager.h @@ -62,6 +62,7 @@ %%MPLAYER%%lib/qmmp/Engines/libmplayer.so %%QMMP_DIALOG%%lib/qmmp/FileDialogs/libqmmpfiledialog.so %%CONVERTER%%lib/qmmp/General/libconverter.so +%%COPYPASTE%%lib/qmmp/General/libcopypaste.so %%COVER%%lib/qmmp/General/libcovermanager.so %%FILEOPS%%lib/qmmp/General/libfileops.so %%HAL%%lib/qmmp/General/libhal.so @@ -73,16 +74,20 @@ %%SCROBBLER%%lib/qmmp/General/libscrobbler.so %%STATICON%%lib/qmmp/General/libstatusicon.so %%SB%%lib/qmmp/General/libstreambrowser.so +%%TRACKCHANGE%%lib/qmmp/General/libtrackchange.so %%UDISKS%%lib/qmmp/General/libudisks.so +%%UDISKS2%%lib/qmmp/General/libudisks2.so %%FAAD%%lib/qmmp/Input/libaac.so %%CDIO%%lib/qmmp/Input/libcdaudio.so %%CUE%%lib/qmmp/Input/libcue.so %%FFMPEG%%lib/qmmp/Input/libffmpeg.so +%%FFMPEG_LEGACY%%lib/qmmp/Input/libffmpeg_legacy.so %%FLAC%%lib/qmmp/Input/libflac.so %%MAD%%lib/qmmp/Input/libmad.so %%MODPLUG%%lib/qmmp/Input/libmodplug.so %%GME%%lib/qmmp/Input/libgme.so %%MUSEPACK%%lib/qmmp/Input/libmpc.so +%%OPUS%%lib/qmmp/Input/libopus.so %%SNDFILE%%lib/qmmp/Input/libsndfile.so %%VORBIS%%lib/qmmp/Input/libvorbis.so %%WAVPACK%%lib/qmmp/Input/libwavpack.so @@ -93,9 +98,9 @@ %%OSS%%lib/qmmp/Output/liboss.so %%OSS4%%lib/qmmp/Output/liboss4.so %%PULSE_AUDIO%%lib/qmmp/Output/libpulseaudio.so -lib/qmmp/PlaylistFormats/libm3uplaylistformat.so -lib/qmmp/PlaylistFormats/libplsplaylistformat.so -lib/qmmp/PlaylistFormats/libxspfplaylistformat.so +lib/qmmp/PlayListFormats/libm3uplaylistformat.so +lib/qmmp/PlayListFormats/libplsplaylistformat.so +lib/qmmp/PlayListFormats/libxspfplaylistformat.so %%CURL%%lib/qmmp/Transports/libhttp.so %%MMS%%lib/qmmp/Transports/libmms.so %%SKINNEDUI%%lib/qmmp/Ui/libskinned.so @@ -134,7 +139,7 @@ @dirrmtry lib/qmmp/General @dirrmtry lib/qmmp/Input @dirrmtry lib/qmmp/Output -@dirrmtry lib/qmmp/PlaylistFormats +@dirrmtry lib/qmmp/PlayListFormats @dirrmtry lib/qmmp/Transports @dirrmtry lib/qmmp/Ui @dirrmtry lib/qmmp/Visual Index: multimedia/qmmp-plugin-pack/Makefile =================================================================== --- multimedia/qmmp-plugin-pack/Makefile (revision 315766) +++ multimedia/qmmp-plugin-pack/Makefile (working copy) @@ -1,12 +1,7 @@ -# New ports collection Makefile for: qmmp-plugin-pack -# Date created: Fri Jul 01 02:59:13 JST 2012 -# Whom: SimaMoto,RyoTa -# # $FreeBSD$ -# PORTNAME= qmmp-plugin-pack -PORTVERSION= 0.6.2 +PORTVERSION= 0.7.0 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/plugins/ \ http://qmmp.googlecode.com/files/ @@ -17,7 +12,7 @@ LICENSE= GPLv2 LIB_DEPENDS= qmmpui:${PORTSDIR}/multimedia/qmmp -BUILD_DEPENDS= qmmp>=0.6.0:${PORTSDIR}/multimedia/qmmp +BUILD_DEPENDS= qmmp>=0.7.0:${PORTSDIR}/multimedia/qmmp USE_BZIP2= yes USES= cmake:outsource Index: multimedia/qmmp-plugin-pack/distinfo =================================================================== --- multimedia/qmmp-plugin-pack/distinfo (revision 315766) +++ multimedia/qmmp-plugin-pack/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (qmmp-plugin-pack-0.6.2.tar.bz2) = 8f241b94a3671a27d1d1f5d4695469760a52dcaafdc5e97f069b932ccb2ed41c -SIZE (qmmp-plugin-pack-0.6.2.tar.bz2) = 121619 +SHA256 (qmmp-plugin-pack-0.7.0.tar.bz2) = a86955c1448af8ce6ccb6b131f29b49dc77b4decb6a7ac310f8a5a73073c2ba6 +SIZE (qmmp-plugin-pack-0.7.0.tar.bz2) = 134229