Ticket #44595: audacious-group-003-ffmpeg_support_update.diff

File audacious-group-003-ffmpeg_support_update.diff, 2.1 KB (added by Ionic (Mihai Moldovan), 10 years ago)

change --{dis,en}able-ffaudio to --with-ffmpeg={ffmpeg,none}. Reformat ffmpeg/libsdl1/libsdl2 comment a little bit.

  • multimedia/audacious-plugins/Portfile 

    commit b47bfd47fc75b06198ba9af7f25ef44ec3fd3eb9
Author: Mihai Moldovan <ionic@ionic.de>
Date:   Sun Aug 10 20:41:46 2014 +0200

    multimedia/audacious-plugins: change --{dis,en}able-ffaudio to --with-ffmpeg={ffmpeg,none}. Reformat ffmpeg/libsdl1/libsdl2 comment a little bit.

diff --git a/multimedia/audacious-plugins/Portfile b/multimedia/audacious-plugins/Portfile
index b41dc46..a45274d 100644
    a b configure.args --enable-nls \ 
    7878                    --disable-aac \
    7979                    --disable-sndfile \
    8080                    --disable-modplug \
    81                     --disable-ffaudio \
     81                    --with-ffmpeg=none \
    8282                    --disable-jack \
    8383                    --disable-sid \
    8484                    --disable-oss4 \
    … … variant modplug description {Add support for MOD audio codec} { 
    225225
    226226variant ffmpeg conflicts sdl2 description {Add support for decoding audio streams via ffmpeg} {
    227227    depends_lib-append      path:lib/libavcodec.dylib:ffmpeg
    228     configure.args-replace  --disable-ffaudio \
    229                             --enable-ffaudio
     228    configure.args-replace  --with-ffmpeg=none \
     229                            --with-ffmpeg=ffmpeg
    230230}
    231231
    232232variant jack description {Add support for the JACK Audio Connection Kit} {
    … … variant sdl1 conflicts sdl2 description {Add SDL audio output via libsdl1} { 
    305305    configure.args-append   --with-libsdl=1
    306306}
    307307
    308 # ffmpeg is depending and using libsdl1. Loading both the ffmpeg and sdlout plugins
    309 # (when compiled with libsdl2) will hence lead to undefined behavior, as both
    310 # libsdl1 and libsdl2 expose functions with the same name.
     308# ffmpeg is depending upon and using libsdl1. Loading both the ffmpeg and sdlout
     309# plugins (when compiled with libsdl2) will hence lead to undefined behavior, as
     310# both libsdl1 and libsdl2 expose functions with the same name.
    311311variant sdl2 conflicts sdl1 ffmpeg description {Add SDL audio output via libsdl2} {
    312312    depends_lib-append      port:libsdl2
    313313    configure.args-replace  --disable-sdlout \