diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 83 |
1 files changed, 54 insertions, 29 deletions
@@ -316,8 +316,6 @@ Optional features: --disable-dvdread disable libdvdread [autodetect] --disable-cddb disable cddb [autodetect] --disable-enca disable ENCA charset oracle library [autodetect] - --enable-macosx-finder enable Mac OS X Finder invocation parameter - parsing [disabled] --enable-macosx-bundle enable Mac OS X bundle file locations [autodetect] --disable-inet6 disable IPv6 support [autodetect] --disable-gethostbyname2 gethostbyname2 part of the C library [autodetect] @@ -328,8 +326,9 @@ Optional features: --disable-libass-osd disable OSD rendering with libass [autodetect] --enable-rpath enable runtime linker path for extra libs [disabled] --disable-libpostproc disable postprocess filter (vf_pp) [autodetect] - --enable-libavdevice enable libavdevice demuxers [disabled] - --enable-libavfilter enable libavfilter [disabled] [unused] + --disable-libavdevice enable libavdevice demuxers [autodetect] + --disable-libavfilter enable libavfilter [autodetect] + --disable-vf-lavfi enable vf_lavfi libavfilter bridge [audodetect] Codecs: --enable-mng enable MNG input support [autodetect] @@ -347,8 +346,8 @@ Video output: --enable-gl enable OpenGL video output [autodetect] --enable-caca enable CACA video output [autodetect] --enable-direct3d enable Direct3D video output [autodetect] - --enable-sdl enable SDL audio output [autodetect] - --enable-sdl2 enable SDL 2.0+ audio and video output [autodetect] + --enable-sdl enable SDL audio output [disable] + --enable-sdl2 enable SDL 2.0+ audio and video output [disable] --enable-xv enable Xv video output [autodetect] --enable-vdpau enable VDPAU acceleration [autodetect] --enable-vm enable XF86VidMode support [autodetect] @@ -424,8 +423,8 @@ _xss=auto _xv=auto _vdpau=auto _direct3d=auto -_sdl=auto -_sdl2=auto +_sdl=no +_sdl2=no _dsound=auto _mng=auto _jpeg=auto @@ -475,7 +474,6 @@ _cddb=auto _coreaudio=auto _corevideo=auto _cocoa=auto -_macosx_finder=no _macosx_bundle=auto _enca=auto _inet6=auto @@ -487,8 +485,9 @@ _ass=auto _libass_osd=auto _rpath=no libpostproc=auto -libavfilter=no -libavdevice=no +libavfilter=auto +vf_lavfi=auto +libavdevice=auto _stream_cache=yes _priority=no def_dos_paths="#define HAVE_DOS_PATHS 0" @@ -702,6 +701,8 @@ for ac_option do --disable-libavdevice) libavdevice=no ;; --enable-libavfilter) libavfilter=auto ;; --disable-libavfilter) libavfilter=no ;; + --enable-vf-lavfi) vf_lavfi=auto ;; + --disable-vf-lavfi) vf_lavfi=no ;; --enable-enca) _enca=yes ;; --disable-enca) _enca=no ;; @@ -718,8 +719,6 @@ for ac_option do --disable-corevideo) _corevideo=no ;; --enable-cocoa) _cocoa=yes ;; --disable-cocoa) _cocoa=no ;; - --enable-macosx-finder) _macosx_finder=yes ;; - --disable-macosx-finder) _macosx_finder=no ;; --enable-macosx-bundle) _macosx_bundle=yes ;; --disable-macosx-bundle) _macosx_bundle=no ;; @@ -1661,17 +1660,9 @@ echores "$_sys_sysinfo" if darwin; then -echocheck "Mac OS X Finder Support" -def_macosx_finder='#undef CONFIG_MACOSX_FINDER' -if test "$_macosx_finder" = yes ; then - def_macosx_finder='#define CONFIG_MACOSX_FINDER 1' - libs_mplayer="$libs_mplayer -framework Cocoa" -fi -echores "$_macosx_finder" - echocheck "Mac OS X Bundle file locations" def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE' -test "$_macosx_bundle" = auto && _macosx_bundle=$_macosx_finder +test "$_macosx_bundle" = auto if test "$_macosx_bundle" = yes ; then extra_ldflags="$extra_ldflags -headerpad_max_install_names" def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1' @@ -1782,7 +1773,7 @@ fi #if darwin echocheck "Wayland" if test "$_wayland" != no; then _wayland="no" - pkg_config_add "wayland-client >= 1.0.0 wayland-egl >= 9.0.0 wayland-cursor >= 1.0.0 xkbcommon >= 0.2.0" \ + pkg_config_add "wayland-client >= 1.0.0 wayland-egl >= 9.0.0 wayland-cursor >= 1.0.0 xkbcommon >= 0.3.0" \ && _wayland="yes" res_comment="" else @@ -1825,7 +1816,7 @@ if test "$_x11" = auto && test "$_x11_headers" = yes ; then else _ld_tmp="$I -lXext -lX11 $_ld_pthread" fi - statement_check X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $_ld_tmp && + statement_check_broken X11/Xutil.h X11/XKBlib.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $_ld_tmp && _x11=yes # Check that there aren't conflicting headers between ApplicationServices # and X11. On versions of Mac OSX prior to 10.7 the deprecated QuickDraw API @@ -2694,11 +2685,25 @@ fi echores "$_avutil_has_refcounting" -echocheck "libavfilter >= 3.17.0" +# libavfilter as it can be used by vf_lavfi is 3.45.101 in FFmpeg, and +# 3.5.0 in Libav. Completely useless version numbers. +echocheck "libavfilter" if test "$libavfilter" = auto ; then libavfilter=no - if pkg_config_add "libavfilter >= 3.17.0" ; then + + cat > $TMPC <<EOF +#include <libavfilter/avfilter.h> +void vf_next_query_format() {} +int main(void) { + avfilter_register_all(); + vf_next_query_format(); + return 0; +} +EOF + if cc_check `$_pkg_config libavfilter --cflags --libs` && pkg_config_add "libavfilter" ; then libavfilter=yes + else + res_comment="not found or broken" fi fi if test "$libavfilter" = yes ; then @@ -2709,10 +2714,30 @@ fi echores "$libavfilter" +echocheck "using libavfilter through vf_lavfi" +if test "$vf_lavfi" = auto ; then + vf_lavfi=no + if test "$libavfilter" = yes ; then + if test "$_avutil_has_refcounting" = no ; then + res_comment="libavutil too old" + else + vf_lavfi=yes + fi + fi +fi +if test "$vf_lavfi" = yes ; then + def_vf_lavfi='#define CONFIG_VF_LAVFI 1' +else + def_vf_lavfi='#undef CONFIG_VF_LAVFI' +fi +echores "$vf_lavfi" + + echocheck "libavdevice >= 54.0.0" if test "$libavdevice" = auto ; then libavdevice=no - if pkg_config_add "libavdevice >= 54.0.0" ; then + # Usually, libavdevice depends on libavfilter + if test "$libavfilter" = yes && pkg_config_add "libavdevice >= 54.0.0" ; then libavdevice=yes fi fi @@ -3044,11 +3069,11 @@ LCMS2 = $_lcms2 LIBPOSTPROC = $libpostproc LIBAVDEVICE = $libavdevice LIBAVFILTER = $libavfilter +VF_LAVFI = $vf_lavfi LIBSMBCLIENT = $_smb LIBQUVI = $_libquvi LIBTHEORA = $_theora LIRC = $_lirc -MACOSX_FINDER = $_macosx_finder MACOSX_BUNDLE = $_macosx_bundle MNG = $_mng MPG123 = $_mpg123 @@ -3151,7 +3176,6 @@ $def_dl $def_dos_paths $def_iconv $def_macosx_bundle -$def_macosx_finder $def_priority @@ -3200,6 +3224,7 @@ $def_avutil_has_qp_api $def_libpostproc $def_libavdevice $def_libavfilter +$def_vf_lavfi /* Audio output drivers */ |