diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 902 |
1 files changed, 161 insertions, 741 deletions
@@ -225,8 +225,6 @@ Installation directories: 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] @@ -280,8 +278,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: @@ -296,25 +293,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] @@ -325,13 +310,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] @@ -341,21 +324,6 @@ Codecs: --disable-liba52-internal disable builtin 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] @@ -420,7 +388,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] @@ -433,7 +401,7 @@ Language options: --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 language to use for the messages [en] --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 @@ -481,6 +449,7 @@ Advanced options: --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 @@ -538,34 +507,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 -_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/RTSP_DEMUXER// -e s/SDP_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//) -_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 +561,11 @@ _esd=auto _pulse=auto _jack=auto _dart=auto -_openal=auto +_openal=no _libcdio=auto _liblzo=auto _mad=auto _mp3lame=auto -_mp3lame_lavc=auto _toolame=auto _twolame=auto _tremor=auto @@ -636,7 +583,6 @@ _faad=auto _faad_internal=auto _faad_fixed=no _faac=auto -_faac_lavc=auto _ladspa=auto _libbs2b=auto _xmms=no @@ -685,11 +631,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 @@ -746,7 +688,6 @@ _vstream=auto _pthreads=auto _w32threads=auto _ass=auto -ass_internal=yes _rpath=no _asmalign_pot=auto _stream_cache=yes @@ -822,10 +763,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) @@ -941,8 +882,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 ;; @@ -1007,8 +946,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 ;; @@ -1049,8 +986,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 ;; @@ -1137,56 +1072,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 ;; @@ -1258,8 +1159,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 ;; @@ -1352,6 +1251,11 @@ 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" @@ -2241,6 +2145,7 @@ EOF _arch='ALPHA' _target_arch='ARCH_ALPHA = yes' iproc='alpha' + def_fast_64bit='#define HAVE_FAST_64BIT 1' echocheck "CPU type" cat > $TMPC << EOF @@ -2436,8 +2341,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 @@ -2454,7 +2359,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 @@ -2466,7 +2371,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" @@ -4355,7 +4259,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" @@ -4366,21 +4269,17 @@ if test "$_vdpau" = auto ; then if test "$_dl" = yes ; then cat > $TMPC <<EOF #include <vdpau/vdpau_x11.h> -int main(void) { - (void) vdp_device_create_x11(0, 0, 0, 0); - return VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1; } +int main(void) {return VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE;} EOF - cc_check -lvdpau && _vdpau=yes + cc_check && _vdpau=yes fi fi if test "$_vdpau" = yes ; then def_vdpau='#define CONFIG_VDPAU 1' - libs_mplayer="$libs_mplayer -lvdpau" _vomodules="vdpau $_vomodules" 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" @@ -4593,35 +4492,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 @@ -5059,28 +4929,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 @@ -5513,6 +5361,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" @@ -5961,6 +5818,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 @@ -6212,42 +6072,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 < 1) || ((FREETYPE_MINOR == 1) && (FREETYPE_PATCH < 8))) -#error "Need FreeType 2.1.8 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.1.8 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" @@ -6326,8 +6163,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" @@ -6709,25 +6544,16 @@ int main(void) { unsigned long x, y; faacEncOpen(48000, 2, &x, &y); return 0; } EOF _faac=no for _ld_faac in "-lfaac" "-lfaac -lmp4v2 -lstdc++" ; do - cc_check -O4 $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break + cc_check -O2 $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break done 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="$_libavencoders LIBFAAC_ENCODER" - fi _codecmodules="faac $_codecmodules" else - _faac_lavc=no def_faac="#undef CONFIG_FAAC" - def_faac_lavc="#define CONFIG_LIBFAAC 0" _nocodecmodules="faac $_nocodecmodules" fi -_res_comment="in libavcodec: $_faac_lavc" echores "$_faac" @@ -7028,15 +6854,8 @@ echores "$_live" echocheck "FFmpeg libavutil" -if test "$_libavutil_a" = auto ; then - if test -d libavutil ; then - _libavutil_a=yes - _res_comment="static" - else - die "MPlayer will not compile without libavutil in the source tree." - fi -elif test "$_libavutil_so" = auto ; then - _libavutil_so=no +if test "$_libavutil" = auto ; then + _libavutil=no cat > $TMPC << EOF #include <libavutil/common.h> int main(void) { av_gcd(1,1); return 0; } @@ -7044,38 +6863,24 @@ EOF if $_pkg_config --exists libavutil ; then _inc_libavutil=$($_pkg_config --cflags libavutil) _ld_tmp=$($_pkg_config --libs libavutil) - cc_check $_inc_libavutil $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \ - && _libavutil_so=yes + cc_check $_inc_libavutil $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" extra_cflags="$extra_cflags $_inc_libavutil" \ + && _libavutil=yes elif cc_check -lavutil $_ld_lm ; then extra_ldflags="$extra_ldflags -lavutil" - _libavutil_so=yes - _res_comment="using libavutil.so, but static libavutil is recommended" + _libavutil=yes fi fi -_libavutil=no def_libavutil='#undef CONFIG_LIBAVUTIL' -def_libavutil_a='#undef CONFIG_LIBAVUTIL_A' -def_libavutil_so='#undef CONFIG_LIBAVUTIL_SO' -test "$_libavutil_a" = yes || test "$_libavutil_so" = yes && _libavutil=yes test "$_libavutil" = yes && def_libavutil='#define CONFIG_LIBAVUTIL 1' -test "$_libavutil_a" = yes && def_libavutil_a='#define CONFIG_LIBAVUTIL_A 1' -test "$_libavutil_so" = yes && def_libavutil_so='#define CONFIG_LIBAVUTIL_SO 1' -# neither static nor shared libavutil is available, but it is mandatory ... +# libavutil is not available, but it is mandatory ... if test "$_libavutil" = no ; then - die "You need static or shared libavutil, MPlayer will not compile without!" + die "You need libavutil, MPlayer will not compile without!" fi echores "$_libavutil" echocheck "FFmpeg libavcodec" -if test "$_libavcodec_a" = auto ; then - _libavcodec_a=no - if test -d libavcodec && test -f libavcodec/utils.c ; then - _libavcodec_a="yes" - _res_comment="static" - fi -elif test "$_libavcodec_so" = auto ; then - _libavcodec_so=no - _res_comment="libavcodec.so is discouraged over static libavcodec" +if test "$_libavcodec" = auto ; then + _libavcodec=no cat > $TMPC << EOF #include <libavcodec/avcodec.h> int main(void) { avcodec_find_encoder_by_name(""); return 0; } @@ -7083,42 +6888,25 @@ EOF if $_pkg_config --exists libavcodec ; then _inc_libavcodec=$($_pkg_config --cflags libavcodec) _ld_tmp=$($_pkg_config --libs libavcodec) - cc_check $_inc_libavcodec $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \ - && _libavcodec_so=yes + cc_check $_inc_libavcodec $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" && extra_cflags="$extra_cflags $_inc_libavcodec" \ + && _libavcodec=yes elif cc_check -lavcodec $_ld_lm ; then extra_ldflags="$extra_ldflags -lavcodec" - _libavcodec_so=yes - _res_comment="using libavcodec.so, but static libavcodec is recommended" + _libavcodec=yes fi fi -_libavcodec=no def_libavcodec='#undef CONFIG_LIBAVCODEC' -def_libavcodec_a='#undef CONFIG_LIBAVCODEC_A' -def_libavcodec_so='#undef CONFIG_LIBAVCODEC_SO' -test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes test "$_libavcodec" = yes && def_libavcodec='#define CONFIG_LIBAVCODEC 1' -test "$_libavcodec_a" = yes && def_libavcodec_a='#define CONFIG_LIBAVCODEC_A 1' -test "$_libavcodec_so" = yes && def_libavcodec_so='#define CONFIG_LIBAVCODEC_SO 1' -test "$_libavcodec_mpegaudio_hp" = yes \ - && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' -if test "$_libavcodec_a" = yes ; then - _codecmodules="libavcodec(internal) $_codecmodules" -elif test "$_libavcodec_so" = yes ; then - _codecmodules="libavcodec.so $_codecmodules" +if test "$_libavcodec" = yes ; then + _codecmodules="libavcodec $_codecmodules" else _nocodecmodules="libavcodec $_nocodecmodules" fi echores "$_libavcodec" echocheck "FFmpeg libavformat" -if test "$_libavformat_a" = auto ; then - _libavformat_a=no - if test -d libavformat && test -f libavformat/utils.c ; then - _libavformat_a=yes - _res_comment="static" - fi -elif test "$_libavformat_so" = auto ; then - _libavformat_so=no +if test "$_libavformat" = auto ; then + _libavformat=no cat > $TMPC <<EOF #include <libavformat/avformat.h> #include <libavcodec/opt.h> @@ -7127,66 +6915,42 @@ EOF if $_pkg_config --exists libavformat ; then _inc_libavformat=$($_pkg_config --cflags libavformat) _ld_tmp=$($_pkg_config --libs libavformat) - cc_check $_inc_libavformat $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \ - && _libavformat_so=yes + cc_check $_inc_libavformat $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" && extra_cflags="$extra_cflags $_inc_libavformat" \ + && _libavformat=yes elif cc_check $_ld_lm -lavformat ; then extra_ldflags="$extra_ldflags -lavformat" - _libavformat_so=yes - _res_comment="using libavformat.so, but static libavformat is recommended" + _libavformat=yes fi fi -_libavformat=no def_libavformat='#undef CONFIG_LIBAVFORMAT' -def_libavformat_a='#undef CONFIG_LIBAVFORMAT_A' -def_libavformat_so='#undef CONFIG_LIBAVFORMAT_SO' -test "$_libavformat_a" = yes || test "$_libavformat_so" = yes && _libavformat=yes test "$_libavformat" = yes && def_libavformat='#define CONFIG_LIBAVFORMAT 1' -test "$_libavformat_a" = yes && def_libavformat_a='#define CONFIG_LIBAVFORMAT_A 1' -test "$_libavformat_so" = yes \ - && def_libavformat_so='#define CONFIG_LIBAVFORMAT_SO 1' echores "$_libavformat" echocheck "FFmpeg libpostproc" -if test "$_libpostproc_a" = auto ; then - _libpostproc_a=no - if test -d libpostproc && test -f libpostproc/postprocess.h ; then - _libpostproc_a='yes' - _res_comment="static" - fi -elif test "$_libpostproc_so" = auto ; then - _libpostproc_so=no +if test "$_libpostproc" = auto ; then + _libpostproc=no cat > $TMPC << EOF #include <inttypes.h> #include <libpostproc/postprocess.h> int main(void) { pp_get_mode_by_name_and_quality("de", 0); return 0; } EOF - if cc_check -lpostproc $_ld_lm ; then + if $_pkg_config --exists libpostproc ; then + _inc_libpostproc=$($_pkg_config --cflags libpostproc) + _ld_tmp=$($_pkg_config --libs libpostproc) + cc_check $_inc_libpostproc $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" && extra_cflags="$extra_cflags $_inc_libpostproc" \ + && _libpostproc=yes + elif cc_check -lpostproc $_ld_lm ; then extra_ldflags="$extra_ldflags -lpostproc" - _libpostproc_so=yes - _res_comment="using libpostproc.so, but static libpostproc is recommended" + _libpostproc=yes fi fi -_libpostproc=no def_libpostproc='#undef CONFIG_LIBPOSTPROC' -def_libpostproc_a='#undef CONFIG_LIBPOSTPROC_A' -def_libpostproc_so='#undef CONFIG_LIBPOSTPROC_SO' -test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes test "$_libpostproc" = yes && def_libpostproc='#define CONFIG_LIBPOSTPROC 1' -test "$_libpostproc_a" = yes && def_libpostproc_a='#define CONFIG_LIBPOSTPROC_A 1' -test "$_libpostproc_so" = yes \ - && def_libpostproc_so='#define CONFIG_LIBPOSTPROC_SO 1' echores "$_libpostproc" echocheck "FFmpeg libswscale" -if test "$_libswscale_a" = auto ; then - _libswscale_a=no - if test -d libswscale && test -f libswscale/swscale.h ; then - _libswscale_a='yes' - _res_comment="static" - fi -elif test "$_libswscale_so" = auto ; then - _libswscale_so=no - _res_comment="using libswscale.so, but static libswscale is recommended" +if test "$_libswscale" = auto ; then + _libswscale=no cat > $TMPC << EOF #include <libswscale/swscale.h> int main(void) { sws_scale(0, 0, 0, 0, 0, 0, 0); return 0; } @@ -7194,76 +6958,26 @@ EOF if $_pkg_config --exists libswscale ; then _inc_libswscale=$($_pkg_config --cflags libswscale) _ld_tmp=$($_pkg_config --libs libswscale) - cc_check $_inc_libswscale $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \ - && _libswscale_so=yes + cc_check $_inc_libswscale $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" extra_cflags="$extra_cflags $_inc_libswscale" \ + && _libswscale=yes elif cc_check -lswscale ; then extra_ldflags="$extra_ldflags -lswscale" - _libswscale_so=yes + _libswscale=yes fi fi -_libswscale=no def_libswscale='#undef CONFIG_LIBSWSCALE' -def_libswscale_a='#undef CONFIG_LIBSWSCALE_A' -def_libswscale_so='#undef CONFIG_LIBSWSCALE_SO' -test "$_libswscale_a" = yes || test "$_libswscale_so" = yes && _libswscale=yes test "$_libswscale" = yes && def_libswscale='#define CONFIG_LIBSWSCALE 1' -test "$_libswscale_a" = yes && def_libswscale_a='#define CONFIG_LIBSWSCALE_A 1' -test "$_libswscale_so" = yes \ - && def_libswscale_so='#define CONFIG_LIBSWSCALE_SO 1' echores "$_libswscale" -echocheck "libopencore_amr narrowband" -if test "$_libopencore_amrnb" = auto ; then - _libopencore_amrnb=no - cat > $TMPC << EOF -#include <opencore-amrnb/interf_dec.h> -int main(void) { Decoder_Interface_init(); return 0; } -EOF - cc_check -lopencore-amrnb && _libopencore_amrnb=yes - if test "$_libavcodec_a" != yes ; then - _libopencore_amrnb=no - _res_comment="libavcodec (static) is required by libopencore_amrnb, sorry" - fi -fi -if test "$_libopencore_amrnb" = yes ; then - _libopencore_amr=yes - extra_ldflags="$extra_ldflags -lopencore-amrnb" - def_libopencore_amrnb='#define CONFIG_LIBOPENCORE_AMRNB 1' - _libavdecoders="$_libavdecoders LIBOPENCORE_AMRNB_DECODER" - _libavencoders="$_libavencoders LIBOPENCORE_AMRNB_ENCODER" - _codecmodules="libopencore_amrnb $_codecmodules" -else - def_libopencore_amrnb='#define CONFIG_LIBOPENCORE_AMRNB 0' - _nocodecmodules="libopencore_amrnb $_nocodecmodules" +def_libswscale_internals="#undef CONFIG_LIBSWSCALE_INTERNALS" +if ! test -z "$_ffmpeg_source" ; then + test "$_libswscale" = yes && def_libswscale_internals="#define CONFIG_LIBSWSCALE_INTERNALS 1" && _libswscale_internals=yes fi -echores "$_libopencore_amrnb" - -echocheck "libopencore_amr wideband" -if test "$_libopencore_amrwb" = auto ; then - _libopencore_amrwb=no - cat > $TMPC << EOF -#include <opencore-amrwb/dec_if.h> -int main(void) { D_IF_init(); return 0; } -EOF - cc_check -lopencore-amrwb && _libopencore_amrwb=yes - if test "$_libavcodec_a" != yes ; then - _libopencore_amrwb=no - _res_comment="libavcodec (static) is required by libopencore_amrwb, sorry" - fi -fi -if test "$_libopencore_amrwb" = yes ; then - _libopencore_amr=yes - extra_ldflags="$extra_ldflags -lopencore-amrwb" - def_libopencore_amrwb='#define CONFIG_LIBOPENCORE_AMRWB 1' - _libavdecoders="$_libavdecoders LIBOPENCORE_AMRWB_DECODER" - _libavencoders="$_libavencoders LIBOPENCORE_AMRWB_DECODER" - _codecmodules="libopencore_amrwb $_codecmodules" -else - def_libopencore_amrwb='#define LIBOPENCORE_AMRWB 0' - _nocodecmodules="libopencore_amrwb $_nocodecmodules" +def_libavcodec_internals="#undef CONFIG_LIBAVCODEC_INTERNALS" +if ! test -z "$_ffmpeg_source" ; then + test "$_libavcodec" = yes && def_libavcodec_internals="#define CONFIG_LIBAVCODEC_INTERNALS 1" && _libavcodec_internals=yes fi -echores "$_libopencore_amrwb" echocheck "libdv-0.9.5+" if test "$_libdv" = auto ; then @@ -7306,24 +7020,6 @@ else fi echores "$_xvid" -echocheck "Xvid two pass plugin" -if test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then - cat > $TMPC << EOF -#include <xvid.h> -int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } -EOF - cc_check && _xvid_lavc=yes -fi -if test "$_xvid_lavc" = yes ; then - def_xvid_lavc='#define CONFIG_LIBXVID 1' - _libavencoders="$_libavencoders LIBXVID_ENCODER" -else - _xvid_lavc=no - def_xvid_lavc='#define CONFIG_LIBXVID 0' -fi -echores "$_xvid_lavc" - - echocheck "x264" if test "$_x264" = auto ; then cat > $TMPC << EOF @@ -7343,95 +7039,12 @@ fi if test "$_x264" = yes ; then def_x264='#define CONFIG_X264 1' _codecmodules="x264 $_codecmodules" - test "$_x264_lavc" = auto && _x264_lavc=yes - if test "$_x264_lavc" = yes ; then - def_x264_lavc='#define CONFIG_LIBX264 1' - libs_mplayer="$libs_mplayer $_ld_x264" - _libavencoders="$_libavencoders LIBX264_ENCODER" - fi |