diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 571 |
1 files changed, 215 insertions, 356 deletions
@@ -292,6 +292,7 @@ Installation directories: Optional features: --disable-encoding disable encoding functionality [enable] + --disable-libguess disable libguess [autodetect] --enable-termcap use termcap database for key codes [autodetect] --enable-termios use termios database for key codes [autodetect] --disable-iconv disable iconv for encoding conversion [autodetect] @@ -306,23 +307,15 @@ Optional features: --disable-tv disable TV interface (TV/DVB grabbers) [enable] --disable-tv-v4l2 disable Video4Linux2 TV interface [autodetect] --disable-pvr disable Video4Linux2 MPEG PVR [autodetect] - --disable-networking disable networking [enable] - --enable-winsock2_h enable winsock2_h [autodetect] --enable-smb enable Samba (SMB) input [autodetect] - --enable-libquvi enable libquvi [autodetect] + --disable-libquvi4 disable libquvi 0.4.x [autodetect] + --disable-libquvi9 disable libquvi 0.9.x [autodetect] --enable-lcms2 enable LCMS2 support [autodetect] --disable-vcd disable VCD support [autodetect] --disable-bluray disable Blu-ray support [autodetect] --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] - --disable-ftp disable FTP support [enabled] - --disable-vstream disable TiVo vstream client support [autodetect] --disable-pthreads disable Posix threads support [autodetect] --disable-libass disable subtitle rendering with libass [autodetect] --disable-libass-osd disable OSD rendering with libass [autodetect] @@ -331,6 +324,7 @@ Optional features: --disable-libavdevice enable libavdevice demuxers [autodetect] --disable-libavfilter enable libavfilter [autodetect] --disable-vf-lavfi enable vf_lavfi libavfilter bridge [audodetect] + --disable-af-lavfi enable af_lavfi libavfilter bridge [audodetect] Codecs: --enable-mng enable MNG input support [autodetect] @@ -348,8 +342,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] @@ -369,7 +363,8 @@ Audio output: --disable-jack disable JACK audio output [autodetect] --enable-openal enable OpenAL audio output [disable] --disable-coreaudio disable CoreAudio audio output [autodetect] - --disable-dsound disable DirectSound audio output [autodetect] + --disable-dsound disable DirectSound audio output [autodetect] + --disable-wasapi0 disable WASAPI (event mode) audio output [autodetect] --disable-select disable using select() on the audio device [enable] Localization options: @@ -425,9 +420,10 @@ _xss=auto _xv=auto _vdpau=auto _direct3d=auto -_sdl=auto -_sdl2=auto +_sdl=no +_sdl2=no _dsound=auto +_wasapi0=auto _mng=auto _jpeg=auto _gl=auto @@ -460,10 +456,10 @@ _radio_v4l2=auto _tv=yes _tv_v4l2=auto _pvr=auto -networking=yes -_winsock2_h=auto _smb=auto -_libquvi=auto +_libquvi4=auto +_libquvi9=auto +_libguess=auto _joystick=no _lirc=auto _lircc=auto @@ -472,17 +468,11 @@ _termios=auto _shm=auto _gettext=no _cdda=auto -_cddb=auto _coreaudio=auto _corevideo=auto _cocoa=auto -_macosx_finder=no _macosx_bundle=auto _enca=auto -_inet6=auto -_gethostbyname2=auto -_ftp=auto -_vstream=auto _pthreads=auto _ass=auto _libass_osd=auto @@ -490,14 +480,12 @@ _rpath=no libpostproc=auto libavfilter=auto vf_lavfi=auto +af_lavfi=auto libavdevice=auto _stream_cache=yes _priority=no def_dos_paths="#define HAVE_DOS_PATHS 0" -def_stream_cache="#define CONFIG_STREAM_CACHE 1" def_priority="#undef CONFIG_PRIORITY" -def_pthread_cache="#undef PTHREAD_CACHE" -need_shmem=yes _build_man=auto for ac_option do case "$ac_option" in @@ -598,6 +586,8 @@ for ac_option do --disable-sdl2) _sdl2=no ;; --enable-dsound) _dsound=yes ;; --disable-dsound) _dsound=no ;; + --enable-wasapi0) _wasapi0=yes ;; + --disable-wasapi0) _wasapi0=no ;; --enable-mng) _mng=yes ;; --disable-mng) _mng=no ;; --enable-jpeg) _jpeg=yes ;; @@ -658,14 +648,14 @@ for ac_option do --disable-radio-v4l2) _radio_v4l2=no ;; --enable-pvr) _pvr=yes ;; --disable-pvr) _pvr=no ;; - --enable-networking) networking=yes ;; - --disable-networking) networking=no ;; - --enable-winsock2_h) _winsock2_h=yes ;; - --disable-winsock2_h) _winsock2_h=no ;; --enable-smb) _smb=yes ;; --disable-smb) _smb=no ;; - --enable-libquvi) _libquvi=yes ;; - --disable-libquvi) _libquvi=no ;; + --enable-libquvi4) _libquvi4=yes ;; + --disable-libquvi4) _libquvi4=no ;; + --enable-libquvi9) _libquvi9=yes ;; + --disable-libquvi9) _libquvi9=no ;; + --enable-libguess) _libguess=yes ;; + --disable-libguess) _libguess=no ;; --enable-joystick) _joystick=yes ;; --disable-joystick) _joystick=no ;; --enable-libav) ffmpeg=yes ;; @@ -684,12 +674,6 @@ for ac_option do --disable-shm) _shm=no ;; --enable-select) _select=yes ;; --disable-select) _select=no ;; - --enable-cddb) _cddb=yes ;; - --disable-cddb) _cddb=no ;; - --enable-ftp) _ftp=yes ;; - --disable-ftp) _ftp=no ;; - --enable-vstream) _vstream=yes ;; - --disable-vstream) _vstream=no ;; --enable-pthreads) _pthreads=yes ;; --disable-pthreads) _pthreads=no ;; --enable-libass) _ass=yes ;; @@ -706,24 +690,18 @@ for ac_option do --disable-libavfilter) libavfilter=no ;; --enable-vf-lavfi) vf_lavfi=auto ;; --disable-vf-lavfi) vf_lavfi=no ;; + --enable-af-lavfi) af_lavfi=auto ;; + --disable-af-lavfi) af_lavfi=no ;; --enable-enca) _enca=yes ;; --disable-enca) _enca=no ;; - --enable-inet6) _inet6=yes ;; - --disable-inet6) _inet6=no ;; - - --enable-gethostbyname2) _gethostbyname2=yes ;; - --disable-gethostbyname2) _gethostbyname2=no ;; - --enable-coreaudio) _coreaudio=yes ;; --disable-coreaudio) _coreaudio=no ;; --enable-corevideo) _corevideo=yes ;; --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 ;; @@ -885,7 +863,7 @@ fi if win32 ; then _exesuf=".exe" - extra_cflags="$extra_cflags -fno-common -DWINVER=0x0500" + extra_cflags="$extra_cflags -fno-common" # -lwinmm is always needed for osdep/timer-win2.c libs_mplayer="$libs_mplayer -lwinmm" _pe_executable=yes @@ -897,7 +875,6 @@ fi if mingw32 ; then _getch=getch2-win.c - need_shmem=no extra_cflags="$extra_cflags -D__USE_MINGW_ANSI_STDIO=1" # Hack for missing BYTE_ORDER declarations in <sys/types.h>. # (For some reason, they are in <sys/param.h>, but we don't bother switching @@ -1019,87 +996,77 @@ if test "$_as" = auto ; then fi def_fast_64bit='#define HAVE_FAST_64BIT 0' -arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC' -subarch_all='X86_32 X86_64 PPC64' +def_arch_x86='#define ARCH_X86 0' +def_arch_x86_32='#define ARCH_X86_32 0' +def_arch_x86_64='#define ARCH_X86_64 0' + case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) arch='x86' subarch='x86_32' - iproc=486 - proc=i486 + def_arch_x86='#define ARCH_X86 1' + def_arch_x86_32='#define ARCH_X86_32 1' ;; ia64) arch='ia64' def_fast_64bit='#define HAVE_FAST_64BIT 1' - iproc='ia64' ;; x86_64|amd64) arch='x86' subarch='x86_64' + def_arch_x86='#define ARCH_X86 1' + def_arch_x86_64='#define ARCH_X86_64 1' def_fast_64bit='#define HAVE_FAST_64BIT 1' - iproc='x86_64' ;; sparc|sparc64) arch='sparc' - iproc='sparc' ;; arm*) arch='arm' - iproc='arm' ;; avr32) arch='avr32' - iproc='avr32' ;; sh|sh4) arch='sh4' - iproc='sh4' ;; ppc|ppc64|powerpc|powerpc64) arch='ppc' - iproc='ppc' ;; alpha*) arch='alpha' - iproc='alpha' ;; mips*) arch='mips' - iproc='mips' ;; hppa) arch='pa_risc' - iproc='PA-RISC' ;; s390) arch='s390' - iproc='390' ;; s390x) arch='s390x' - iproc='390x' ;; vax) arch='vax' - iproc='vax' ;; xtensa) arch='xtensa' - iproc='xtensa' ;; generic) @@ -1240,146 +1207,6 @@ fi echores "$_nanosleep" -echocheck "socklib" -# for Solaris (socket stuff is in -lsocket, gethostbyname and friends in -lnsl): -cat > $TMPC << EOF -#include <netdb.h> -#include <sys/socket.h> -int main(void) { gethostbyname(0); socket(AF_INET, SOCK_STREAM, 0); return 0; } -EOF -_socklib=no -for _ld_tmp in "" "-lsocket -lbind" "-lsocket -ldnet" "-lsocket -lnsl" "-lnsl" "-lsocket" ; do - cc_check $_ld_tmp && _ld_sock="$_ld_tmp" && _socklib=yes && break -done -test $_socklib = yes && test $_winsock2_h = auto && _winsock2_h=no -if test $_winsock2_h = auto ; then - _winsock2_h=no - statement_check winsock2.h 'gethostbyname(0)' -lws2_32 && _ld_sock="-lws2_32" && _winsock2_h=yes -fi -test "$_ld_sock" && res_comment="using $_ld_sock" -echores "$_socklib" - - -if test $_winsock2_h = yes ; then - _ld_sock="-lws2_32" - def_winsock2_h='#define HAVE_WINSOCK2_H 1' -else - def_winsock2_h='#define HAVE_WINSOCK2_H 0' -fi - - -echocheck "inet_pton()" -def_inet_pton='#define HAVE_INET_PTON 0' -inet_pton=no -for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do - statement_check arpa/inet.h 'inet_pton(0, 0, 0)' $_ld_tmp && inet_pton=yes && break -done -if test $inet_pton = yes ; then - test "$_ld_tmp" && res_comment="using $_ld_tmp" - def_inet_pton='#define HAVE_INET_PTON 1' -fi -echores "$inet_pton" - - -echocheck "inet_aton()" -def_inet_aton='#define HAVE_INET_ATON 0' -inet_aton=no -for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do - statement_check arpa/inet.h 'inet_aton(0, 0)' $_ld_tmp && inet_aton=yes && break -done -if test $inet_aton = yes ; then - test "$_ld_tmp" && res_comment="using $_ld_tmp" - def_inet_aton='#define HAVE_INET_ATON 1' -fi -echores "$inet_aton" - - -echocheck "socklen_t" -_socklen_t=no -for header in "sys/socket.h" "ws2tcpip.h" "sys/types.h" ; do - statement_check $header 'socklen_t v = 0' && _socklen_t=yes && break -done -if test "$_socklen_t" = yes ; then - def_socklen_t='#define HAVE_SOCKLEN_T 1' -else - def_socklen_t='#define HAVE_SOCKLEN_T 0' -fi -echores "$_socklen_t" - - -echocheck "closesocket()" -_closesocket=no -statement_check winsock2.h 'closesocket(~0)' $_ld_sock && _closesocket=yes -if test "$_closesocket" = yes ; then - def_closesocket='#define HAVE_CLOSESOCKET 1' -else - def_closesocket='#define HAVE_CLOSESOCKET 0' -fi -echores "$_closesocket" - - -echocheck "networking" -test $_winsock2_h = no && test $inet_pton = no && - test $inet_aton = no && networking=no -if test "$networking" = yes ; then - def_network='#define CONFIG_NETWORK 1' - def_networking='#define CONFIG_NETWORKING 1' - libs_mplayer="$libs_mplayer $_ld_sock" - inputmodules="networking $inputmodules" -else - noinputmodules="networking $noinputmodules" - def_network='#define CONFIG_NETWORK 0' - def_networking='#undef CONFIG_NETWORKING' -fi -echores "$networking" - - -echocheck "inet6" -if test "$_inet6" = auto ; then - cat > $TMPC << EOF -#include <sys/types.h> -#if !defined(_WIN32) -#include <sys/socket.h> -#include <netinet/in.h> -#else -#include <ws2tcpip.h> -#endif -int main(void) { struct sockaddr_in6 six; socket(AF_INET6, SOCK_STREAM, AF_INET6); return 0; } -EOF - _inet6=no - if cc_check $_ld_sock ; then - _inet6=yes - fi -fi -if test "$_inet6" = yes ; then - def_inet6='#define HAVE_AF_INET6 1' -else - def_inet6='#undef HAVE_AF_INET6' -fi -echores "$_inet6" - - -echocheck "gethostbyname2" -if test "$_gethostbyname2" = auto ; then -cat > $TMPC << EOF -#include <sys/types.h> -#include <sys/socket.h> -#include <netdb.h> -int main(void) { gethostbyname2("", AF_INET); return 0; } -EOF - _gethostbyname2=no - if cc_check ; then - _gethostbyname2=yes - fi -fi -if test "$_gethostbyname2" = yes ; then - def_gethostbyname2='#define HAVE_GETHOSTBYNAME2 1' -else - def_gethostbyname2='#undef HAVE_GETHOSTBYNAME2' -fi -echores "$_gethostbyname2" - - echocheck "mman.h" _mman=no statement_check sys/mman.h 'mmap(0, 0, 0, 0, 0, 0)' && _mman=yes @@ -1390,13 +1217,6 @@ else fi echores "$_mman" -_mman_has_map_failed=no -statement_check sys/mman.h 'void *p = MAP_FAILED' && _mman_has_map_failed=yes -if test "$_mman_has_map_failed" = yes ; then - def_mman_has_map_failed='' -else - def_mman_has_map_failed='#define MAP_FAILED ((void *) -1)' -fi echocheck "dynamic loader" _dl=no @@ -1411,8 +1231,6 @@ fi echores "$_dl" -def_threads='#define HAVE_THREADS 0' - echocheck "pthread" if linux ; then THREAD_CFLAGS=-D_REENTRANT @@ -1445,7 +1263,6 @@ fi if test "$_pthreads" = yes ; then test "$_ld_pthread" && res_comment="using $_ld_pthread" def_pthreads='#define HAVE_PTHREADS 1' - def_threads='#define HAVE_THREADS 1' extra_cflags="$extra_cflags $THREAD_CFLAGS" else res_comment="v4l2 disabled" @@ -1454,15 +1271,31 @@ else fi echores "$_pthreads" -if cygwin ; then - if test "$_pthreads" = yes ; then - def_pthread_cache="#define PTHREAD_CACHE 1" - else - _stream_cache=no - def_stream_cache="#undef CONFIG_STREAM_CACHE" - fi +if test "$_pthreads" = yes ; then + +# Cargo-cult for -lrt, which is needed on not so recent glibc version for +# clock_gettime. It's documented as required before before glibc 2.17, which +# was released in december 2012. On newer glibc versions or on other systems, +# this will hopefully do nothing. +echocheck "linking with -lrt" +_rt=no +cc_check "$_ld_pthread -lrt" && _rt=yes +if test "$_rt" = yes ; then + _ld_pthread="$_ld_pthread -lrt" +fi +echores "$_rt" + fi +echocheck "stream cache" +_stream_cache="$_pthreads" +if test "$_stream_cache" = yes ; then + def_stream_cache='#define CONFIG_STREAM_CACHE' +else + def_stream_cache='#undef CONFIG_STREAM_CACHE' +fi +echores "$_stream_cache" + echocheck "rpath" if test "$_rpath" = yes ; then for I in $(echo $extra_ldflags | sed 's/-L//g') ; do @@ -1665,17 +1498,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' @@ -1696,6 +1521,21 @@ else fi +echocheck "libguess support" +if test "$_libguess" = auto ; then + _libguess=no + if pkg_config_add 'libguess >= 1.0' ; then + _libguess=yes + fi +fi +if test "$_libguess" = yes; then + def_libguess="#define CONFIG_LIBGUESS 1" +else + def_libguess="#undef CONFIG_LIBGUESS" +fi +echores "$_libguess" + + echocheck "Samba support (libsmbclient)" if test "$_smb" = yes; then libs_mplayer="$libs_mplayer -lsmbclient" @@ -1717,19 +1557,38 @@ else fi echores "$_smb" -echocheck "libquvi support" -if test "$_libquvi" = auto ; then - _libquvi=no + +echocheck "libquvi 0.4.x support" +if test "$_libquvi4" = auto ; then + _libquvi4=no if pkg_config_add 'libquvi >= 0.4.1' ; then - _libquvi=yes + _libquvi4=yes + fi +fi +if test "$_libquvi4" = yes; then + def_libquvi4="#define CONFIG_LIBQUVI 1" +else + def_libquvi4="#undef CONFIG_LIBQUVI" +fi +echores "$_libquvi4" + +echocheck "libquvi 0.9.x support" +if test "$_libquvi4" = yes ; then + _libquvi9=no + res_comment="using libquvi 0.4.x" +fi +if test "$_libquvi9" = auto ; then + _libquvi9=no + if pkg_config_add 'libquvi-0.9 >= 0.9.0' ; then + _libquvi9=yes fi fi -if test "$_libquvi" = yes; then - def_libquvi="#define CONFIG_LIBQUVI 1" +if test "$_libquvi9" = yes; then + def_libquvi9="#define CONFIG_LIBQUVI9 1" else - def_libquvi="#undef CONFIG_LIBQUVI" + def_libquvi9="#undef CONFIG_LIBQUVI9" fi -echores "$_libquvi" +echores "$_libquvi9" ######### # VIDEO # @@ -1752,6 +1611,7 @@ EOF fi if test "$_cocoa" = yes ; then libs_mplayer="$libs_mplayer -framework IOKit -framework Cocoa -framework OpenGL" + extra_ldflags="$extra_ldflags -fobjc-arc" # needed for OS X 10.7 def_cocoa='#define CONFIG_COCOA 1' else def_cocoa='#undef CONFIG_COCOA' @@ -1786,7 +1646,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 @@ -2206,12 +2066,52 @@ else fi echores "$_dsound" +echocheck "WASAPI" +if test "$_wasapi0" = auto ; then + _wasapi0=no + +cat > $TMPC << EOF +#define COBJMACROS 1 +#define _WIN32_WINNT 0x600 +#include <malloc.h> +#include <stdlib.h> +#include <process.h> +#include <initguid.h> +#include <audioclient.h> +#include <endpointvolume.h> +#include <mmdeviceapi.h> +#include <avrt.h> + const GUID *check1[] = { + &IID_IAudioClient, + &IID_IAudioRenderClient, + &IID_IAudioClient, + &IID_IAudioEndpointVolume, + }; +int main(void) { + return 0; +} +EOF + +if cc_check "-lole32"; then + _wasapi0="yes" +fi + +fi +if test "$_wasapi0" = yes ; then + def_wasapi0='#define CONFIG_WASAPI0 1' + aomodules="wasapi0 $aomodules" + libs_mplayer="$libs_mplayer -lole32" +else + def_wasapi0='#undef CONFIG_WASAPI0' + noaomodules="wasapi0 $noaomodules" +fi +echores "$_wasapi0" fi #if win32; then echocheck "SDL 2.0" -if test "$_sdl2" = auto ; then +if test "$_sdl2" = yes ; then pkg_config_add 'sdl2' && _sdl2=yes fi if test "$_sdl2" = yes ; then @@ -2225,7 +2125,7 @@ else def_sdl2='#undef CONFIG_SDL2' echores "$_sdl2" echocheck "SDL" - if test "$_sdl" = auto ; then + if test "$_sdl" = yes ; then pkg_config_add 'sdl' && _sdl=yes fi if test "$_sdl" = yes ; then @@ -2511,7 +2411,6 @@ fi if test "$_libcdio" = yes ; then _cdda='yes' def_cdda='#define CONFIG_CDDA 1' - test $_cddb = auto && test $networking = yes && _cddb=yes inputmodules="cdda $inputmodules" else _libcdio=no @@ -2521,15 +2420,6 @@ else fi echores "$_libcdio" -if test "$_cddb" = yes ; then - def_cddb='#define CONFIG_CDDB 1' - inputmodules="cddb $inputmodules" -else - _cddb=no - def_cddb='#undef CONFIG_CDDB' - noinputmodules="cddb $noinputmodules" -fi - echocheck "SSA/ASS support" if test "$_ass" = auto ; then @@ -2652,29 +2542,57 @@ echores "yes" _resampler=no +_avresample=no +_avresample_has_set_channel_mapping=no + echocheck "libavresample >= 1.0.0" if test "$_disable_avresample" = no ; then if pkg_config_add "libavresample >= 1.0.0" ; then _resampler=yes + _avresample=yes def_resampler='#define CONFIG_LIBAVRESAMPLE' fi fi echores "$_resampler" +if test "$_avresample" = yes ; then + echocheck "libavresample avresample_set_channel_mapping() API" + statement_check libavresample/avresample.h 'avresample_set_channel_mapping(NULL, NULL)' && _avresample_has_set_channel_mapping=yes + echores "$_avresample_has_set_channel_mapping" +fi + if test "$_resampler" = no ; then - echocheck "libswresample >= 0.15.100" - if pkg_config_add "libswresample >= 0.15.100" ; then + echocheck "libswresample >= 0.17.102" + if pkg_config_add "libswresample >= 0.17.102" ; then _resampler=yes def_resampler='#define CONFIG_LIBSWRESAMPLE' fi echores "$_resampler" fi + if test "$_resampler" = no ; then die "No resampler found. Install libavresample or libswresample (FFmpeg)." fi +if test "$_avresample_has_set_channel_mapping" = yes ; then + def_avresample_has_set_channel_mapping='#define HAVE_AVRESAMPLE_SET_CHANNEL_MAPPING 1' +else + def_avresample_has_set_channel_mapping='#define HAVE_AVRESAMPLE_SET_CHANNEL_MAPPING 0' +fi + + +echocheck "libavcodec AV_CODEC_PROP_TEXT_SUB API" +_avcodec_has_text_flag_api=no +statement_check libavcodec/avcodec.h 'int x = AV_CODEC_PROP_TEXT_SUB' && _avcodec_has_text_flag_api=yes +if test "$_avcodec_has_text_flag_api" = yes ; then + def_avcodec_has_text_flag_api='#define HAVE_AV_CODEC_PROP_TEXT_SUB 1' +else + def_avcodec_has_text_flag_api='#define HAVE_AV_CODEC_PROP_TEXT_SUB 0' +fi +echores "$_avcodec_has_text_flag_api" + echocheck "libavutil QP API" _avutil_has_qp_api=no @@ -2746,6 +2664,31 @@ fi echores "$vf_lavfi" +echocheck "libavutil av_opt_set_int_list() API" +_avutil_has_opt_set_int_list=no +statement_check libavutil/opt.h 'av_opt_set_int_list(0,0,(int*)0,0,0)' && _avutil_has_opt_set_int_list=yes +echores "$_avutil_has_opt_set_int_list" + + +echocheck "using libavfilter through af_lavfi" +if test "$af_lavfi" = auto ; then + af_lavfi=no + if test "$libavfilter" = yes ; then + if test "$_avutil_has_opt_set_int_list" = no ; then + res_comment="libavutil too old" + else + af_lavfi=yes + fi + fi +fi +if test "$af_lavfi" = yes ; then + def_af_lavfi='#define CONFIG_AF_LAVFI 1' +else + def_af_lavfi='#undef CONFIG_AF_LAVFI' +fi +echores "$af_lavfi" + + echocheck "libavdevice >= 54.0.0" if test "$libavdevice" = auto ; then libavdevice=no @@ -2872,40 +2815,6 @@ fi echores "$_pvr" -echocheck "ftp" -if test "$_ftp" = "auto" ; then -test "$networking" = "yes" && _ftp=yes -fi -if test "$_ftp" = yes ; then - def_ftp='#define CONFIG_FTP 1' - inputmodules="ftp $inputmodules" -else - noinputmodules="ftp $noinputmodules" - def_ftp='#undef CONFIG_FTP' -fi -echores "$_ftp" - -echocheck "vstream client" -if test "$_vstream" = auto ; then - _vstream=no - cat > $TMPC <<EOF -#include <vstream-client.h> -void vstream_error(const char *format, ... ) {} -int main(void) { vstream_start(); return 0; } -EOF - cc_check -lvstream-client && _vstream=yes -fi -if test "$_vstream" = yes ; then - def_vstream='#define CONFIG_VSTREAM 1' - inputmodules="vstream $inputmodules" - libs_mplayer="$libs_mplayer -lvstream-client" -else - noinputmodules="vstream $noinputmodules" - def_vstream='#undef CONFIG_VSTREAM' -fi -echores "$_vstream" - - echocheck "encoding" if test "$_encoding" = yes ; then def_encoding="#define CONFIG_ENCODING 1" @@ -2991,16 +2900,6 @@ CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMI # DO NOT ADD ANY TESTS THAT USE LINKER FLAGS HERE (like cc_check). -mak_enable () { -list=$(echo $1 | tr '[a-z]' '[A-Z]') -item=$(echo $2 | tr '[a-z]' '[A-Z]') -nprefix=$3; -for part in $list; do - if $(echo $item | grep -q -E "(^| )$part($| )"); then - echo "${nprefix}_$part = yes" - fi -done -} ############################################################################# echo "Creating config.mak" @@ -3037,19 +2936,13 @@ BUILD_MAN = $_build_man EXESUF = $_exesuf EXESUFS_ALL = .exe -ARCH = $arch -$(mak_enable "$arch_all" "$arch" ARCH) -$(mak_enable "$subarch_all" "$subarch" ARCH) - NEED_GLOB = $need_glob -NEED_SHMEM = $need_shmem # features ALSA = $_alsa AUDIO_INPUT = $_audio_input CACA = $_caca CDDA = $_cdda -CDDB = $_cddb COCOA = $_cocoa COREAUDIO = $_coreaudio COREVIDEO = $_corevideo @@ -3057,10 +2950,9 @@ DIRECT3D = $_direct3d SDL = $_sdl SDL2 = $_sdl2 DSOUND = $_dsound +WASAPI0 = $_wasapi0 DVBIN = $_dvbin DVDREAD = $_dvdread -DXR3 = $_dxr3 -FTP = $_ftp GL = $_gl GL_COCOA = $_gl_cocoa GL_WIN32 = $_gl_win32 @@ -3083,15 +2975,15 @@ LIBPOSTPROC = $libpostproc LIBAVDEVICE = $libavdevice LIBAVFILTER = $libavfilter VF_LAVFI = $vf_lavfi +AF_LAVFI = $af_lavfi LIBSMBCLIENT = $_smb -LIBQUVI = $_libquvi -LIBTHEORA = $_theora +LIBQUVI = $_libquvi4 +LIBQUVI9 = $_libquvi9 +LIBGUESS = $_libguess LIRC = $_lirc -MACOSX_FINDER = $_macosx_finder MACOSX_BUNDLE = $_macosx_bundle MNG = $_mng MPG123 = $_mpg123 -NETWORKING = $networking OPENAL = $_openal OSS = $_ossaudio PE_EXECUTABLE = $_pe_executable @@ -3107,7 +2999,6 @@ TV = $_tv TV_V4L2 = $_tv_v4l2 VCD = $_vcd VDPAU = $_vdpau -VSTREAM = $_vstream X11 = $_x11 WAYLAND = $_wayland XV = $_xv @@ -3125,20 +3016,6 @@ EOF ############################################################################# -ff_config_enable () { -list=$(echo $1 | tr '[a-z]' '[A-Z]') -item=$(echo $2 | tr '[a-z]' '[A-Z]') -_nprefix=$3; -test -z "$_nprefix" && _nprefix='CONFIG' -for part in $list; do - if $(echo $item | grep -q -E "(^| )$part($| )"); then - echo "#define ${_nprefix}_$part 1" - else - echo "#define ${_nprefix}_$part 0" - fi -done -} - echo "Creating config.h" cat > $TMPH << EOF /*---------------------------------------------------------------------------- @@ -3172,15 +3049,12 @@ $def_winsock2_h /* system functions */ -$def_gethostbyname2 $def_glob $def_nanosleep $def_posix_select $def_select $def_setmode $def_shm -$def_sysi86 -$def_sysi86_iv $def_termcap $def_termios @@ -3190,20 +3064,19 @@ $def_dl $def_dos_paths $def_iconv $def_macosx_bundle -$def_macosx_finder $def_priority /* configurable options */ $def_stream_cache -$def_pthread_cache /* CPU stuff */ -#define __CPU__ $iproc $def_ebx_available -$(ff_config_enable "$arch_all" "$arch" "ARCH") -$(ff_config_enable "$subarch_all" "$subarch" "ARCH") + +$def_arch_x86 +$def_arch_x86_32 +$def_arch_x86_64 #define HAVE_MMX ARCH_X86 #define HAVE_MMX2 ARCH_X86 @@ -3215,17 +3088,7 @@ $(ff_config_enable "$subarch_all" "$subarch" "ARCH") #define DEFAULT_CDROM_DEVICE "$default_cdrom_device" #define DEFAULT_DVD_DEVICE "$default_dvd_device" $def_bluray -$def_bsdi_dvd $def_cdda -$def_cddb -$def_cdio -$def_cdrom -$def_dvd -$def_dvd_bsd -$def_dvd_darwin -$def_dvd_linux -$def_dvd_openbsd -$def_dvdio $def_dvdread $def_vcd @@ -3236,10 +3099,12 @@ $def_zlib $def_avutil_has_refcounting $def_avutil_has_qp_api +$def_avcodec_has_text_flag_api $def_libpostproc $def_libavdevice $def_libavfilter $def_vf_lavfi +$def_af_lavfi /* Audio output drivers */ @@ -3276,16 +3141,10 @@ $def_ass $def_enca /* networking */ -$def_closesocket -$def_ftp -$def_inet6 -$def_inet_aton -$def_inet_pton -$def_networking $def_smb -$def_libquvi -$def_socklen_t -$def_vstream +$def_libquvi4 +$def_libquvi9 +$def_libguess $def_lcms2 @@ -3298,6 +3157,7 @@ $def_direct3d $def_sdl $def_sdl2 $def_dsound +$def_wasapi0 $def_dvb $def_dvbin $def_gl @@ -3322,11 +3182,10 @@ $def_xv /* FFmpeg */ $def_encoding $def_resampler +$def_avresample_has_set_channel_mapping $def_fast_64bit $def_pthreads -$def_threads -$def_xform_asm #define HAVE_INLINE_ASM 1 |