Date: Sun, 17 Feb 2013 18:57:23 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312435 - head/audio/soundkonverter Message-ID: <201302171857.r1HIvNwO036037@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Sun Feb 17 18:57:23 2013 New Revision: 312435 URL: http://svnweb.freebsd.org/changeset/ports/312435 Log: Update audio/soundkonverter to 1.9.80. - The only codec not available from ports is "flake". - Convert to OptionsNG" ChangeLog: https://raw.github.com/HessiJames/soundkonverter/v1.9.80/src/CHANGELOG Modified: head/audio/soundkonverter/Makefile head/audio/soundkonverter/distinfo head/audio/soundkonverter/pkg-plist Modified: head/audio/soundkonverter/Makefile ============================================================================== --- head/audio/soundkonverter/Makefile Sun Feb 17 18:49:59 2013 (r312434) +++ head/audio/soundkonverter/Makefile Sun Feb 17 18:57:23 2013 (r312435) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= soundkonverter -DISTVERSION= 0.9.94rc2 -PORTREVISION= 6 +DISTVERSION= 1.9.80 CATEGORIES= audio kde -MASTER_SITES= https://api.opensuse.org/public/source/home:HessiJames/soundkonverter/ +MASTER_SITES= http://dl.dropbox.com/u/29089012/ MAINTAINER= dbn@FreeBSD.org COMMENT= Frontend to various audio converters (transcoder) @@ -19,60 +18,60 @@ USE_KDE4= automoc4 kdehier kdeprefix kde INSTALLS_ICONS= yes MAKE_JOBS_SAFE= yes +WRKSRC= ${WRKDIR}/${DISTNAME}/src -OPTIONS= LAME "Codec: mp3 (audio/lame)" OFF \ - TWOLAME "Codec: mp2 (audo/twolame)" OFF \ - VORBIS_TOOLS "Codec: ogg-vorbis (audio/vorbis-tools" ON \ - FFMPEG "Codec: various (multimedia/ffmpeg)" OFF \ - MAC "Codec: mac (audio/mac)" OFF \ - MPLAYER "Codec: various (multimedia/mplayer)" OFF \ - FAA "Codec: mpeg2 and mpeg4 AAC (audio/faa(cd))" OFF \ - SHORTEN "Codec: shorten (audio/shorten)" OFF \ - TIMIDITY "Decoder: midi (audio/timidity)" OFF \ - \ - FLAC "Codec/replaygain: flac (audio/flac)" ON \ - MUSEPACK "Codec/replaygain: musepack (audio/musepack)" OFF \ - WAVPACK "Codec/replaygain: wavpack (audio/wavpack)" OFF \ - \ - VORBISGAIN "Replaygain: ogg-vorbis (audio/vorbisgain)" ON \ - MP3GAIN "Replaygain: mp3 (audio/mp3gain)" OFF \ - AACGAIN "Replaygain: mp3 and AAC (audio/aacgain)" OFF +OPTIONS_MULTI= CODEC FILTER REPLAYGAIN +OPTIONS_MULTI_CODEC= AFTEN FAAC FFMPEG FLAC FLUIDSYNTH LAME MAC MPLAYER \ + MUSEPACK NEROAAC OPUSTOOLS SHORTEN SPEEX TIMIDITY TTA \ + TWOLAME VORBIS WAVPACK +OPTIONS_MULTI_FILTER+= NORMALIZE SOX +OPTIONS_MULTI_REPLAYGAIN+= AACGAIN FLAC MP3GAIN MUSEPACK NORMALIZE \ + VORBISGAIN WAVPACK +OPTIONS_DEFAULT= VORBISTOOLS FLAC NORMALIZE VORBISGAIN +AFTEN_DESC= ATSC A/52 audio encoder +AACGAIN_DESC= AAC audio replaygain +#FLAKE_DESC= +FLUIDSYNTH_DESC= SoundFont 2 audio codec +MAC_DESC= Monkey's Audio lossless codec +MP3GAIN_DESC= MP3 audio replaygain +NEROAAC_DESC= Nero AAC MPEG-3 and 3GPP audio codec +NORMALIZE_DESC= MP3/Ogg Vorbis audio replaygain +OPUSTOOLS_DESC= Opus audio codec +SHORTEN_DESC= Shorten (lossless) audio codec +SOX_DESC= Universal sound sample translator +TIMIDITY_DESC= MIDI audio decoder +TTA_DESC= True Audio lossless audio codec +# TWOLAME_DESC +VORBISGAIN_DESC= Ogg Vorbis audio replaygain .include <bsd.port.options.mk> -.if defined(WITH_LAME) -RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame -PLIST_SUB+= LAME="" +.if ${PORT_OPTIONS:MAFTEN} +RUN_DEPENDS+= AFTEN:${PORTSDIR}/audio/AFTEN +PLIST_SUB+= AFTEN="" .else -SK_CMAKE_RM+= codec_lame -PLIST_SUB+= LAME="@comment " +SK_CMAKE_RM+= codec_aften +PLIST_SUB+= AFTEN="@comment " .endif -.if defined(WITH_TWOLAME) -RUN_DEPENDS+= twolame:${PORTSDIR}/audio/twolame -PLIST_SUB+= TWOLAME="" +.if ${PORT_OPTIONS:MAACGAIN} +RUN_DEPENDS+= aacgain:${PORTSDIR}/audio/aacgain +PLIST_SUB+= AACGAIN="" .else -SK_CMAKE_RM+= codec_twolame -PLIST_SUB+= TWOLAME="@comment " +SK_CMAKE_RM+= replaygain_aacgain +PLIST_SUB+= AACGAIN="@comment " .endif -.if defined(WITH_VORBIS_TOOLS) -RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools -PLIST_SUB+= VORBISTOOLS="" +.if ${PORT_OPTIONS:MFAAC} +RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac \ + faad:${PORTSDIR}/audio/faad +PLIST_SUB+= FAAC="" .else -SK_CMAKE_RM+= codec_vorbistools -PLIST_SUB+= VORBISTOOLS="@comment " +SK_CMAKE_RM+= codec_faac +PLIST_SUB+= FAAC="@comment " .endif -# .if defined(WITH_FLAKE) -# RUN_DEPENDS+= :${PORTSDIR}/ -# PLIST_SUB+= FLAKE="" -# .else -SK_CMAKE_RM+= codec_flake -PLIST_SUB+= FLAKE="@comment " -# .endif - -.if defined(WITH_FFMPEG) +.if ${PORT_OPTIONS:MFFMPEG} RUN_DEPENDS+= ffmpeg:${PORTSDIR}/multimedia/ffmpeg PLIST_SUB+= FFMPEG="" .else @@ -80,7 +79,39 @@ SK_CMAKE_RM+= codec_ffmpeg PLIST_SUB+= FFMPEG="@comment " .endif -.if defined(WITH_MAC) +.if ${PORT_OPTIONS:MFLAC} +RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac +PLIST_SUB+= FLAC="" +.else +SK_CMAKE_RM+= codec_flac replaygain_metaflac +PLIST_SUB+= FLAC="@comment " +.endif + +.if ${PORT_OPTIONS:MFLAKE} && defined(NOT_IMPLEMENTED) +RUN_DEPENDS+= flake:${PORTSDIR}/flake +PLIST_SUB+= FLAKE="" +.else +SK_CMAKE_RM+= codec_flake +PLIST_SUB+= FLAKE="@comment " +.endif + +.if ${PORT_OPTIONS:MFLUIDSYNTH} +RUN_DEPENDS+= fluidsynth:${PORTSDIR}/audio/fluidsynth +PLIST_SUB+= FLUIDSYNTH="" +.else +SK_CMAKE_RM+= codec_fluidsynth +PLIST_SUB+= FLUIDSYNTH="@comment " +.endif + +.if ${PORT_OPTIONS:MLAME} +RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame +PLIST_SUB+= LAME="" +.else +SK_CMAKE_RM+= codec_lame +PLIST_SUB+= LAME="@comment " +.endif + +.if ${PORT_OPTIONS:MMAC} RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac PLIST_SUB+= MAC="" .else @@ -88,7 +119,15 @@ SK_CMAKE_RM+= codec_mac PLIST_SUB+= MAC="@comment " .endif -.if defined(WITH_MPLAYER) +.if ${PORT_OPTIONS:MMP3GAIN} +RUN_DEPENDS+= mp3gain:${PORTSDIR}/audio/mp3gain +PLIST_SUB+= MP3GAIN="" +.else +SK_CMAKE_RM+= replaygain_mp3gain +PLIST_SUB+= MP3GAIN="@comment " +.endif + +.if ${PORT_OPTIONS:MMPLAYER} RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer PLIST_SUB+= MPLAYER="" .else @@ -96,32 +135,39 @@ SK_CMAKE_RM+= codec_mplayer PLIST_SUB+= MPLAYER="@comment " .endif -.if defined(WITH_FAA) -RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac \ - faad:${PORTSDIR}/audio/faad -PLIST_SUB+= FAAC="" +.if ${PORT_OPTIONS:MMUSEPACK} +RUN_DEPENDS+= mpcenc:${PORTSDIR}/audio/musepack +PLIST_SUB+= MUSEPACK="" .else -SK_CMAKE_RM+= codec_faac -PLIST_SUB+= FAAC="@comment " +SK_CMAKE_RM+= codec_musepack replaygain_musepack +PLIST_SUB+= MUSEPACK="@comment " .endif -# .if defined(WITH_NEROAAC) -# RUN_DEPENDS+= :${PORTSDIR}/ -# PLIST_SUB+= NEROAAC="" -# .else +.if ${PORT_OPTIONS:MNEROAAC} +RUN_DEPENDS+= neroAacEnc:${PORTSDIR}/linux-neroaaccodec +PLIST_SUB+= NEROAAC="" +.else SK_CMAKE_RM+= codec_neroaac PLIST_SUB+= NEROAAC="@comment " -# .endif +.endif -.if defined(WITH_TIMIDITY) -RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity -PLIST_SUB+= TIMIDITY="" +.if ${PORT_OPTIONS:MNORMALIZE} +RUN_DEPENDS+= normalize:${PORTSDIR}/audio/normalize +PLIST_SUB+= NORMALIZE="" .else -SK_CMAKE_RM+= codec_timidity -PLIST_SUB+= TIMIDITY="@comment " +SK_CMAKE_RM+= filter_normalize +PLIST_SUB+= NORMALIZE="@comment " +.endif + +.if ${PORT_OPTIONS:MOPUSTOOLS} +RUN_DEPENDS+= opusenc:${PORTSDIR}/audio/opus-tools +PLIST_SUB+= OPUSTOOLS="" +.else +SK_CMAKE_RM+= codec_opustools +PLIST_SUB+= OPUSTOOLS="@comment " .endif -.if defined(WITH_SHORTEN) +.if ${PORT_OPTIONS:MSHORTEN} RUN_DEPENDS+= shorten:${PORTSDIR}/audio/shorten PLIST_SUB+= SHORTEN="" .else @@ -129,31 +175,47 @@ SK_CMAKE_RM+= codec_shorten PLIST_SUB+= SHORTEN="@comment " .endif -.if defined(WITH_FLAC) -RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac -PLIST_SUB+= FLAC="" +.if ${PORT_OPTIONS:MSOX} +RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox +PLIST_SUB+= SOX="" .else -SK_CMAKE_RM+= codec_flac replaygain_metaflac -PLIST_SUB+= FLAC="@comment " +SK_CMAKE_RM+= filter_sox +PLIST_SUB+= SOX="@comment " .endif -.if defined(WITH_MUSEPACK) -RUN_DEPENDS+= mpcenc:${PORTSDIR}/audio/musepack -PLIST_SUB+= MUSEPACK="" +.if ${PORT_OPTIONS:MSPEEX} +RUN_DEPENDS+= speexenc:${PORTSDIR}/audio/speex +PLIST_SUB+= SPEEX="" .else -SK_CMAKE_RM+= codec_musepack replaygain_musepack -PLIST_SUB+= MUSEPACK="@comment " +SK_CMAKE_RM+= codec_speex +PLIST_SUB+= SPEEX="@comment " .endif -.if defined(WITH_WAVPACK) -RUN_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack -PLIST_SUB+= WAVPACK="" +.if ${PORT_OPTIONS:MTIMIDITY} +RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity +PLIST_SUB+= TIMIDITY="" .else -SK_CMAKE_RM+= codec_wavpack replaygain_wvgain -PLIST_SUB+= WAVPACK="@comment " +SK_CMAKE_RM+= codec_timidity +PLIST_SUB+= TIMIDITY="@comment " +.endif + +.if ${PORT_OPTIONS:MTTA} +RUN_DEPENDS+= ttaenv:${PORTSDIR}/audio/tta +PLIST_SUB+= TTA="" +.else +SK_CMAKE_RM+= codec_ttaenc +PLIST_SUB+= TTA="@comment " +.endif + +.if ${PORT_OPTIONS:MTWOLAME} +RUN_DEPENDS+= twolame:${PORTSDIR}/audio/twolame +PLIST_SUB+= TWOLAME="" +.else +SK_CMAKE_RM+= codec_twolame +PLIST_SUB+= TWOLAME="@comment " .endif -.if defined(WITH_VORBISGAIN) +.if ${PORT_OPTIONS:MVORBISGAIN} RUN_DEPENDS+= vorbisgain:${PORTSDIR}/audio/vorbisgain PLIST_SUB+= VORBISGAIN="" .else @@ -161,25 +223,27 @@ SK_CMAKE_RM+= replaygain_vorbisgain PLIST_SUB+= VORBISGAIN="@comment " .endif -.if defined(WITH_MP3GAIN) -RUN_DEPENDS+= mp3gain:${PORTSDIR}/audio/mp3gain -PLIST_SUB+= MP3GAIN="" +.if ${PORT_OPTIONS:MVORBIS} +RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools +PLIST_SUB+= VORBIS="" .else -SK_CMAKE_RM+= replaygain_mp3gain -PLIST_SUB+= MP3GAIN="@comment " +SK_CMAKE_RM+= codec_vorbistools +PLIST_SUB+= VORBIS="@comment " .endif -.if defined(WITH_AACGAIN) -RUN_DEPENDS+= aacgain:${PORTSDIR}/audio/aacgain -PLIST_SUB+= AACGAIN="" +.if ${PORT_OPTIONS:MWAVPACK} +RUN_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack +PLIST_SUB+= WAVPACK="" .else -SK_CMAKE_RM+= replaygain_aacgain -PLIST_SUB+= AACGAIN="@comment " +SK_CMAKE_RM+= codec_wavpack replaygain_wvgain +PLIST_SUB+= WAVPACK="@comment " .endif post-patch: + ${MKDIR} ${WRKSRC}/plugins_nobuild .for plugin in ${SK_CMAKE_RM} - ${REINPLACE_CMD} -i "" -e "s|\(.*${plugin}.*\)|#\1|g" ${WRKSRC}/CMakeLists.txt + ${MV} ${WRKSRC}/plugins/soundkonverter_${plugin} \ + ${WRKSRC}/plugins_nobuild/ .endfor .include <bsd.port.mk> Modified: head/audio/soundkonverter/distinfo ============================================================================== --- head/audio/soundkonverter/distinfo Sun Feb 17 18:49:59 2013 (r312434) +++ head/audio/soundkonverter/distinfo Sun Feb 17 18:57:23 2013 (r312435) @@ -1,2 +1,2 @@ -SHA256 (soundkonverter-0.9.94rc2.tar.gz) = ca572385134fd6a46a388bb9ca06db5b18c76d549007c2a4fc405a4c6de8a36c -SIZE (soundkonverter-0.9.94rc2.tar.gz) = 300072 +SHA256 (soundkonverter-1.9.80.tar.gz) = 3937c4526b69eba432dc8e2cfea71ab218dbe341c2b8de298cbb7907c27647a1 +SIZE (soundkonverter-1.9.80.tar.gz) = 479452 Modified: head/audio/soundkonverter/pkg-plist ============================================================================== --- head/audio/soundkonverter/pkg-plist Sun Feb 17 18:49:59 2013 (r312434) +++ head/audio/soundkonverter/pkg-plist Sun Feb 17 18:57:23 2013 (r312435) @@ -1,18 +1,25 @@ bin/soundkonverter +%%AFTEN%%lib/kde4/soundkonverter_codec_aften.so %%FAAC%%lib/kde4/soundkonverter_codec_faac.so %%FFMPEG%%lib/kde4/soundkonverter_codec_ffmpeg.so %%FLAC%%lib/kde4/soundkonverter_codec_flac.so %%FLAKE%%lib/kde4/soundkonverter_codec_flake.so +%%FLUIDSYNTH%%lib/kde4/soundkonverter_codec_fluidsynth.so %%LAME%%lib/kde4/soundkonverter_codec_lame.so %%MAC%%lib/kde4/soundkonverter_codec_mac.so %%MPLAYER%%lib/kde4/soundkonverter_codec_mplayer.so %%MUSEPACK%%lib/kde4/soundkonverter_codec_musepack.so %%NEROAAC%%lib/kde4/soundkonverter_codec_neroaac.so +%%OPUSTOOLS%%lib/kde4/soundkonverter_codec_opustools.so %%SHORTEN%%lib/kde4/soundkonverter_codec_shorten.so +%%SPEEX%%lib/kde4/soundkonverter_codec_speex.so %%TIMIDITY%%lib/kde4/soundkonverter_codec_timidity.so +%%TTA%%lib/kde4/soundkonverter_codec_ttaenc.so %%TWOLAME%%lib/kde4/soundkonverter_codec_twolame.so -%%VORBISTOOLS%%lib/kde4/soundkonverter_codec_vorbistools.so +%%VORBIS%%lib/kde4/soundkonverter_codec_vorbistools.so %%WAVPACK%%lib/kde4/soundkonverter_codec_wavpack.so +%%NORMALIZE%%lib/kde4/soundkonverter_filter_normalize.so +%%SOX%%lib/kde4/soundkonverter_filter_sox.so %%AACGAIN%%lib/kde4/soundkonverter_replaygain_aacgain.so %%FLAC%%lib/kde4/soundkonverter_replaygain_metaflac.so %%MP3GAIN%%lib/kde4/soundkonverter_replaygain_mp3gain.so @@ -22,6 +29,7 @@ bin/soundkonverter lib/kde4/soundkonverter_ripper_cdparanoia.so lib/libsoundkonvertercore.so share/applications/kde4/soundkonverter.desktop +share/apps/solid/actions/soundkonverter-rip-audiocd.desktop share/apps/soundkonverter/images/nocover.png share/apps/soundkonverter/soundkonverterui.rc share/icons/hicolor/16x16/apps/soundkonverter-replaygain.png @@ -34,20 +42,34 @@ share/icons/hicolor/48x48/apps/soundkonv share/icons/hicolor/48x48/apps/soundkonverter.png share/icons/hicolor/64x64/apps/soundkonverter-replaygain.png share/icons/hicolor/64x64/apps/soundkonverter.png +share/locale/es/LC_MESSAGES/soundkonverter.mo +share/locale/et/LC_MESSAGES/soundkonverter.mo +share/locale/fr/LC_MESSAGES/soundkonverter.mo +share/locale/hu/LC_MESSAGES/soundkonverter.mo +share/locale/pt/LC_MESSAGES/soundkonverter.mo +share/locale/pt_BR/LC_MESSAGES/soundkonverter.mo +share/locale/ru/LC_MESSAGES/soundkonverter.mo +%%AFTEN%%share/kde4/services/soundkonverter_codec_aften.desktop %%FAAC%%share/kde4/services/soundkonverter_codec_faac.desktop %%FFMPEG%%share/kde4/services/soundkonverter_codec_ffmpeg.desktop %%FLAC%%share/kde4/services/soundkonverter_codec_flac.desktop %%FLAKE%%share/kde4/services/soundkonverter_codec_flake.desktop +%%FLUIDSYNTH%%share/kde4/services/soundkonverter_codec_fluidsynth.desktop %%LAME%%share/kde4/services/soundkonverter_codec_lame.desktop %%MAC%%share/kde4/services/soundkonverter_codec_mac.desktop %%MPLAYER%%share/kde4/services/soundkonverter_codec_mplayer.desktop %%MUSEPACK%%share/kde4/services/soundkonverter_codec_musepack.desktop %%NEROAAC%%share/kde4/services/soundkonverter_codec_neroaac.desktop +%%OPUSTOOLS%%share/kde4/services/soundkonverter_codec_opustools.desktop %%SHORTEN%%share/kde4/services/soundkonverter_codec_shorten.desktop +%%SPEEX%%share/kde4/services/soundkonverter_codec_speex.desktop %%TIMIDITY%%share/kde4/services/soundkonverter_codec_timidity.desktop +%%TTA%%share/kde4/services/soundkonverter_codec_ttaenc.desktop %%TWOLAME%%share/kde4/services/soundkonverter_codec_twolame.desktop -%%VORBISTOOLS%%share/kde4/services/soundkonverter_codec_vorbistools.desktop +%%VORBIS%%share/kde4/services/soundkonverter_codec_vorbistools.desktop %%WAVPACK%%share/kde4/services/soundkonverter_codec_wavpack.desktop +%%NORMALIZE%%share/kde4/services/soundkonverter_filter_normalize.desktop +%%SOX%%share/kde4/services/soundkonverter_filter_sox.desktop %%AACGAIN%%share/kde4/services/soundkonverter_replaygain_aacgain.desktop %%FLAC%%share/kde4/services/soundkonverter_replaygain_metaflac.desktop %%MP3GAIN%%share/kde4/services/soundkonverter_replaygain_mp3gain.desktop @@ -56,10 +78,10 @@ share/icons/hicolor/64x64/apps/soundkonv %%WAVPACK%%share/kde4/services/soundkonverter_replaygain_wvgain.desktop share/kde4/services/soundkonverter_ripper_cdparanoia.desktop share/kde4/servicetypes/soundkonverter_codecplugin.desktop +share/kde4/servicetypes/soundkonverter_filterplugin.desktop share/kde4/servicetypes/soundkonverter_replaygainplugin.desktop share/kde4/servicetypes/soundkonverter_ripperplugin.desktop share/locale/cs/LC_MESSAGES/soundkonverter.mo share/locale/de/LC_MESSAGES/soundkonverter.mo @dirrm share/apps/soundkonverter/images @dirrm share/apps/soundkonverter -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302171857.r1HIvNwO036037>