diff --git a/aegisub/audio_provider_lavc.h b/aegisub/audio_provider_lavc.h index 704ab66e1..bb9099075 100644 --- a/aegisub/audio_provider_lavc.h +++ b/aegisub/audio_provider_lavc.h @@ -52,13 +52,13 @@ */ extern "C" { -#ifdef WITH_ANCIENT_FFMPEG +#ifdef WITH_OLD_FFMPEG #include #include #else #include #include -#endif /* WITH_ANCIENT_FFMPEG */ +#endif /* WITH_OLD_FFMPEG */ } #include "mkv_wrap.h" #include "lavc_file.h" diff --git a/aegisub/lavc_file.h b/aegisub/lavc_file.h index eee266aea..b53891d83 100644 --- a/aegisub/lavc_file.h +++ b/aegisub/lavc_file.h @@ -41,13 +41,13 @@ #endif #include extern "C" { -#ifdef WITH_ANCIENT_FFMPEG +#ifdef WITH_OLD_FFMPEG #include #include #else #include #include -#endif /* WITH_ANCIENT_FFMPEG */ +#endif /* WITH_OLD_FFMPEG */ } #include "include/aegisub/aegisub.h" diff --git a/aegisub/video_provider_lavc.h b/aegisub/video_provider_lavc.h index 875a8e189..56e328f4a 100644 --- a/aegisub/video_provider_lavc.h +++ b/aegisub/video_provider_lavc.h @@ -44,7 +44,7 @@ #endif #include extern "C" { -#ifdef WITH_ANCIENT_FFMPEG +#ifdef WITH_OLD_FFMPEG #include #include #include @@ -52,7 +52,7 @@ extern "C" { #include #include #include -#endif /* WITH_ANCIENT_FFMPEG */ +#endif /* WITH_OLD_FFMPEG */ } #include "include/aegisub/video_provider.h" #include "include/aegisub/aegisub.h" diff --git a/configure.in b/configure.in index 3164c70e9..9d9c3638a 100644 --- a/configure.in +++ b/configure.in @@ -121,11 +121,6 @@ if test "$enable_build_dist" = "yes"; then VERSION="${VERSION}-r$SVN_VERSION" fi -AC_ARG_ENABLE(old-ffmpeg, [ --enable-old-ffmpeg use ancient ffmpeg header locations (default=no)]) -if test "$enable_ancient_ffmpeg" = "yes"; then - AC_DEFINE([WITH_ANCIENT_FFMPEG], [1], [Using ancient ffmpeg header locations]) -fi - ################################################### # Check for pthreads and setup variables / compiler @@ -431,7 +426,13 @@ fi # Video / Audio Providers ######################### -AC_ARG_WITH(ffmpeg, [ --without-ffmpeg build without FFMPEG video provider. (default: auto)], ffmpeg_disabled="(disabled)") +AC_ARG_ENABLE(old-ffmpeg, [ --enable-old-ffmpeg Use old FFMPEG header locations (default=no)]) +if test "$enable_old_ffmpeg" = "yes"; then + AC_DEFINE([WITH_OLD_FFMPEG], [1], [Use old FFMPEG header locations]) +fi + + +AC_ARG_WITH(ffmpeg, [ --without-ffmpeg build without FFMPEG support. Disables FFMPEG and FFmpegSource A/V providers. (default: auto)], ffmpeg_disabled="(disabled)") if test "$with_ffmpeg" != "no"; then AC_CHECK_LIB([avcodec], [avcodec_init],[AVCODEC_LDFLAGS="-lavcodec"; with_ffmpeg="yes"], [with_ffmpeg="no"]) @@ -461,24 +462,33 @@ AC_SUBST(AVCODEC_LDFLAGS) AC_SUBST(AVFORMAT_LDFLAGS) AC_SUBST(AVUTIL_LDFLAGS) -AM_CONDITIONAL([HAVE_FFMPEG], [test "$with_ffmpeg" = "yes"]) +AC_ARG_WITH(provider-ffmpeg, [ --without-provider-ffmpeg build without FFMPEG A/V provider. (default: auto)], ffmpeg_provider_disabled="(disabled)") -AC_ARG_WITH(ffmpegsource, [ --without-ffmpegsource build without FFmpegSource video provider. (default: auto)], ffmpegsource_disabled="(disabled)") +AM_CONDITIONAL([HAVE_FFMPEG], [test "$with_provider_ffmpeg" = "yes"]) + +if test "$with_ffmpeg" = "no"; then + with_provider_ffmpegsource="no" + with_provider_ffmpeg="no" + ffmpegsource_provider_disabled="(disabled, requires FFMPEG)" + ffmpeg_provider_disabled="(disabled, requires FFMPEG)" +fi + +AC_ARG_WITH(provider-ffmpegsource, [ --without-provider-ffmpegsource build without FFmpegSource A/V provider. (default: auto)], ffmpegsource_provider_disabled="(disabled)") if test "$with_ffmpegsource" != "no"; then AC_CHECK_LIB([postproc], [pp_postprocess],[POSTPROC_LDFLAGS="-lpostproc"; with_postproc="yes"], [with_postproc="no"]) if test "$with_postproc" = "yes"; then found_video_provider="yes" - with_ffmpegsource="yes" + with_provider_ffmpegsource="yes" AC_DEFINE(WITH_FFMPEGSOURCE, 1, [Enable FFmpegSource2 Video Provider]) fi fi AC_SUBST(POSTPROC_LDFLAGS) -AM_CONDITIONAL([HAVE_FFMPEGSOURCE], [test "$with_ffmpegsource" = "yes"]) +AM_CONDITIONAL([HAVE_FFMPEGSOURCE], [test "$with_provider_ffmpegsource" = "yes"]) @@ -511,7 +521,7 @@ AM_CONDITIONAL([WITH_LIBASS], [test "$with_libass" = "yes"]) -AC_ARG_ENABLE(csri, [ --disable-csri disable CSRI (ASA) support (default=enabled)],csri_disabled="(disabled)") +AC_ARG_ENABLE(csri, [ --disable-csri disable CSRI (ASA) support (default=enabled)], csri_disabled="(disabled)") if test "$enable_csri" != "no"; then PKG_CHECK_MODULES(CSRI, csri >= 0.1.0, with_csri="yes", with_csri="no") @@ -519,7 +529,7 @@ if test "$enable_csri" != "no"; then AC_DEFINE(WITH_CSRI, 1, [Enable CSRI (ASA) Subtitle Provider]) fi else - $with_csri = "no" + with_csri="no" fi AM_CONDITIONAL([WITH_CSRI], [test "$with_csri" = "yes"]) @@ -925,9 +935,9 @@ fi AC_MSG_RESULT([ Scripting Engines: + auto3 Lua: $with_auto3 $lua50_disabled + auto4 Lua: $with_auto4 $lua51_disabled auto4 Perl: $with_perl $perl_disabled - auto3: $with_auto3 $lua50_disabled - auto4: $with_auto4 $lua51_disabled auto4 Ruby: $with_ruby $ruby_disabled Audio Players: @@ -936,15 +946,20 @@ Audio Players: PortAudio: $with_portaudio $portaudio_disabled PulseAudio: $with_pulseaudio $pulseaudio_disabled +A/V Support + FFMPEG: $with_ffmpeg $ffmpeg_disabled + (required for video providers) + Video Providers - ffmpeg: $with_ffmpeg $ffmpeg_disabled - ffmpegsource: $with_ffmpegsource $ffmpegsource_disabled + FFMPEG: $with_provider_ffmpeg $ffmpeg_provider_disabled + FFmpegSource: $with_provider_ffmpegsource $ffmpegsource_provider_disabled Subtitle Providers: - csri (asa): $with_csri (requires iconv, fontconfig) $csri_disabled - libass $with_libass (requires iconv, fontconfig) $libass_disabled + CSRI (ASA): $with_csri $csri_disabled + libASS $with_libass $libass_disabled + (both require iconv and fontconfig) Misc Packages: - hunspell: $with_hunspell $with_hunspell_version $hunspell_disabled + Hunspell: $with_hunspell $with_hunspell_version $hunspell_disabled universalchardet: $with_univchardet $univchardet_disabled ]);