diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1160 |
1 files changed, 207 insertions, 953 deletions
@@ -197,7 +197,8 @@ case $(echo -n) in *) _echo_n='-n ' _echo_c= ;; # BSD echo esac -msg_lang_all=$(echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g") +msg_lang_all='' +ls po/*.po >/dev/null 2>&1 && msg_lang_all=$(echo po/*.po | sed -e 's:po/\([^[:space:]]*\)\.po:\1:g') man_lang_all=$(echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g") doc_lang_all=$(echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g") @@ -216,14 +217,13 @@ Installation directories: --mandir=DIR directory for installing man pages [PREFIX/share/man] --confdir=DIR directory for installing configuration files [PREFIX/etc/mplayer] + --localedir=DIR directory for locale tree [PREFIX/share/locale] --libdir=DIR directory for object code libraries [PREFIX/lib] --codecsdir=DIR directory for binary codecs [LIBDIR/codecs] Optional features: --disable-mencoder disable MEncoder (A/V encoder) compilation [enable] --disable-mplayer disable MPlayer compilation [enable] - --enable-gui enable GMPlayer compilation (GTK+ GUI) [disable] - --enable-gtk1 force using GTK 1.2 for the GUI [disable] --disable-largefiles disable support for files > 2GB [enable] --enable-linux-devfs set default devices to devfs [disable] --enable-termcap use termcap database for key codes [autodetect] @@ -277,8 +277,7 @@ Optional features: --disable-vstream disable TiVo vstream client support [autodetect] --disable-pthreads disable Posix threads support [autodetect] --disable-w32threads disable Win32 threads support [autodetect] - --disable-ass-internal disable internal SSA/ASS subtitle support [autodetect] - --disable-ass disable SSA/ASS subtitle support [autodetect] + --disable-ass disable internal SSA/ASS subtitle support [autodetect] --enable-rpath enable runtime linker path for extra libs [disabled] Codecs: @@ -293,25 +292,13 @@ Codecs: --disable-xanim disable XAnim codecs support [enabled] --disable-real disable RealPlayer codecs support [enabled] --disable-xvid disable Xvid [autodetect] - --disable-xvid-lavc disable Xvid in libavcodec [autodetect] --disable-x264 disable x264 [autodetect] - --disable-x264-lavc disable x264 in libavcodec [autodetect] - --disable-libdirac-lavc disable Dirac in libavcodec [autodetect] - --disable-libschroedinger-lavc disable Dirac in libavcodec (Schroedinger - decoder) [autodetect] --disable-libnut disable libnut [autodetect] - --disable-libavutil_a disable static libavutil [autodetect] - --disable-libavcodec_a disable static libavcodec [autodetect] - --disable-libavformat_a disable static libavformat [autodetect] - --disable-libpostproc_a disable static libpostproc [autodetect] - --disable-libswscale_a disable static libswscale [autodetect] - --disable-libavutil_so disable shared libavutil [autodetect] - --disable-libavcodec_so disable shared libavcodec [autodetect] - --disable-libavformat_so disable shared libavformat [autodetect] - --disable-libpostproc_so disable shared libpostproc [autodetect] - --disable-libswscale_so disable shared libswscale [autodetect] - --disable-libavcodec_mpegaudio_hp disable high precision audio decoding - in libavcodec [enabled] + --disable-libavutil disable libavutil [autodetect] + --disable-libavcodec disable libavcodec [autodetect] + --disable-libavformat disable libavformat [autodetect] + --disable-libpostproc disable libpostproc [autodetect] + --disable-libswscale disable libswscale [autodetect] --disable-tremor-internal disable internal Tremor [enabled] --enable-tremor-low enable lower accuracy internal Tremor [disabled] --enable-tremor enable external Tremor [autodetect] @@ -322,13 +309,11 @@ Codecs: --disable-faad-internal disable internal FAAD2 (AAC) [autodetect] --enable-faad-fixed enable fixed-point mode in internal FAAD2 [disabled] --disable-faac disable support for FAAC (AAC encoder) [autodetect] - --disable-faac-lavc disable support for FAAC in libavcodec [autodetect] --disable-ladspa disable LADSPA plugin support [autodetect] --disable-libbs2b disable libbs2b audio filter support [autodetect] --disable-libdv disable libdv 0.9.5 en/decoding support [autodetect] --disable-mad disable libmad (MPEG audio) support [autodetect] --disable-mp3lame disable LAME MP3 encoding support [autodetect] - --disable-mp3lame-lavc disable LAME in libavcodec [autodetect] --disable-toolame disable Toolame (MPEG layer 2) encoding [autodetect] --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect] --enable-xmms enable XMMS input plugin support [disabled] @@ -337,21 +322,6 @@ Codecs: --disable-liba52 disable liba52 [autodetect] --disable-libmpeg2 disable builtin libmpeg2 [autodetect] --disable-musepack disable musepack support [autodetect] - --disable-libopencore_amrnb disable libopencore_amr narrowband [autodetect] - --disable-libopencore_amrwb disable libopencore_amr wideband [autodetect] - --disable-libopenjpeg disable OpenJPEG (JPEG2000) input/output support [autodetect] - --disable-decoder=DECODER disable specified FFmpeg decoder - --enable-decoder=DECODER enable specified FFmpeg decoder - --disable-encoder=ENCODER disable specified FFmpeg encoder - --enable-encoder=ENCODER enable specified FFmpeg encoder - --disable-parser=PARSER disable specified FFmpeg parser - --enable-parser=PARSER enable specified FFmpeg parser - --disable-protocol=PROTO disable specified FFmpeg protocol - --enable-protocol=PROTO enable specified FFmpeg protocol - --disable-demuxer=DEMUXER disable specified FFmpeg demuxer - --enable-demuxer=DEMUXER enable specified FFmpeg demuxer - --disable-muxer=MUXER disable specified FFmpeg muxer - --enable-muxer=MUXER enable specified FFmpeg muxer Video output: --disable-vidix disable VIDIX [for x86 *nix] @@ -415,7 +385,7 @@ Audio output: --disable-esd disable esd audio output [autodetect] --disable-pulse disable Pulseaudio audio output [autodetect] --disable-jack disable JACK audio output [autodetect] - --disable-openal disable OpenAL audio output [autodetect] + --enable-openal enable OpenAL audio output [disable] --disable-nas disable NAS audio output [autodetect] --disable-sgiaudio disable SGI audio output [autodetect] --disable-sunaudio disable Sun audio output [autodetect] @@ -426,18 +396,22 @@ Audio output: --disable-select disable using select() on the audio device [enable] Language options: + --enable-translation enable support for translated output [disable] --charset=charset convert the console messages to this character set --language-doc=lang language to use for the documentation [en] --language-man=lang language to use for the man pages [en] - --language-msg=lang language to use for the messages and the GUI [en] + --language-msg=lang extra languages for program messages [all] --language=lang default language to use [en] Specific options override --language. You can pass a list of languages separated by whitespace or commas instead of a single language. Nonexisting translations -will be dropped from each list. All documentation and man page translations -available in the list will be installed, for the messages the first available -translation will be used. The value "all" will activate all translations. The -LINGUAS environment variable is honored. In all cases the fallback is English. -Available values are: all $msg_lang_all +will be dropped from each list. All translations available in the list will be +installed. The value "all" will activate all translations. The LINGUAS +environment variable is honored. In all cases the fallback is English. +The program always supports English-language output; additional message +languages are only installed if --enable-translation is also specified. +Available values for --language-doc are: all $doc_lang_all +Available values for --language-man are: all $man_lang_all +Available values for --language-msg are: all $msg_lang_all Miscellaneous options: --enable-runtime-cpudetection enable runtime CPU detection [disable] @@ -471,13 +445,13 @@ Advanced options: --enable-neon enable NEON (ARM) [autodetect] --enable-iwmmxt enable iWMMXt (ARM) [autodetect] --disable-fastmemcpy disable 3DNow!/SSE/MMX optimized memcpy [enable] - --enable-hardcoded-tables put tables in binary instead of calculating them at startup [disable] --enable-big-endian force byte order to big-endian [autodetect] --enable-debug[=1-3] compile-in debugging information [disable] --enable-profile compile-in profiling information [disable] --disable-sighandler disable sighandler for crashes [enable] --enable-crash-debug enable automatic gdb attach on crash [disable] --enable-dynamic-plugins enable dynamic A/V plugins [disable] + --ffmpeg-source-dir=PATH enable features requiring internal FFmpeg headers Use these options if autodetection fails: --extra-cflags=FLAGS extra CFLAGS @@ -535,37 +509,13 @@ _yasm=yasm _runtime_cpudetection=no _cross_compile=auto _prefix="/usr/local" -_libavutil_a=auto -_libavutil_so=auto -_libavcodec_a=auto -_libopencore_amrnb=auto -_libopencore_amrwb=auto -libopenjpeg=auto -_libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') -_libavdecoders=$(echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER//) -_libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') -_libavencoders=$(echo $_libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g' -e s/AAC_ENCODER//) -_libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') -_libavparsers=$_libavparsers_all -_libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') -_libavbsfs=$_libavbsfs_all -_libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *\(.*\)).*/\1_hwaccel/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') -# Disable all hardware accelerators for now. -_libavhwaccels= -_libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') -_libavdemuxers=$(echo $_libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//) -_libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') -_libavmuxers=$(echo $_libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER// -e s/RTSP_MUXER//) -_libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') -_libavprotocols=$_libavprotocols_all -_libavcodec_so=auto -_libavformat_a=auto -_libavformat_so=auto -_libpostproc_a=auto -_libpostproc_so=auto -_libswscale_a=auto -_libswscale_so=auto -_libavcodec_mpegaudio_hp=yes +_libavutil=auto +_libavcodec=auto +_libavformat=auto +_libpostproc=auto +_libswscale=auto +_libavcodec_internals=no +_libswscale_internals=no _mencoder=yes _mplayer=yes _x11=auto @@ -613,12 +563,11 @@ _pulse=auto _jack=auto _kai=auto _dart=auto -_openal=auto +_openal=no _libcdio=auto _liblzo=auto _mad=auto _mp3lame=auto -_mp3lame_lavc=auto _toolame=auto _twolame=auto _tremor=auto @@ -635,7 +584,6 @@ _faad=auto _faad_internal=auto _faad_fixed=no _faac=auto -_faac_lavc=auto _ladspa=auto _libbs2b=auto _xmms=no @@ -661,7 +609,6 @@ _sgiaudio=auto _sunaudio=auto _alsa=auto _fastmemcpy=yes -hardcoded_tables=no _unrar_exec=auto _win32dll=auto _select=yes @@ -678,9 +625,6 @@ _tv_dshow=auto _pvr=auto _network=yes _winsock2_h=auto -_struct_addrinfo=auto -_getaddrinfo=auto -_struct_sockaddr_storage=auto _smb=auto _vidix=auto _vidix_pcidb=yes @@ -688,11 +632,7 @@ _dhahelper=no _svgalib_helper=no _joystick=no _xvid=auto -_xvid_lavc=auto _x264=auto -_x264_lavc=auto -_libdirac_lavc=auto -_libschroedinger_lavc=auto _libnut=auto _lirc=auto _lircc=auto @@ -716,6 +656,7 @@ _largefiles=yes #language=en _shm=auto _linux_devfs=no +_translation=no _charset="UTF-8" _dynamic_plugins=no _crash_debug=no @@ -748,7 +689,6 @@ _vstream=auto _pthreads=auto _w32threads=auto _ass=auto -ass_internal=yes _rpath=no _asmalign_pot=auto _stream_cache=yes @@ -784,6 +724,9 @@ for ac_option do --codecsdir=*) _codecsdir=$(echo $ac_option | cut -d '=' -f 2) ;; + --localedir=*) + _localedir=$(echo $ac_option | cut -d '=' -f 2) + ;; --with-install=*) _install=$(echo $ac_option | cut -d '=' -f 2 ) @@ -812,10 +755,10 @@ for ac_option do ;; --extra-cflags=*) - extra_cflags=$(echo $ac_option | cut -d '=' -f 2-) + extra_cflags="$extra_cflags $(echo $ac_option | cut -d '=' -f 2-)" ;; --extra-ldflags=*) - extra_ldflags=$(echo $ac_option | cut -d '=' -f 2-) + extra_ldflags="$extra_ldflags $(echo $ac_option | cut -d '=' -f 2-)" ;; --extra-libs=*) extra_libs=$(echo $ac_option | cut -d '=' -f 2) @@ -891,6 +834,8 @@ for ac_option do --disable-debug) _debug= ;; + --enable-translation) _translation=yes ;; + --disable-translation) _translation=no ;; --enable-runtime-cpudetection) _runtime_cpudetection=yes ;; --disable-runtime-cpudetection) _runtime_cpudetection=no ;; --enable-cross-compile) _cross_compile=yes ;; @@ -931,8 +876,6 @@ for ac_option do --disable-mng) _mng=no ;; --enable-jpeg) _jpeg=yes ;; --disable-jpeg) _jpeg=no ;; - --enable-libopenjpeg) libopenjpeg=yes ;; - --disable-libopenjpeg)libopenjpeg=no ;; --enable-pnm) _pnm=yes ;; --disable-pnm) _pnm=no ;; --enable-md5sum) _md5sum=yes ;; @@ -997,8 +940,6 @@ for ac_option do --disable-mad) _mad=no ;; --enable-mp3lame) _mp3lame=yes ;; --disable-mp3lame) _mp3lame=no ;; - --enable-mp3lame-lavc) _mp3lame_lavc=yes ;; - --disable-mp3lame-lavc) _mp3lame_lavc=no ;; --enable-toolame) _toolame=yes ;; --disable-toolame) _toolame=no ;; --enable-twolame) _twolame=yes ;; @@ -1037,8 +978,6 @@ for ac_option do --disable-faad-fixed) _faad_fixed=no ;; --enable-faac) _faac=yes ;; --disable-faac) _faac=no ;; - --enable-faac-lavc) _faac_lavc=yes ;; - --disable-faac-lavc) _faac_lavc=no ;; --enable-ladspa) _ladspa=yes ;; --disable-ladspa) _ladspa=no ;; --enable-libbs2b) _libbs2b=yes ;; @@ -1105,8 +1044,6 @@ for ac_option do --disable-pvr) _pvr=no ;; --enable-fastmemcpy) _fastmemcpy=yes ;; --disable-fastmemcpy) _fastmemcpy=no ;; - --enable-hardcoded-tables) hardcoded_tables=yes ;; - --disable-hardcoded-tables) hardcoded_tables=no ;; --enable-network) _network=yes ;; --disable-network) _network=no ;; --enable-winsock2_h) _winsock2_h=yes ;; @@ -1127,56 +1064,22 @@ for ac_option do --disable-joystick) _joystick=no ;; --enable-xvid) _xvid=yes ;; --disable-xvid) _xvid=no ;; - --enable-xvid-lavc) _xvid_lavc=yes ;; - --disable-xvid-lavc) _xvid_lavc=no ;; --enable-x264) _x264=yes ;; --disable-x264) _x264=no ;; - --enable-x264-lavc) _x264_lavc=yes ;; - --disable-x264-lavc) _x264_lavc=no ;; - --enable-libdirac-lavc) _libdirac_lavc=yes ;; - --disable-libdirac-lavc) _libdirac_lavc=no ;; - --enable-libschroedinger-lavc) _libschroedinger_lavc=yes ;; - --disable-libschroedinger-lavc) _libschroedinger_lavc=no ;; --enable-libnut) _libnut=yes ;; --disable-libnut) _libnut=no ;; - --enable-libavutil_a) _libavutil_a=yes ;; - --disable-libavutil_a) _libavutil_a=no ;; - --enable-libavutil_so) _libavutil_so=yes ;; - --disable-libavutil_so) _libavutil_so=no ;; - --enable-libavcodec_a) _libavcodec_a=yes ;; - --disable-libavcodec_a) _libavcodec_a=no ;; - --enable-libavcodec_so) _libavcodec_so=yes ;; - --disable-libavcodec_so) _libavcodec_so=no ;; - --enable-libopencore_amrnb) _libopencore_amrnb=yes ;; - --disable-libopencore_amrnb) _libopencore_amrnb=no ;; - --enable-libopencore_amrwb) _libopencore_amrwb=yes ;; - --disable-libopencore_amrwb) _libopencore_amrwb=no ;; - --enable-decoder=*) _libavdecoders="$_libavdecoders $(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')" ;; - --disable-decoder=*) _libavdecoders=$(echo $_libavdecoders | sed "s/$(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')//g") ;; - --enable-encoder=*) _libavencoders="$_libavencoders $(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')" ;; - --disable-encoder=*) _libavencoders=$(echo $_libavencoders | sed "s/$(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')//g") ;; - --enable-parser=*) _libavparsers="$_libavparsers $(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')" ;; - --disable-parser=*) _libavparsers=$(echo $_libavparsers | sed "s/$(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')//g") ;; - --enable-protocol=*) _libavprotocols="$_libavprotocols $(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')" ;; - --disable-protocol=*) _libavprotocols=$(echo $_libavprotocols | sed "s/$(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')//g") ;; - --enable-demuxer=*) _libavdemuxers="$_libavdemuxers $(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')" ;; - --disable-demuxer=*) _libavdemuxers=$(echo $_libavdemuxers | sed "s/$(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')//g") ;; - --enable-muxer=*) _libavmuxers="$_libavmuxers $(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')" ;; - --disable-muxer=*) _libavmuxers=$(echo $_libavmuxers | sed "s/$(echo $ac_option | cut -d '=' -f 2 | tr '[a-z]' '[A-Z]')//g") ;; - --enable-libavformat_a) _libavformat_a=yes ;; - --disable-libavformat_a) _libavformat_a=no ;; - --enable-libavformat_so) _libavformat_so=yes ;; - --disable-libavformat_so) _libavformat_so=no ;; - --enable-libpostproc_a) _libpostproc_a=yes ;; - --disable-libpostproc_a) _libpostproc_a=no ;; - --enable-libpostproc_so) _libpostproc_so=yes ;; - --disable-libpostproc_so) _libpostproc_so=no ;; - --enable-libswscale_a) _libswscale_a=yes ;; - --disable-libswscale_a) _libswscale_a=no ;; - --enable-libswscale_so) _libswscale_so=yes ;; - --disable-libswscale_so) _libswscale_so=no ;; - --enable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=yes ;; - --disable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=no ;; + --enable-libavutil) _libavutil=yes ;; + --disable-libavutil) _libavutil=no ;; + --enable-libavcodec) _libavcodec=yes ;; + --disable-libavcodec) _libavcodec=no ;; + --enable-libavformat) _libavformat=yes ;; + --disable-libavformat) _libavformat=no ;; + --enable-libpostproc) _libpostproc=yes ;; + --disable-libpostproc) _libpostproc=no ;; + --enable-libswscale) _libswscale=yes ;; + --disable-libswscale) _libswscale=no ;; + --ffmpeg-source-dir=*) + _ffmpeg_source=$(echo $ac_option | cut -d '=' -f 2 ) ;; --enable-lirc) _lirc=yes ;; --disable-lirc) _lirc=no ;; @@ -1248,8 +1151,6 @@ for ac_option do --disable-w32threads) _w32threads=no ;; --enable-ass) _ass=yes ;; --disable-ass) _ass=no ;; - --enable-ass-internal) ass_internal=yes ;; - --disable-ass-internal) ass_internal=no ;; --enable-rpath) _rpath=yes ;; --disable-rpath) _rpath=no ;; @@ -1344,12 +1245,18 @@ for ac_option do esac done +if test "$_gui" = yes ; then + die "Internal GUI was removed from MPlayer. Please use one of many available\n frontends\ + (http://www.mplayerhq.hu/design7/projects.html#mplayer_frontends)." +fi + # Atmos: moved this here, to be correct, if --prefix is specified test -z "$_bindir" && _bindir="$_prefix/bin" test -z "$_datadir" && _datadir="$_prefix/share/mplayer" test -z "$_mandir" && _mandir="$_prefix/share/man" test -z "$_confdir" && _confdir="$_prefix/etc/mplayer" test -z "$_libdir" && _libdir="$_prefix/lib" +test -z "$_localedir" && _localedir="$_prefix/share/locale" # Determine our OS name and CPU architecture if test -z "$_target" ; then @@ -1664,12 +1571,6 @@ elif x86; then _cpuinfo="./cpuinfo$_exesuf" fi -if [ "$cc_vendor" = "gnu" ] && [ "$_cc_major" = 2 ] ; then - test $_sse = auto && _sse=no - test $_win32dll = auto && _win32dll=no - ass_internal=no -fi - if x86 ; then # gather more CPU information pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1) @@ -1760,8 +1661,6 @@ fi def_fast_64bit='#define HAVE_FAST_64BIT 0' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0' -def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0' -def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 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' case "$host_arch" in @@ -1769,8 +1668,6 @@ case "$host_arch" in arch='x86' subarch='x86_32' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' - def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' - def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' iproc=486 proc=i486 @@ -2157,8 +2054,6 @@ EOF arch='ppc' def_dcbzl='#define HAVE_DCBZL 0' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' - def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' - def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' iproc='ppc' if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then @@ -2272,6 +2167,7 @@ EOF alpha*) arch='alpha' iproc='alpha' + def_fast_64bit='#define HAVE_FAST_64BIT 1' echocheck "CPU type" cat > $TMPC << EOF @@ -2414,12 +2310,10 @@ if test "$_big_endian" = yes ; then _byte_order='big-endian' def_words_endian='#define WORDS_BIGENDIAN 1' def_bigendian='#define HAVE_BIGENDIAN 1' - def_av_bigendian='#define AV_HAVE_BIGENDIAN 1' else _byte_order='little-endian' def_words_endian='#undef WORDS_BIGENDIAN' def_bigendian='#define HAVE_BIGENDIAN 0' - def_av_bigendian='#define AV_HAVE_BIGENDIAN 0' fi echores "$_byte_order" @@ -2467,8 +2361,8 @@ cat > $TMPC << EOF __attribute__((noinline)) static int foo3(int i1, int i2, int i3) { return i3; } int main(void) { return foo3(1,2,3) == 3 ? 0 : 1; } EOF - cc_check -O4 -mstackrealign && tmp_run && cflags_stackrealign=-mstackrealign - test -z "$cflags_stackrealign" && cc_check -O4 -mstackrealign -fno-unit-at-a-time \ + cc_check -O2 -mstackrealign && tmp_run && cflags_stackrealign=-mstackrealign + test -z "$cflags_stackrealign" && cc_check -O2 -mstackrealign -fno-unit-at-a-time \ && tmp_run && cflags_stackrealign="-mstackrealign -fno-unit-at-a-time" test -n "$cflags_stackrealign" && echores "yes" || echores "no" fi # if darwin && test "$cc_vendor" = "gnu" ; then @@ -2487,7 +2381,7 @@ elif test -z "$CFLAGS" ; then elif test "$cc_vendor" != "gnu" ; then CFLAGS="-O2 $_march $_mcpu $_pipe" else - CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" + CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O2 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" extra_ldflags="$extra_ldflags -ffast-math" fi else @@ -2499,7 +2393,6 @@ int main(void) { return 0; } EOF if test "$cc_vendor" = "gnu" ; then cc_check -std=gnu99 && CFLAGS="-std=gnu99 $CFLAGS" - cc_check -Wdeclaration-after-statement && CFLAGS="-Wdeclaration-after-statement $CFLAGS" cc_check -Wno-pointer-sign && CFLAGS="-Wno-pointer-sign $CFLAGS" cc_check -Wdisabled-optimization && CFLAGS="-Wdisabled-optimization $CFLAGS" cc_check -Wundef && CFLAGS="-Wundef $CFLAGS" @@ -2913,19 +2806,31 @@ fi echores "$_langinfo" +echocheck "translation support" +if test "$_translation" = yes; then + def_translation="#define CONFIG_TRANSLATION 1" +else + def_translation="#undef CONFIG_TRANSLATION" +fi +echores "$_translation" + echocheck "language" # Set preferred languages, "all" uses English as main language. test -z "$language" && language=$LINGUAS test -z "$language_doc" && language_doc=$language test -z "$language_man" && language_man=$language -test -z "$language_msg" && language_msg=$language +test -z "$language_msg" && language_msg="all" language_doc=$(echo $language_doc | tr , " ") language_man=$(echo $language_man | tr , " ") language_msg=$(echo $language_msg | tr , " ") test "$language_doc" = "all" && language_doc=$doc_lang_all test "$language_man" = "all" && language_man=$man_lang_all -test "$language_msg" = "all" && language_msg=en +test "$language_msg" = "all" && language_msg=$msg_lang_all + +if test "$_translation" != yes ; then + language_msg="" +fi # Prune non-existing translations from language lists. # Set message translation to the first available language. @@ -2943,12 +2848,11 @@ language_man=$tmp_language_man test -z "$language_man" && language_man=en for lang in $language_msg ; do - test -f "help/help_mp-${lang}.h" && tmp_language_msg=$lang && break + test -f po/$lang.po && tmp_language_msg="$tmp_language_msg $lang" done language_msg=$tmp_language_msg -test -z "$language_msg" && language_msg=en -_mp_help="help/help_mp-${language_msg}.h" -echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc" + +echores "messages (en+): $language_msg - man pages: $language_man - documentation: $language_doc" echocheck "enable sighandler" @@ -3038,7 +2942,7 @@ if test "$_posix4" = yes ; then fi echores "$_posix4" -for func in exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf truncf; do +for func in exp2 exp2f llrint log2 log2f lrint lrintf round roundf truncf; do echocheck $func cat > $TMPC << EOF #include <math.h> @@ -3115,129 +3019,11 @@ echores "$_socklib" if test $_winsock2_h = yes ; then _ld_sock="-lws2_32" def_winsock2_h='#define HAVE_WINSOCK2_H 1' - cc_check_winsock2_h='-DHAVE_WINSOCK2_H=1' else def_winsock2_h='#define HAVE_WINSOCK2_H 0' - cc_check_winsock2_h='-DHAVE_WINSOCK2_H=0' -fi - - -echocheck "netdb.h, struct addrinfo" -if test "$_struct_addrinfo" = auto; then - _struct_addrinfo=no - cat > $TMPC << EOF -#if HAVE_WINSOCK2_H -#include <winsock2.h> -#include <ws2tcpip.h> -#else -#include <sys/types.h> -#include <sys/socket.h> -#include <netdb.h> -#endif -int main(void) { struct addrinfo ai; return 0; } -EOF - cc_check $cc_check_winsock2_h && _struct_addrinfo=yes -fi -echores "$_struct_addrinfo" - -if test "$_struct_addrinfo" = yes; then - def_addrinfo="#define HAVE_STRUCT_ADDRINFO 1" -else - def_addrinfo="#define HAVE_STRUCT_ADDRINFO 0" -fi - - -echocheck "netdb.h, getaddrinfo()" -if test "$_getaddrinfo" = auto; then - _getaddrinfo=no - cat > $TMPC << EOF -#if HAVE_WINSOCK2_H -#include <winsock2.h> -#else -#include <sys/types.h> -#include <sys/socket.h> -#include <netdb.h> -#endif -int main(void) { (void) getaddrinfo(0, 0, 0, 0); return 0; } -EOF - cc_check $cc_check_winsock2_h && _getaddrinfo=yes -fi -echores "$_getaddrinfo" - -if test "$_getaddrinfo" = yes; then - def_getaddrinfo="#define HAVE_GETADDRINFO 1" -else - def_getaddrinfo="#define HAVE_GETADDRINFO 0" fi -echocheck "sockaddr_storage" -if test "$_struct_sockaddr_storage" = auto; then - _struct_sockaddr_storage=no - cat > $TMPC << EOF -#if HAVE_WINSOCK2_H -#include <winsock2.h> -#else -#include <sys/socket.h> -#endif -int main(void) { struct sockaddr_storage sas; return 0; } -EOF - cc_check $cc_check_winsock2_h && _struct_sockaddr_storage=yes -fi -echores "$_struct_sockaddr_storage" - -if test "$_struct_sockaddr_storage" = yes; then - def_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 1" -else - def_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 0" -fi - - -echocheck "struct ipv6_mreq" -_struct_ipv6_mreq=no -def_struct_ipv6_mreq="#define HAVE_STRUCT_IPV6_MREQ 0" -for header in "netinet/in.h" "ws2tcpip.h" ; do - cat > $TMPC << EOF -#include <$header> -int main(void) { struct ipv6_mreq mreq6; return 0; } -EOF - cc_check && _struct_ipv6_mreq=yes && \ - def_struct_ipv6_mreq="#define HAVE_STRUCT_IPV6_MREQ 1" && break -done -echores "$_struct_ipv6_mreq" - - -echocheck "struct sockaddr_in6" -_struct_sockaddr_in6=no -def_struct_sockaddr_in6="#define HAVE_STRUCT_SOCKADDR_IN6 0" -for header in "netinet/in.h" "ws2tcpip.h" ; do - cat > $TMPC << EOF -#include <$header> -int main(void) { struct sockaddr_in6 addr; return 0; } -EOF - cc_check && _struct_sockaddr_in6=yes && \ - def_struct_sockaddr_in6="#define HAVE_STRUCT_SOCKADDR_IN6 1" && break -done -echores "$_struct_sockaddr_in6" - - -echocheck "struct sockaddr sa_len" -_struct_sockaddr_sa_len=no -def_struct_sockaddr_sa_len="#define HAVE_STRUCT_SOCKADDR_SA_LEN 0" -cat > $TMPC << EOF -#if HAVE_WINSOCK2_H -#include <winsock2.h> -#else -#include <sys/types.h> -#include <sys/socket.h> -#endif -int main(void) { const void *p = &((struct sockaddr *)0)->sa_len; return 0; } -EOF -cc_check $cc_check_winsock2_h && _struct_sockaddr_sa_len=yes && \ - def_struct_sockaddr_sa_len="#define HAVE_STRUCT_SOCKADDR_SA_LEN 1" -echores "$_struct_sockaddr_sa_len" - - echocheck "arpa/inet.h" arpa_inet_h=no def_arpa_inet_h='#define HAVE_ARPA_INET_H 0' @@ -3330,8 +3116,6 @@ else _noinputmodules="network $_noinputmodules" def_network='#undef CONFIG_NETWORK' _ftp=no - _libavprotocols=$(echo $_libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL//) - _libavdemuxers=$(echo $_libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//) fi echores "$_network" @@ -3499,16 +3283,6 @@ fi echores "$_fastmemcpy" -echocheck "hard-coded tables" -if test "$hardcoded_tables" = yes ; then - def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 1' - mak_hardcoded_tables='CONFIG_HARDCODED_TABLES = yes' -else - def_hardcoded_tables='#define CONFIG_HARDCODED_TABLES 0' -fi -echores "$hardcoded_tables" - - echocheck "mman.h" cat > $TMPC << EOF #include <sys/types.h> @@ -4531,7 +4305,6 @@ if test "$_xvmc" = yes ; then else def_xvmc='#define CONFIG_XVMC 0' novomodules="xvmc $novomodules" - _libavdecoders=$(echo $_libavdecoders | sed -e s/MPEG_XVMC_DECODER//) fi echores "$_xvmc" @@ -4556,7 +4329,6 @@ if test "$_vdpau" = yes ; then else def_vdpau='#define CONFIG_VDPAU 0' novomodules="vdpau $novomodules" - _libavdecoders=$(echo $_libavdecoders | sed -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER// -e s/H264_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER// -e s/MPEG4_VDPAU_DECODER//) fi echores "$_vdpau" @@ -4769,35 +4541,6 @@ else novomodules="xvidix $novomodules" fi -echocheck "/dev/mga_vid" -if test "$_mga" = auto ; then - _mga=no - test -c /dev/mga_vid && _mga=yes -fi -if test "$_mga" = yes ; then - def_mga='#define CONFIG_MGA 1' - vomodules="mga $vomodules" -else - def_mga='#undef CONFIG_MGA' - novomodules="mga $novomodules" -fi -echores "$_mga" - -echocheck "xmga" -if test "$_xmga" = auto ; then - _xmga=no - test "$_x11" = yes && test "$_mga" = yes && _xmga=yes -fi -if test "$_xmga" = yes ; then - def_xmga='#define CONFIG_XMGA 1' - vomodules="xmga $vomodules" -else - def_xmga='#undef CONFIG_XMGA' - novomodules="xmga $novomodules" -fi -echores "$_xmga" - - echocheck "GGI" if test "$_ggi" = auto ; then cat > $TMPC << EOF @@ -5119,28 +4862,6 @@ else fi -echocheck "OpenJPEG (JPEG2000) support" -if test "$libopenjpeg" = auto ; then - libopenjpeg=no -cat > $TMPC << EOF -#define OPJ_STATIC -#include <openjpeg.h> -int main(void) { opj_dparameters_t dec_params; opj_set_default_decoder_parameters(&dec_params); return 0; } -EOF - cc_check -lopenjpeg $_ld_lm && libopenjpeg=yes -fi -echores "$libopenjpeg" -if test "$libopenjpeg" = yes ; then - def_libopenjpeg='#define CONFIG_LIBOPENJPEG 1' - extra_ldflags="$extra_ldflags -lopenjpeg" - _libavdecoders="$_libavdecoders LIBOPENJPEG_DECODER" - _libavencoders="$_libavencoders LIBOPENJPEG_ENCODER" - codecmodules="OpenJPEG $codecmodules" -else - def_libopenjpeg='#define CONFIG_LIBOPENJPEG 0' - nocodecmodules="OpenJPEG $nocodecmodules" -fi - echocheck "PNM support" if test "$_pnm" = yes; then @@ -5673,6 +5394,15 @@ EOF cc_check && _real_ossaudio=yes if test "$_real_ossaudio" = yes; then def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' + # Check for OSS4 headers (override default headers) + # Does not apply to systems where OSS4 is native (e.g. FreeBSD) + if test -f /etc/oss.conf; then + . /etc/oss.conf + _ossinc="$OSSLIBDIR/include" + if test -f "$_ossinc/sys/soundcard.h"; then + extra_cflags="-I$_ossinc $extra_cflags" + fi + fi elif netbsd || openbsd ; then def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"' extra_ldflags="$extra_ldflags -lossaudio" @@ -6141,6 +5871,9 @@ echores "$_vcd" echocheck "dvdread" +if test "$_dvdread_internal" = auto && test ! -f "libdvdread4/dvd_reader.c" ; then + _dvdread_internal=no +fi if test "$_dvdread_internal" = auto ; then _dvdread_internal=no _dvdread=no @@ -6395,42 +6128,19 @@ echores "$_fontconfig" echocheck "SSA/ASS support" -# libass depends on FreeType -if test "$_freetype" = no ; then - _ass=no - ass_internal=no - res_comment="FreeType support needed" -fi - -if test "$_ass" = auto ; then - cat > $TMPC << EOF -#include <ft2build.h> -#include FT_FREETYPE_H -#if ((FREETYPE_MAJOR < 2) || (FREETYPE_MINOR < 2) || ((FREETYPE_MINOR == 2) && (FREETYPE_PATCH < 1))) -#error "Need FreeType 2.2.1 or newer" -#endif -int main(void) { return 0; } -EOF - _ass=no - cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes - if test "$_ass" = no ; then - ass_internal=no - res_comment="FreeType >= 2.2.1 needed" - elif test "$ass_internal" = no ; then - res_comment="external" - extra_ldflags="$extra_ldflags -lass" - fi -fi -if test "$_ass" = yes ; then - def_ass='#define CONFIG_ASS 1' +if test "$_ass" = auto -o "$_ass" = yes ; then + if $_pkg_config libass; then + _ass=yes + def_ass='#define CONFIG_ASS 1' + extra_ldflags="$extra_ldflags $($_pkg_config --libs libass)" + extra_cflags="$extra_cflags $($_pkg_config --cflags libass)" + else + _ass=no + def_ass='#undef CONFIG_ASS' + fi else def_ass='#undef CONFIG_ASS' fi -if test "$ass_internal" = yes ; then - def_ass_internal='#define CONFIG_ASS_INTERNAL 1' -else - def_ass_internal='#undef CONFIG_ASS_INTERNAL' -fi echores "$_ass" @@ -6509,8 +6219,6 @@ if test "$_zlib" = yes ; then extra_ldflags="$extra_ldflags -lz" else def_zlib='#define CONFIG_ZLIB 0' - _libavdecoders=$(echo $_libavdecoders | sed -e s/FLASHSV_DECODER// -e s/PNG_DECODER// -e s/ZMBV_DECODER// -e s/ZLIB_DECODER// -e s/DXA_DECODER// -e s/TSCC_DECODER//) - _libavencoders=$(echo $_libavencoders | sed -e s/FLASHSV_ENCODER// -e s/PNG_ENCODER// -e s/ZMBV_ENCODER// -e s/ZLIB_ENCODER//) fi echores "$_zlib" @@ -6889,20 +6597,11 @@ EOF fi if test "$_faac" = yes ; then def_faac="#define CONFIG_FAAC 1" - test "$_faac_lavc" = auto && _faac_lavc=yes - if test "$_faac_lavc" = yes ; then - def_faac_lavc="#define CONFIG_LIBFAAC 1" - libs_mplayer="$libs_mplayer $_ld_faac" - _libavencoders="$_libavencode |