Date: Sun, 1 Jul 2012 12:28:24 GMT From: RyoTa SimaMoto <liangtai.s4@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/169574: update multimedia/qmmp; add port multimedia/qmmp-plugin-pack Message-ID: <201207011228.q61CSO15057179@red.freebsd.org> Resent-Message-ID: <201207011230.q61CUAOM012126@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169574 >Category: ports >Synopsis: update multimedia/qmmp; add port multimedia/qmmp-plugin-pack >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jul 01 12:30:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: RyoTa SimaMoto >Release: 9.0-STABLE >Organization: >Environment: FreeBSD takiba.fakenet 9.0-STABLE FreeBSD 9.0-STABLE #11 r235800: Fri May 25 02:09:21 JST 2012 liangtai@takiba.fakenet:/usr/obj/usr/src/sys/VAIO i386 >Description: New release: multimedia/qmmp version 0.6.0 Add port: multimedia/qmmp-plugin-pack version 0.6.0 >How-To-Repeat: >Fix: Patch attached with submission follows: ? files/patch-SET_RPATH Index: Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/qmmp/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 24 Jun 2012 10:04:33 -0000 1.11 +++ Makefile 1 Jul 2012 11:58:17 -0000 @@ -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 @@ 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 @@ 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 @@ 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 @@ .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 @@ 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 @@ 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 @@ .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 @@ 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 @@ .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 ; \ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/multimedia/qmmp/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 24 Jun 2012 10:04:33 -0000 1.5 +++ distinfo 1 Jul 2012 11:58:17 -0000 @@ -1,2 +1,2 @@ -SHA256 (qmmp-0.5.6.tar.bz2) = 3ca6b1ebe0c985a153bc82db757de3032d3593fe9eb73397c51cf0954b66a889 -SIZE (qmmp-0.5.6.tar.bz2) = 708987 +SHA256 (qmmp-0.6.0.tar.bz2) = 4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe +SIZE (qmmp-0.6.0.tar.bz2) = 772882 Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/multimedia/qmmp/pkg-descr,v retrieving revision 1.3 diff -u -r1.3 pkg-descr --- pkg-descr 1 Mar 2012 21:27:36 -0000 1.3 +++ pkg-descr 1 Jul 2012 11:58:18 -0000 @@ -13,11 +13,11 @@ Output system support: PulseAudio, OSS, OSS4, jack, and ALSA Other features: - 10-band equalizer, Last.fm/Libre.fm scrobbler, global hotkey, MPRIS, - streaming (MP3, Vorbis, AAC, AAC+ via IceCast/ShoutCast), CDDB support, - removable device detection (via HAL or UDisks), cover art support, - multiple playlists, ReplayGain support, CUE sheet support, MMS support, - embedded CUE support (for FLAC and WavPack), MPRIS (1.0 and 2.0), + multi-band equalizer, Last.fm/Libre.fm scrobbler, global hotkey, + streaming (MP3, Vorbis, AAC, AAC+ via IceCast/ShoutCast) and browser, + CDDB, removable device detection (via HAL or UDisks), cover art, + multiple playlists, MMS, file type determination and converter, MPRIS, + CUE sheet, embedded CUE (for FLAC and WavPack), ReplayGain, automatic charset detection for cue files and ShoutCast metadata, video playback via Mplayer, lyrics (using lyrics.wikia.com), and skinned UI (supports all skins for XMMS and Winamp 2.x) Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/multimedia/qmmp/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 24 Jun 2012 10:04:33 -0000 1.5 +++ pkg-plist 1 Jul 2012 11:58:18 -0000 @@ -1,4 +1,4 @@ -%%SKINNEDUI%%bin/qmmp +bin/qmmp include/qmmp/abstractengine.h include/qmmp/audioparameters.h include/qmmp/buffer.h @@ -23,15 +23,15 @@ include/qmmp/tagmodel.h include/qmmp/visual.h include/qmmp/visualfactory.h -include/qmmp/volumecontrol.h +include/qmmp/volume.h include/qmmpui/commandlinemanager.h include/qmmpui/commandlineoption.h +include/qmmpui/configdialog.h include/qmmpui/detailsdialog.h include/qmmpui/filedialog.h include/qmmpui/filedialogfactory.h include/qmmpui/general.h include/qmmpui/generalfactory.h -include/qmmpui/generalhandler.h include/qmmpui/mediaplayer.h include/qmmpui/metadataformatter.h include/qmmpui/playlistformat.h @@ -39,7 +39,11 @@ include/qmmpui/playlistmanager.h include/qmmpui/playlistmodel.h include/qmmpui/playlistparser.h +include/qmmpui/qmmpuisettings.h include/qmmpui/templateeditor.h +include/qmmpui/uifactory.h +include/qmmpui/uihelper.h +include/qmmpui/uiloader.h lib/libqmmp.so lib/libqmmp.so.0 lib/libqmmp.so.%%SHLIB_VER%% @@ -47,6 +51,7 @@ lib/libqmmpui.so.0 lib/libqmmpui.so.%%SHLIB_VER%% lib/qmmp/CommandLineOptions/libincdecvolumeoption.so +lib/qmmp/CommandLineOptions/libplaylistoption.so lib/qmmp/CommandLineOptions/libseekoption.so lib/qmmp/CommandLineOptions/libstatusoption.so %%LADSPA%%lib/qmmp/Effect/libladspa.so @@ -54,7 +59,9 @@ %%SRCONV%%lib/qmmp/Effect/libsrconverter.so %%STEREO%%lib/qmmp/Effect/libstereo.so %%CROSSFADE%%lib/qmmp/Effect/libcrossfade.so +%%MPLAYER%%lib/qmmp/Engines/libmplayer.so %%QMMP_DIALOG%%lib/qmmp/FileDialogs/libqmmpfiledialog.so +%%CONVERTER%%lib/qmmp/General/libconverter.so %%COVER%%lib/qmmp/General/libcovermanager.so %%FILEOPS%%lib/qmmp/General/libfileops.so %%HAL%%lib/qmmp/General/libhal.so @@ -65,6 +72,7 @@ %%NOTIFIER%%lib/qmmp/General/libnotifier.so %%SCROBBLER%%lib/qmmp/General/libscrobbler.so %%STATICON%%lib/qmmp/General/libstatusicon.so +%%SB%%lib/qmmp/General/libstreambrowser.so %%UDISKS%%lib/qmmp/General/libudisks.so %%FAAD%%lib/qmmp/Input/libaac.so %%CDIO%%lib/qmmp/Input/libcdaudio.so @@ -75,7 +83,6 @@ %%MODPLUG%%lib/qmmp/Input/libmodplug.so %%GME%%lib/qmmp/Input/libgme.so %%MUSEPACK%%lib/qmmp/Input/libmpc.so -%%MPLAYER%%lib/qmmp/Engines/libmplayer.so %%SNDFILE%%lib/qmmp/Input/libsndfile.so %%VORBIS%%lib/qmmp/Input/libvorbis.so %%WAVPACK%%lib/qmmp/Input/libwavpack.so @@ -91,28 +98,32 @@ lib/qmmp/PlaylistFormats/libxspfplaylistformat.so %%CURL%%lib/qmmp/Transports/libhttp.so %%MMS%%lib/qmmp/Transports/libmms.so +%%SKINNEDUI%%lib/qmmp/Ui/libskinned.so %%ANALYZER%%lib/qmmp/Visual/libanalyzer.so %%PROJECTM%%lib/qmmp/Visual/libprojectm.so -%%SKINNEDUI%%share/applications/qmmp.desktop -%%SKINNEDUI%%share/applications/qmmp_enqueue.desktop -%%CUE%%share/applications/qmmp_cue.desktop -%%SKINNEDUI%%share/icons/hicolor/16x16/apps/qmmp.png -%%SKINNEDUI%%share/icons/hicolor/32x32/apps/qmmp.png -%%SKINNEDUI%%share/icons/hicolor/48x48/apps/qmmp.png -%%SKINNEDUI%%share/icons/hicolor/scalable/apps/qmmp.svgz -%%SKINNEDUI%%share/icons/hicolor/scalable/apps/qmmp-simple.svgz +libdata/pkgconfig/qmmp.pc +libdata/pkgconfig/qmmpui.pc +%%DIR_ASSOC%%share/applications/qmmp.desktop +%%DIR_ASSOC%%share/applications/qmmp_enqueue.desktop +%%DIR_ASSOC%%share/applications/qmmp_dir.desktop +%%DIR_ASSOC%%%%CUE%%share/applications/qmmp_cue.desktop +share/icons/hicolor/16x16/apps/qmmp.png +share/icons/hicolor/32x32/apps/qmmp.png +share/icons/hicolor/48x48/apps/qmmp.png +share/icons/hicolor/scalable/apps/qmmp.svgz +share/icons/hicolor/scalable/apps/qmmp-simple.svgz %%KDENOTIFY%%%%DATADIR%%/images/app_icon.png %%KDENOTIFY%%%%DATADIR%%/images/empty_cover.png %%KDENOTIFY%%@dirrm %%DATADIR%%/images %%KDENOTIFY%%@dirrm %%DATADIR%% -%%SKINNEDUI%%@dirrmtry share/icons/hicolor/scalable/apps -%%SKINNEDUI%%@dirrmtry share/icons/hicolor/scalable -%%SKINNEDUI%%@dirrmtry share/icons/hicolor/48x48/apps -%%SKINNEDUI%%@dirrmtry share/icons/hicolor/48x48 -%%SKINNEDUI%%@dirrmtry share/icons/hicolor/32x32/apps -%%SKINNEDUI%%@dirrmtry share/icons/hicolor/32x32 -%%SKINNEDUI%%@dirrmtry share/icons/hicolor/16x16/apps -%%SKINNEDUI%%@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/scalable/apps +@dirrmtry share/icons/hicolor/scalable +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 @comment Insert PLIST.doc here @dirrm include/qmmp @dirrm include/qmmpui @@ -125,5 +136,6 @@ @dirrmtry lib/qmmp/Output @dirrmtry lib/qmmp/PlaylistFormats @dirrmtry lib/qmmp/Transports +@dirrmtry lib/qmmp/Ui @dirrmtry lib/qmmp/Visual -@dirrm lib/qmmp +@dirrmtry lib/qmmp >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207011228.q61CSO15057179>