aboutsummaryrefslogtreecommitdiffhomepage
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1159
1 files changed, 207 insertions, 952 deletions
diff --git a/configure b/configure
index 415ae52bc4..b179caa9aa 100755
--- a/configure
+++ b/configure
@@ -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]
@@ -338,21 +323,6 @@ Codecs:
--enable-liba52-internal enable builtin liba52 [disabled]
--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]
@@ -416,7 +386,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]
@@ -427,18 +397,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]
@@ -472,13 +446,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
@@ -537,37 +511,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
@@ -615,12 +565,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
@@ -638,7 +587,6 @@ _faad=auto
_faad_internal=auto
_faad_fixed=no
_faac=auto
-_faac_lavc=auto
_ladspa=auto
_libbs2b=auto
_xmms=no
@@ -664,7 +612,6 @@ _sgiaudio=auto
_sunaudio=auto
_alsa=auto
_fastmemcpy=yes
-hardcoded_tables=no
_unrar_exec=auto
_win32dll=auto
_select=yes
@@ -681,9 +628,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
@@ -691,11 +635,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
@@ -719,6 +659,7 @@ _largefiles=yes
#language=en
_shm=auto
_linux_devfs=no
+_translation=no
_charset="UTF-8"
_dynamic_plugins=no
_crash_debug=no
@@ -752,7 +693,6 @@ _vstream=auto
_pthreads=auto
_w32threads=auto
_ass=auto
-ass_internal=yes
_rpath=no
_asmalign_pot=auto
_stream_cache=yes
@@ -788,6 +728,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 )
@@ -819,10 +762,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)
@@ -898,6 +841,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 ;;
@@ -938,8 +883,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 ;;
@@ -1004,8 +947,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 ;;
@@ -1046,8 +987,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 ;;
@@ -1114,8 +1053,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 ;;
@@ -1136,56 +1073,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 ;;
@@ -1257,8 +1160,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 ;;
@@ -1353,12 +1254,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
@@ -1673,12 +1580,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)
@@ -1769,8 +1670,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
@@ -1778,8 +1677,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
@@ -2166,8 +2063,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
@@ -2281,6 +2176,7 @@ EOF
alpha*)
arch='alpha'
iproc='alpha'
+ def_fast_64bit='#define HAVE_FAST_64BIT 1'
echocheck "CPU type"
cat > $TMPC << EOF
@@ -2423,12 +2319,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"
@@ -2476,8 +2370,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
@@ -2496,7 +2390,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
@@ -2508,7 +2402,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"
@@ -2922,19 +2815,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.
@@ -2952,12 +2857,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"
@@ -3047,7 +2951,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>
@@ -3124,129 +3028,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'
@@ -3339,8 +3125,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"
@@ -3508,16 +3292,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>
@@ -4540,7 +4314,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"
@@ -4565,7 +4338,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"
@@ -4778,35 +4550,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
@@ -5128,28 +4871,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
@@ -5682,6 +5403,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"
@@ -6150,6 +5880,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
@@ -6404,42 +6137,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"
@@ -6518,8 +6228,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"
@@ -6906,20 +6614,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="$_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"
@@ -7209,15 +6908,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_clip(1, 1, 1); return 0; }
@@ -7225,38 +6917,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; }
@@ -7264,43 +6942,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' \
- && mak_libavcodec_mpegaudio_hp='CONFIG_MPEGAUDIO_HP = yes'
-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>
@@ -7309,66 +6969,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; }
@@ -7376,76 +7012,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
+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
-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"
-fi
-echores "$_libopencore_amrwb"
echocheck "libdv-0.9.5+"
if test "$_libdv" = auto ; then
@@ -7488,24 +7074,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
@@ -7525,95 +7093,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
else
- _x264_lavc=no
def_x264='#undef CONFIG_X264'
- def_x264_lavc='#define CONFIG_LIBX264 0'
nocodecmodules="x264 $nocodecmodules"
fi
-res_comment="in libavcodec: $_x264_lavc"
echores "$_x264"
-
-echocheck "libdirac"
-if test "$_libdirac_lavc" = auto; then
- _libdirac_lavc=no
- if test "$_libavcodec_a" != yes; then
- res_comment="libavcodec (static) is required by libdirac, sorry"
- else
- cat > $TMPC << EOF
-#include <libdirac_encoder/dirac_encoder.h>
-#include <libdirac_decoder/dirac_parser.h>
-int main(void)
-{
- dirac_encoder_context_t enc_ctx;
- dirac_decoder_t *dec_handle;
- dirac_encoder_context_init(&enc_ctx, VIDEO_FORMAT_SD_576I50);
- dec_handle = dirac_decoder_init(0);
- if (dec_handle)
- dirac_decoder_close(dec_handle);
- return 0;
-}
-EOF
- if $_pkg_config --exists dirac ; then
- _inc_dirac=$($_pkg_config --silence-errors --cflags dirac)
- _ld_dirac=$($_pkg_config --silence-errors --libs dirac)
- cc_check $_inc_dirac $_ld_dirac &&
- _libdirac_lavc=yes &&
- extra_cflags="$extra_cflags $_inc_dirac" &&
- extra_ldflags="$extra_ldflags $_ld_dirac"
- fi
- fi
-fi
-if test "$_libdirac_lavc" = yes ; then
- def_libdirac_lavc='#define CONFIG_LIBDIRAC 1'
- _libavencoders="$_libavencoders LIBDIRAC_ENCODER"
- _libavdecoders="$_libavdecoders LIBDIRAC_DECODER"
- codecmodules="libdirac $codecmodules"
-else
- def_libdirac_lavc='#define CONFIG_LIBDIRAC 0'
- nocodecmodules="libdirac $nocodecmodules"
-fi
-echores "$_libdirac_lavc"
-
-
-echocheck "libschroedinger"
-if test "$_libschroedinger_lavc" = auto ; then
- _libschroedinger_lavc=no
- if test "$_libavcodec_a" != yes; then
- res_comment="libavcodec (static) is required by libschroedinger, sorry"
- else
- cat > $TMPC << EOF
-#include <schroedinger/schro.h>
-int main(void) { schro_init(); return SCHRO_ENCODER_RATE_CONTROL_CONSTANT_QUALITY; }
-EOF
- if $_pkg_config --exists schroedinger-1.0 ; then
- _inc_schroedinger=$($_pkg_config --silence-errors --cflags schroedinger-1.0)
- _ld_schroedinger=$($_pkg_config --silence-errors --libs schroedinger-1.0)
- cc_check $_inc_schroedinger $_ld_schroedinger &&
- _libschroedinger_lavc=yes &&
- extra_cflags="$extra_cflags $_inc_schroedinger" &&
- extra_ldflags="$extra_ldflags $_ld_schroedinger"
- fi
- fi
-fi
-if test "$_libschroedinger_lavc" = yes ; then
- def_libschroedinger_lavc='#define CONFIG_LIBSCHROEDINGER 1'
- _libavencoders="$_libavencoders LIBSCHROEDINGER_ENCODER"
- _libavdecoders="$_libavdecoders LIBSCHROEDINGER_DECODER"
- codecmodules="libschroedinger $codecmodules"
-else
- def_libschroedinger_lavc='#define CONFIG_LIBSCHROEDINGER 0'
- nocodecmodules="libschroedinger $nocodecmodules"
-fi
-echores "$_libschroedinger_lavc"
-
echocheck "libnut"
if test "$_libnut" = auto ; then
cat > $TMPC << EOF
@@ -7636,7 +7121,48 @@ else
fi
echores "$_libnut"
-#check must be done after libavcodec one
+# These VO checks must be done after libavcodec/libswscale one
+echocheck "/dev/mga_vid"
+if test "$_mga" = auto ; then
+ _mga=no
+ test -c /dev/mga_vid && _mga=yes
+fi
+if test "$_mga" = yes ; then
+ if test "$_libswscale_internals" = yes ; then
+ def_mga='#define CONFIG_MGA 1'
+ vomodules="mga $vomodules"
+ else
+ res_comment="libswscale internal headers are required by mga, sorry"
+ def_mga='#undef CONFIG_MGA'
+ novomodules="mga $novomodules"
+ fi
+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
+ if test "$_libswscale_internals" = yes ; then
+ def_xmga='#define CONFIG_XMGA 1'
+ vomodules="xmga $vomodules"
+ else
+ res_comment="libswscale internal headers are required by mga, sorry"
+ def_xmga='#undef CONFIG_XMGA'
+ novomodules="xmga $novomodules"
+ fi
+else
+ def_xmga='#undef CONFIG_XMGA'
+ novomodules="xmga $novomodules"
+fi
+echores "$_xmga"
+
echocheck "zr"
if test "$_zr" = auto ; then
#36067's seem to identify themselves as 36057PQC's, so the line
@@ -7648,11 +7174,11 @@ if test "$_zr" = auto ; then
fi
fi
if test "$_zr" = yes ; then
- if test "$_libavcodec_a" = yes ; then
+ if test "$_libavcodec_internals" = yes ; then
def_zr='#define CONFIG_ZR 1'
vomodules="zr zr2 $vomodules"
else
- res_comment="libavcodec (static) is required by zr, sorry"
+ res_comment="libavcodec internal headers are required by zr, sorry"
novomodules="zr $novomodules"
def_zr='#undef CONFIG_ZR'
fi
@@ -7692,18 +7218,9 @@ EOF
int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; }
EOF
cc_check $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM 1"
- test "$_mp3lame_lavc" = auto && _mp3lame_lavc=yes
- if test "$_mp3lame_lavc" = yes ; then
- def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1"
- _libavencoders="$_libavencoders LIBMP3LAME_ENCODER"
- libs_mplayer="$libs_mplayer $_ld_mp3lame"
- fi
else
- _mp3lame_lavc=no
def_mp3lame='#undef CONFIG_MP3LAME'
- def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 0"
fi
-res_comment="in libavcodec: $_mp3lame_lavc"
echores "$_mp3lame"
fi # test "$_mencoder" != no
@@ -7712,10 +7229,6 @@ echocheck "mencoder"
if test "$_mencoder" = yes ; then
def_muxers='#define CONFIG_MUXERS 1'
else
- # mpeg1video for vf_lavc, snow for vf_uspp and vf_mcdeint, png for vf_screenshot
- _libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER"
- test "$_zlib" = yes && _libavencoders="$_libavencoders PNG_ENCODER"
- _libavmuxers=""
def_muxers='#define CONFIG_MUXERS 0'
fi
echores "$_mencoder"
@@ -8091,135 +7604,6 @@ else
fi
echores "$_xmms"
-
-# --------------- GUI specific tests begin -------------------
-echocheck "GUI"
-echo "$_gui"
-if test "$_gui" = yes ; then
-
- # Required libraries
- if test "$_libavcodec" != yes ||
- ! echo $_libavdecoders | grep -q PNG_DECODER ; then
- die "The GUI requires libavcodec with PNG support (needs zlib)."
- fi
- test "$_freetype" = no && test "$_bitmap_font" = no && \
- die "The GUI requires either FreeType or bitmap font support."
-if ! win32 ; then
- _gui_gtk=yes
- test "$_x11" != yes && die "X11 support required for GUI compilation."
-
- echocheck "XShape extension"
- if test "$_xshape" = auto ; then
- _xshape=no
- cat > $TMPC << EOF
-#include <X11/Xlib.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/shape.h>
-#include <stdlib.h>
-int main(void) {
- char *name = ":0.0";
- Display *wsDisplay;
- int exitvar = 0;
- int eventbase, errorbase;
- if (getenv("DISPLAY"))
- name=getenv("DISPLAY");
- wsDisplay=XOpenDisplay(name);
- if (!XShapeQueryExtension(wsDisplay,&eventbase,&errorbase))
- exitvar=1;
- XCloseDisplay(wsDisplay);
- return exitvar;
-}
-EOF
- cc_check -lXext && _xshape=yes
- fi
- if test "$_xshape" = yes ; then
- def_xshape='#define CONFIG_XSHAPE 1'
- else
- die "The GUI requires the X11 extension XShape (which was not found)."
- fi
- echores "$_xshape"
-
-#Check for GTK
-if test "$_gtk1" = no ; then
- #Check for GTK2 :
- echocheck "GTK+ version"
-
- if $_pkg_config gtk+-2.0 --exists ; then
- _gtk=$($_pkg_config gtk+-2.0 --modversion 2>/dev/null)
- extra_cflags="$extra_cflags $($_pkg_config gtk+-2.0 --cflags 2>/dev/null)"
- libs_mplayer="$libs_mplayer $($_pkg_config gtk+-2.0 --libs 2>/dev/null)"
- echores "$_gtk"
-
- # Check for GLIB2
- if $_pkg_config glib-2.0 --exists ; then
- echocheck "glib version"
- _glib=$($_pkg_config glib-2.0 --modversion 2>/dev/null)
- libs_mplayer="$libs_mplayer $($_pkg_config glib-2.0 --libs 2>/dev/null)"
- echores "$_glib"
-
- def_gui='#define CONFIG_GUI 1'
- def_gtk2='#define CONFIG_GTK2 1'
- else
- _gtk1=yes
- echo "GLIB-2 devel packages were not found, trying GTK 1.2"
- fi
- else
- echo "GTK-2 devel packages were not found, trying GTK 1.2"
- _gtk1=yes
- fi
-fi
-
-if test "$_gtk1" = yes ; then
- # Check for old GTK (1.2.x)
- echocheck "GTK version"
- if test -z "$_gtkconfig" ; then
- if ( gtk-config --version ) >/dev/null 2>&1 ; then
- _gtkconfig="gtk-config"
- elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
- _gtkconfig="gtk12-config"
- else
- die "The GUI requires GTK devel packages (which were not found)."
- fi
- fi
- _gtk=$($_gtkconfig --version 2>&1)
- extra_cflags="$extra_cflags $($_gtkconfig --cflags 2>&1)"
- libs_mplayer="$libs_mplayer $($_gtkconfig --libs 2>&1)"
- echores "$_gtk (using $_gtkconfig)"
-
- # Check for GLIB
- echocheck "glib version"
- if test -z "$_glibconfig" ; then
- if ( glib-config --version ) >/dev/null 2>&1 ; then
- _glibconfig="glib-config"
- elif ( glib12-config --version ) >/dev/null 2>&1 ; then
- _glibconfig="glib12-config"
- else
- die "The GUI requires GLIB devel packages (which were not found)"
- fi
- fi
- _glib=$($_glibconfig --version 2>&1)
- libs_mplayer="$libs_mplayer $($_glibconfig --libs 2>&1)"
- echores "$_glib (using $_glibconfig)"
-
- def_gui='#define CONFIG_GUI 1'
- def_gtk2='#undef CONFIG_GTK2'
-fi
-
-else #if ! win32
- _gui_win32=yes
- libs_mplayer="$libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32"
- def_gui='#define CONFIG_GUI 1'
- def_gtk2='#undef CONFIG_GTK2'
-fi #if ! win32
-
-else #if test "$_gui"
- def_gui='#undef CONFIG_GUI'
- def_gtk2='#undef CONFIG_GTK2'
-fi #if test "$_gui"
-# --------------- GUI specific tests end -------------------
-
-
if test "$_charset" != "noconv" ; then
def_charset="#define MSG_CHARSET \"$_charset\""
else
@@ -8227,21 +7611,6 @@ else
_charset="UTF-8"
fi
-if test -n "$_charset" && test "$_charset" != "UTF-8" ; then
-echocheck "iconv program"
-iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
-if test "$?" -ne 0 ; then
- echores "no"
- echo "No working iconv program found, use "
- echo "--charset=UTF-8 to continue anyway."
- echo "If you also have problems with iconv library functions use --charset=noconv."
- echo "Messages in the GTK-2 interface will be broken then."
- exit 1
-else
- echores "yes"
-fi
-fi
-
#############################################################################
echocheck "automatic gdb attach"
@@ -8398,6 +7767,9 @@ CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS"
# So any compilation using the flags added here but not linking against
# libdvdread can fail.
echocheck "DVD support (libdvdnav)"
+if test "$_dvdread_internal" = yes && test ! -f "libdvdnav/dvdnav.c" ; then
+ _dvdnav=no
+fi
dvdnav_internal=no
if test "$_dvdnav" = auto ; then
if test "$_dvdread_internal" = yes ; then
@@ -8465,6 +7837,8 @@ DOC_LANGS = $language_doc
DOC_LANG_ALL = $doc_lang_all
MAN_LANGS = $language_man
MAN_LANG_ALL = $man_lang_all
+MSG_LANGS = $language_msg
+MSG_LANG_ALL = $msg_lang_all
prefix = \$(DESTDIR)$_prefix
BINDIR = \$(DESTDIR)$_bindir
@@ -8472,6 +7846,7 @@ DATADIR = \$(DESTDIR)$_datadir
LIBDIR = \$(DESTDIR)$_libdir
MANDIR = \$(DESTDIR)$_mandir
CONFDIR = \$(DESTDIR)$_confdir
+LOCALEDIR = \$(DESTDIR)$_localedir
AR = $_ar
AS = $_cc
@@ -8483,7 +7858,6 @@ INSTALLSTRIP = $_install_strip
WINDRES = $_windres
CFLAGS = $CFLAGS $extra_cflags
-ASFLAGS = \$(CFLAGS)
CXXFLAGS = $CXXFLAGS $extra_cflags $extra_cxxflags
CFLAGS_DHAHELPER = $cflags_dhahelper
@@ -8501,7 +7875,6 @@ EXTRALIBS_MPLAYER = $libs_mplayer
EXTRALIBS_MENCODER = $libs_mencoder
GETCH = $_getch
-HELP_FILE = $_mp_help
TIMER = $_timer
EXESUF = $_exesuf
@@ -8569,9 +7942,6 @@ GL_WIN32 = $_gl_win32
GL_X11 = $_gl_x11
GL_SDL = $_gl_sdl
MATRIXVIEW = $matrixview
-GUI = $_gui
-GUI_GTK = $_gui_gtk
-GUI_WIN32 = $_gui_win32
HAVE_POSIX_SELECT = $_posix_select
HAVE_SYS_MMAN_H = $_mman
IVTV = $_ivtv
@@ -8584,7 +7954,6 @@ LADSPA = $_ladspa
LIBA52 = $_liba52
LIBA52_INTERNAL = $_liba52_internal
LIBASS = $_ass
-LIBASS_INTERNAL = $ass_internal
LIBBS2B = $_libbs2b
LIBDCA = $_libdca
LIBDV = $_libdv
@@ -8687,74 +8056,32 @@ ZR = $_zr
# FFmpeg
LIBAVUTIL = $_libavutil
-LIBAVUTIL_A = $_libavutil_a
-LIBAVUTIL_SO = $_libavutil_so
LIBAVCODEC = $_libavcodec
-LIBAVCODEC_A = $_libavcodec_a
-LIBAVCODEC_SO = $_libavcodec_so
LIBAVFORMAT = $_libavformat
-LIBAVFORMAT_A = $_libavformat_a
-LIBAVFORMAT_SO = $_libavformat_so
LIBPOSTPROC = $_libpostproc
-LIBPOSTPROC_A = $_libpostproc_a
-LIBPOSTPROC_SO = $_libpostproc_so
LIBSWSCALE = $_libswscale
-LIBSWSCALE_A = $_libswscale_a
-LIBSWSCALE_SO = $_libswscale_so
-
-HOSTCC = \$(HOST_CC)
-HOSTCFLAGS = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3
-HOSTLIBS = -lm
-CC_O = -o \$@
-LD = gcc
+LIBAVCODEC_INTERNALS = $_libavcodec_internals
+LIBSWSCALE_INTERNALS = $_libswscale_internals
+FFMPEG_SOURCE_PATH = $_ffmpeg_source
+
RANLIB = $_ranlib
YASM = $_yasm
YASMFLAGS = $YASMFLAGS
-CONFIG_STATIC = yes
-SRC_PATH = ..
-BUILD_ROOT = ..
-LIBPREF = lib
-LIBSUF = .a
-LIBNAME = \$(LIBPREF)\$(NAME)\$(LIBSUF)
-FULLNAME = \$(NAME)\$(BUILDSUF)
-
# Some FFmpeg codecs depend on these. Enable them unconditionally for now.
CONFIG_AANDCT = yes
-CONFIG_DCT = yes
-CONFIG_DWT = yes
CONFIG_FFT = yes
CONFIG_GOLOMB = yes
CONFIG_H264DSP = yes
CONFIG_LPC = yes
-CONFIG_LSP = yes
CONFIG_MDCT = yes
CONFIG_RDFT = yes
-$mak_hardcoded_tables
-$mak_libavcodec_mpegaudio_hp
-!CONFIG_LIBRTMP = yes
-
CONFIG_BZLIB = $bzlib
CONFIG_ENCODERS = yes
CONFIG_GPL = yes
-CONFIG_LIBDIRAC_DECODER = $_libdirac_lavc
-CONFIG_LIBDIRAC_ENCODER = $_libdirac_lavc
-CONFIG_LIBFAAC_ENCODER = $_faac_lavc
-CONFIG_LIBMP3LAME_ENCODER = $_mp3lame_lavc
-CONFIG_LIBOPENCORE_AMRNB_DECODER = $_libopencore_amrnb
-CONFIG_LIBOPENCORE_AMRNB_ENCODER = $_libopencore_amrnb
-CONFIG_LIBOPENCORE_AMRWB_DECODER = $_libopencore_amrwb
-OCNFIG_LIBOPENJPEG_DECODER = $libopenjpeg
-OCNFIG_LIBOPENJPEG_ENCODER = $libopenjpeg
-CONFIG_LIBSCHROEDINGER_DECODER = $_libschroedinger_lavc
-CONFIG_LIBSCHROEDINGER_ENCODER = $_libschroedinger_lavc
-CONFIG_LIBVORBIS_ENCODER = $_libvorbis
-CONFIG_LIBX264_ENCODER = $_x264_lavc
-CONFIG_LIBXVID_ENCODER = $_xvid_lavc
CONFIG_MLIB = $_mlib
CONFIG_MUXERS = $_mencoder
-CONFIG_POSTPROC = yes
CONFIG_VDPAU = $_vdpau
CONFIG_XVMC = $_xvmc
CONFIG_ZLIB = $_zlib
@@ -8764,14 +8091,6 @@ HAVE_SHM = $_shm
HAVE_W32THREADS = $_w32threads
HAVE_YASM = $have_yasm
-$(echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavprotocols | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavbsfs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $_libavhwaccels | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
EOF
#############################################################################
@@ -8809,9 +8128,6 @@ cat > $TMPH << EOF
*/
#define CONFIG_FAKE_MONO 1
-/* set up max. outburst. use 65536 for ALSA 0.5, for others 16384 is enough */
-#define MAX_OUTBURST 65536
-
/* set up audio OUTBURST. Do not change this! */
#define OUTBURST 512
@@ -8830,6 +8146,9 @@ cat > $TMPH << EOF
#define MPLAYER_DATADIR "$_datadir"
#define MPLAYER_CONFDIR "$_confdir"
#define MPLAYER_LIBDIR "$_libdir"
+#define MPLAYER_LOCALEDIR "$_localedir"
+
+$def_translation
/* definitions needed by included libraries */
#define HAVE_INTTYPES_H 1
@@ -9001,12 +8320,6 @@ $def_xmms
#define XMMS_INPUT_PLUGIN_DIR "$_xmmsplugindir"
-/* GUI */
-$def_gtk2
-$def_gui
-$def_xshape
-
-
/* Audio output drivers */
$def_alsa
$def_alsa1x
@@ -9058,7 +8371,6 @@ $def_tv_v4l2
/* font stuff */
$def_ass
-$def_ass_internal
$def_bitmap_font
$def_enca
$def_fontconfig
@@ -9077,13 +8389,7 @@ $def_nemesi
$def_network
$def_smb
$def_socklen_t
-$def_struct_ipv6_mreq
-$def_struct_sockaddr_in6
-$def_struct_sockaddr_sa_len
$def_vstream
-$def_addrinfo
-$def_getaddrinfo
-$def_sockaddr_storage
/* libvo options */
@@ -9166,20 +8472,12 @@ $def_zr
/* FFmpeg */
$def_libavcodec
-$def_libavcodec_a
-$def_libavcodec_so
$def_libavformat
-$def_libavformat_a
-$def_libavformat_so
$def_libavutil
-$def_libavutil_a
-$def_libavutil_so
$def_libpostproc
-$def_libpostproc_a
-$def_libpostproc_so
$def_libswscale
-$def_libswscale_a
-$def_libswscale_so
+$def_libavcodec_internals
+$def_libswscale_internals
#define CONFIG_DECODERS 1
#define CONFIG_ENCODERS 1
@@ -9194,12 +8492,7 @@ $def_exp2
$def_exp2f
$def_fast_64bit
$def_fast_unaligned
-$def_hardcoded_tables
-$def_libavcodec_mpegaudio_hp
$def_llrint
-$def_llrintf
-$def_local_aligned_8
-$def_local_aligned_16
$def_log2
$def_log2f
$def_lrint
@@ -9220,28 +8513,18 @@ $def_yasm
#define CONFIG_FFSERVER 0
#define CONFIG_GPL 1
#define CONFIG_GRAY 0
-#define CONFIG_LIBRTMP 0
+#define CONFIG_HARDCODED_TABLES 0
#define CONFIG_LIBVORBIS 0
#define CONFIG_POWERPC_PERF 0
#define CONFIG_SMALL 0
#define CONFIG_SWSCALE_ALPHA 1
-#if defined(HAVE_AF_INET6) && (!defined(_WIN32) || defined(__CYGWIN__))
-#define CONFIG_IPV6 1
-#else
-#define CONFIG_IPV6 0
-#endif
-
-#define HAVE_ATTRIBUTE_MAY_ALIAS 1
-#define av_alias __attribute__((may_alias))
#define HAVE_ATTRIBUTE_PACKED 1
#define HAVE_GETHRTIME 0
#define HAVE_INLINE_ASM 1
#define HAVE_LDBRX 0
#define HAVE_POLL_H 1
#define HAVE_PPC4XX 0
-#define HAVE_STRERROR_R 0
-#define HAVE_SYS_SELECT_H 0
#define HAVE_VFP_ARGS 1
#define HAVE_VIRTUALALLOC 0
@@ -9264,28 +8547,12 @@ $def_ebx_available
#define HAVE_EBP_AVAILABLE 0
#endif
-#define FFMPEG_CONFIGURATION "--enable-gpl --enable-postproc"
-#define FFMPEG_LICENSE "GPL version 2 or later"
-
-/* External libraries used through libavcodec. */
-$def_faac_lavc
-$def_libdirac_lavc
-$def_libopencore_amrnb
-$def_libopencore_amrwb
-$def_libopenjpeg
-$def_libschroedinger_lavc
-$def_mp3lame_lavc
-$def_x264_lavc
-$def_xvid_lavc
-
-$(ff_config_enable "$_libavdecoders_all" "$_libavdecoders")
-$(ff_config_enable "$_libavencoders_all" "$_libavencoders")
-$(ff_config_enable "$_libavparsers_all" "$_libavparsers")
-$(ff_config_enable "$_libavdemuxers_all" "$_libavdemuxers")
-$(ff_config_enable "$_libavmuxers_all" "$_libavmuxers")
-$(ff_config_enable "$_libavprotocols_all" "$_libavprotocols")
-$(ff_config_enable "$_libavbsfs_all" "$_libavbsfs")
-$(ff_config_enable "$_libavhwaccels_all" "$_libavhwaccels")
+#define CONFIG_H263_VAAPI_HWACCEL 0
+#define CONFIG_MPEG2_VAAPI_HWACCEL 0
+#define CONFIG_MPEG4_VAAPI_HWACCEL 0
+#define CONFIG_H264_VAAPI_HWACCEL 0
+#define CONFIG_VC1_VAAPI_HWACCEL 0
+#define CONFIG_WMV3_VAAPI_HWACCEL 0
#endif /* MPLAYER_CONFIG_H */
EOF
@@ -9293,22 +8560,10 @@ EOF
# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
-############################################################################
-
-# Create avconfig.h for FFmpeg.
-cat > "$TMPH" << EOF
-/* Generated by mpconfigure */
-#ifndef AVUTIL_AVCONFIG_H
-#define AVUTIL_AVCONFIG_H
-$def_av_bigendian
-#endif /* AVUTIL_AVCONFIG_H */
-EOF
-
-# Do not overwrite an unchanged avconfig.h to avoid superfluous rebuilds.
-cmp -s "$TMPH" libavutil/avconfig.h || mv -f "$TMPH" libavutil/avconfig.h
-
#############################################################################
+./version.sh `$_cc -dumpversion`
+
cat << EOF
Config files successfully generated by ./configure $_configuration !
@@ -9321,7 +8576,7 @@ Config files successfully generated by ./configure $_configuration !
Optimizing for: $_optimizing
Languages:
- Messages/GUI: $language_msg
+ Messages (in addition to English): $language_msg
Manual pages: $language_man
Documentation: $language_doc