diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1236 |
1 files changed, 434 insertions, 802 deletions
@@ -3,7 +3,7 @@ # Original version (C) 2000 Pontscho/fresh!mindworkz # pontscho@makacs.poliod.hu # -# History / Contributors: check the cvs log ! +# History / Contributors: Check the Subversion log. # # Cleanups all over the place (c) 2001 pl # @@ -50,8 +50,7 @@ ############################################################################# # Prevent locale nonsense from breaking basic text processing utils -LC_ALL=C -export LC_ALL +export LC_ALL=C # Store the configure line that was used _configuration="$*" @@ -321,7 +320,7 @@ Codecs: --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect] --enable-xmms enable XMMS input plugin support [disabled] --enable-libdca enable libdca support [autodetect] - --disable-mp3lib disable builtin mp3lib [enabled] + --disable-mp3lib disable builtin mp3lib [autodetect] --disable-liba52 disable liba52 [autodetect] --disable-liba52-internal disable builtin liba52 [autodetect] --disable-libmpeg2 disable builtin libmpeg2 [autodetect] @@ -578,9 +577,9 @@ _tremor_low=no _libvorbis=auto _speex=auto _theora=auto -_mp3lib=yes +_mp3lib=auto _liba52=auto -_liba52_internal=yes +_liba52_internal=auto _libdca=auto _libmpeg2=auto _faad=auto @@ -1404,10 +1403,6 @@ if mingw32 ; then _need_shmem=no fi -if cygwin ; then - _def_confwin32='#define WIN32' -fi - if amigaos ; then _select=no _sighandler=no @@ -1600,7 +1595,7 @@ if x86 && test "$_runtime_cpudetection" = no ; then void catch() { exit(1); } int main(void) { signal(SIGILL, catch); - __asm__ __volatile__ ("$3":::"memory"); return 0; + __asm__ volatile ("$3":::"memory"); return 0; } EOF @@ -1888,10 +1883,6 @@ EOF _arch='IA64' _target_arch='ARCH_IA64 = yes' iproc='ia64' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; x86_64|amd64) @@ -1976,11 +1967,14 @@ EOF echores "$proc" ;; - sparc) + sparc|sparc64) _arch='SPARC' _target_arch='ARCH_SPARC = yes' iproc='sparc' - if sunos ; then + if test "$host_arch" = "sparc64" ; then + _vis='yes' + proc='ultrasparc' + elif sunos ; then echocheck "CPU type" karch=`uname -m` case "`echo $karch`" in @@ -1996,18 +1990,6 @@ EOF else proc=v8 fi - _march='' - _mcpu="-mcpu=$proc" - _optimizing="$proc" - ;; - - sparc64) - _arch='SPARC' - _target_arch='ARCH_SPARC = yes' - _vis='yes' - iproc='sparc' - proc='ultrasparc' - _march='' _mcpu="-mcpu=$proc" _optimizing="$proc" ;; @@ -2016,31 +1998,20 @@ EOF _arch='ARM ARMV4L' _target_arch='ARCH_ARMV4L = yes' iproc='arm' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; sh) _arch='SH' _target_arch='ARCH_SH = yes' iproc='sh' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; ppc|ppc64|powerpc|powerpc64) _arch='POWERPC PPC' _def_dcbzl='#undef HAVE_DCBZL' _target_arch='ARCH_POWERPC = yes' + _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc='ppc' - proc='' - _march='' - _mcpu='' - _optimizing='' echocheck "CPU type" case $system_name in @@ -2148,14 +2119,13 @@ EOF _arch='ALPHA' _target_arch='ARCH_ALPHA = yes' iproc='alpha' - _march='' echocheck "CPU type" cat > $TMPC << EOF int main(void) { unsigned long ver, mask; - asm ("implver %0" : "=r" (ver)); - asm ("amask %1, %0" : "=r" (mask) : "r" (-1)); + __asm__ ("implver %0" : "=r" (ver)); + __asm__ ("amask %1, %0" : "=r" (mask) : "r" (-1)); printf("%ld-%x\n", ver, ~mask); return 0; } @@ -2190,10 +2160,6 @@ EOF _arch='SGI_MIPS' _target_arch='ARCH_SGI_MIPS = yes' iproc='sgi-mips' - proc='' - _march='' - _mcpu='' - _optimizing='' if irix ; then echocheck "CPU type" @@ -2219,60 +2185,35 @@ EOF _arch='PA_RISC' _target_arch='ARCH_PA_RISC = yes' iproc='PA-RISC' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; s390) _arch='S390' _target_arch='ARCH_S390 = yes' iproc='390' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; s390x) _arch='S390X' _target_arch='ARCH_S390X = yes' iproc='390x' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; vax) _arch='VAX' _target_arch='ARCH_VAX = yes' iproc='vax' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; xtensa) _arch='XTENSA' _target_arch='ARCH_XTENSA = yes' iproc='xtensa' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; generic) _arch='GENERIC' _target_arch='ARCH_GENERIC = yes' - iproc='' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; *) @@ -2433,7 +2374,7 @@ echocheck ".align is a power of two" if test "$_asmalign_pot" = auto ; then _asmalign_pot=no cat > $TMPC << EOF -int main(void) { asm (".align 3"); return 0; } +int main(void) { __asm__ (".align 3"); return 0; } EOF cc_check && _asmalign_pot=yes fi @@ -2456,13 +2397,13 @@ EOF if $(cc_check -maltivec -mabi=altivec) ; then _altivec_gcc_flags="-maltivec -mabi=altivec" # check if <altivec.h> should be included - _def_altivec_h='#undef HAVE_ALTIVEC_H' + def_altivec_h='#undef HAVE_ALTIVEC_H' cat > $TMPC << EOF #include <altivec.h> int main(void) { return 0; } EOF if $(cc_check $_altivec_gcc_flags) ; then - _def_altivec_h='#define HAVE_ALTIVEC_H 1' + def_altivec_h='#define HAVE_ALTIVEC_H 1' inc_altivec_h='#include <altivec.h>' else cat > $TMPC << EOF @@ -2499,10 +2440,18 @@ EOF fi if arm ; then + echocheck "ARM pld instruction" + cat > $TMPC << EOF +int main(void) { __asm__ volatile ("pld [r0]"); return 0; } +EOF + pld=no + cc_check && pld=yes + echores "$pld" + echocheck "ARMv5TE (Enhanced DSP Extensions)" if test $_armv5te = "auto" ; then cat > $TMPC << EOF -int main(void) { __asm__ __volatile__ ("qadd r0, r0, r0"); return 0; } +int main(void) { __asm__ volatile ("qadd r0, r0, r0"); return 0; } EOF _armv5te=no cc_check && _armv5te=yes @@ -2512,7 +2461,7 @@ EOF echocheck "ARMv6 (SIMD instructions)" if test $_armv6 = "auto" ; then cat > $TMPC << EOF -int main(void) { __asm__ __volatile__ ("sadd16 r0, r0, r0"); return 0; } +int main(void) { __asm__ volatile ("sadd16 r0, r0, r0"); return 0; } EOF _armv6=no cc_check && _armv6=yes @@ -2522,7 +2471,7 @@ EOF echocheck "ARM VFP" if test $_armvfp = "auto" ; then cat > $TMPC << EOF -int main(void) { __asm__ __volatile__ ("fadds s0, s0, s0"); return 0; } +int main(void) { __asm__ volatile ("fadds s0, s0, s0"); return 0; } EOF _armvfp=no cc_check && _armvfp=yes @@ -2532,7 +2481,7 @@ EOF echocheck "iWMMXt (Intel XScale SIMD instructions)" if test $_iwmmxt = "auto" ; then cat > $TMPC << EOF -int main(void) { __asm__ __volatile__ ("wunpckelub wr6, wr4"); return 0; } +int main(void) { __asm__ volatile ("wunpckelub wr6, wr4"); return 0; } EOF _iwmmxt=no cc_check && _iwmmxt=yes @@ -2540,7 +2489,7 @@ EOF echores "$_iwmmxt" fi -_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV ARMV5TE ARMV6 ARMVFP IWMMXT MLIB MMI SH4 VIS MVI' +_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMVFP IWMMXT MLIB MMI SH4 VIS MVI' test "$_altivec" = yes && _cpuexts="ALTIVEC $_cpuexts" test "$_mmx" = yes && _cpuexts="MMX $_cpuexts" test "$_mmxext" = yes && _cpuexts="MMX2 $_cpuexts" @@ -2551,6 +2500,7 @@ test "$_sse2" = yes && _cpuexts="SSE2 $_cpuexts" test "$_ssse3" = yes && _cpuexts="SSSE3 $_cpuexts" test "$_cmov" = yes && _cpuexts="CMOV $_cpuexts" test "$_fast_cmov" = yes && _cpuexts="FAST_CMOV $_cpuexts" +test "$pld" = yes && _cpuexts="PLD $_cpuexts" test "$_armv5te" = yes && _cpuexts="ARMV5TE $_cpuexts" test "$_armv6" = yes && _cpuexts="ARMV6 $_cpuexts" test "$_armvfp" = yes && _cpuexts="ARMVFP $_cpuexts" @@ -2829,9 +2779,9 @@ echores "$_socklib" if test $_winsock2_h = yes ; then _ld_sock="-lws2_32" - _def_winsock2_h='#define HAVE_WINSOCK2_H 1' + def_winsock2_h='#define HAVE_WINSOCK2_H 1' else - _def_winsock2_h='#undef HAVE_WINSOCK2_H' + def_winsock2_h='#undef HAVE_WINSOCK2_H' fi @@ -2982,17 +2932,6 @@ fi echores "$_fast_inttypes" -echocheck "word size" -_mp_wordsize="#undef MP_WORDSIZE" -cat > $TMPC << EOF -#include <stdio.h> -#include <sys/types.h> -int main(void) { printf("%d\n", sizeof(size_t)*8); return 0; } -EOF -cc_check && _wordsize=`$TMPEXE` && _mp_wordsize="#define MP_WORDSIZE $_wordsize" -echores "$_wordsize" - - echocheck "malloc.h" cat > $TMPC << EOF #include <malloc.h> @@ -3001,12 +2940,12 @@ EOF _malloc=no cc_check && _malloc=yes if test "$_malloc" = yes ; then - _def_malloc='#define HAVE_MALLOC_H 1' + def_malloc_h='#define HAVE_MALLOC_H 1' else - _def_malloc='#undef HAVE_MALLOC_H' + def_malloc_h='#undef HAVE_MALLOC_H' fi # malloc.h emits a warning in FreeBSD and OpenBSD -freebsd || openbsd || dragonfly && _def_malloc='#undef HAVE_MALLOC_H' +freebsd || openbsd || dragonfly && def_malloc_h='#undef HAVE_MALLOC_H' echores "$_malloc" @@ -3036,28 +2975,13 @@ EOF _alloca=no cc_check && _alloca=yes if cc_check ; then - _def_alloca='#define HAVE_ALLOCA_H 1' + def_alloca_h='#define HAVE_ALLOCA_H 1' else - _def_alloca='#undef HAVE_ALLOCA_H' + def_alloca_h='#undef HAVE_ALLOCA_H' fi echores "$_alloca" -echocheck "byteswap.h" -cat > $TMPC << EOF -#include <byteswap.h> -int main(void) { bswap_16(0); return 0; } -EOF -_byteswap_h=no -cc_check && _byteswap_h=yes -if cc_check ; then - _def_byteswap_h='#define HAVE_BYTESWAP_H 1' -else - _def_byteswap_h='#undef HAVE_BYTESWAP_H' -fi -echores "$_byteswap_h" - - echocheck "mman.h" cat > $TMPC << EOF #include <sys/types.h> @@ -3067,9 +2991,9 @@ EOF _mman=no cc_check && _mman=yes if test "$_mman" = yes ; then - _def_mman='#define HAVE_SYS_MMAN_H 1' + def_mman_h='#define HAVE_SYS_MMAN_H 1' else - _def_mman='#undef HAVE_SYS_MMAN_H' + def_mman_h='#undef HAVE_SYS_MMAN_H' os2 && _need_mmap=yes fi echores "$_mman" @@ -3218,8 +3142,8 @@ echores "$_iconv" echocheck "soundcard.h" _soundcard_h=no -_def_soundcard='#undef HAVE_SOUNDCARD_H' -_def_sys_soundcard='#undef HAVE_SYS_SOUNDCARD_H' +def_soundcard_h='#undef HAVE_SOUNDCARD_H' +def_sys_soundcard_h='#undef HAVE_SYS_SOUNDCARD_H' for _soundcard_header in "sys/soundcard.h" "soundcard.h"; do cat > $TMPC << EOF #include <$_soundcard_header> @@ -3230,9 +3154,9 @@ done if test "$_soundcard_h" = yes ; then if test $_soundcard_header = "sys/soundcard.h"; then - _def_sys_soundcard='#define HAVE_SYS_SOUNDCARD_H 1' + def_sys_soundcard_h='#define HAVE_SYS_SOUNDCARD_H 1' else - _def_soundcard='#define HAVE_SOUNDCARD_H 1' + def_soundcard_h='#define HAVE_SOUNDCARD_H 1' fi fi echores "$_soundcard_h" @@ -3380,8 +3304,8 @@ echores "$_termcap" echocheck "termios" _def_termios='#undef HAVE_TERMIOS' -_def_termios_h='#undef HAVE_TERMIOS_H' -_def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H' +def_termios_h='#undef HAVE_TERMIOS_H' +def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H' if test "$_termios" = auto ; then _termios=no for _termios_header in "sys/termios.h" "termios.h"; do @@ -3396,9 +3320,9 @@ fi if test "$_termios" = yes ; then _def_termios='#define HAVE_TERMIOS 1' if test "$_termios_header" = "termios.h" ; then - _def_termios_h='#define HAVE_TERMIOS_H 1' + def_termios_h='#define HAVE_TERMIOS_H 1' else - _def_termios_sys_h='#define HAVE_SYS_TERMIOS_H 1' + def_termios_sys_h='#define HAVE_SYS_TERMIOS_H 1' fi fi echores "$_termios" @@ -3441,7 +3365,9 @@ echores "$_strsep" echocheck "vsscanf()" cat > $TMPC << EOF +#define _ISOC99_SOURCE #include <stdarg.h> +#include <stdio.h> int main(void) { vsscanf(0, 0, 0); return 0; } EOF _vsscanf=no @@ -3577,9 +3503,9 @@ EOF _sys_sysinfo=no cc_check && _sys_sysinfo=yes if test "$_sys_sysinfo" = yes ; then - _def_sys_sysinfo='#define HAVE_SYS_SYSINFO_H 1' + def_sys_sysinfo_h='#define HAVE_SYS_SYSINFO_H 1' else - _def_sys_sysinfo='#undef HAVE_SYS_SYSINFO_H' + def_sys_sysinfo_h='#undef HAVE_SYS_SYSINFO_H' fi echores "$_sys_sysinfo" @@ -5341,8 +5267,8 @@ _def_alsa='#undef CONFIG_ALSA' _def_alsa5='#undef CONFIG_ALSA5' _def_alsa9='#undef CONFIG_ALSA9' _def_alsa1x='#undef CONFIG_ALSA1X' -_def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' -_def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' +def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' +def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' if test "$_alsaver" ; then _alsa=yes if test "$_alsaver" = '0.5.x' ; then @@ -5350,7 +5276,7 @@ if test "$_alsaver" ; then _aosrc="$_aosrc ao_alsa5.c" _aomodules="alsa5 $_aomodules" _def_alsa5='#define CONFIG_ALSA5 1' - _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' + def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 0.5.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-sys' ; then _alsa9=yes @@ -5358,7 +5284,7 @@ if test "$_alsaver" ; then _aomodules="alsa $_aomodules" _def_alsa='#define CONFIG_ALSA 1' _def_alsa9='#define CONFIG_ALSA9 1' - _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' + def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 0.9.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-alsa' ; then _alsa9=yes @@ -5366,7 +5292,7 @@ if test "$_alsaver" ; then _aomodules="alsa $_aomodules" _def_alsa='#define CONFIG_ALSA 1' _def_alsa9='#define CONFIG_ALSA9 1' - _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' + def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' _res_comment="using alsa 0.9.x and alsa/asoundlib.h" elif test "$_alsaver" = '1.0.x-sys' ; then _alsa1x=yes @@ -5374,7 +5300,7 @@ if test "$_alsaver" ; then _aomodules="alsa $_aomodules" _def_alsa='#define CONFIG_ALSA 1' _def_alsa1x="#define CONFIG_ALSA1X 1" - _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' + def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 1.0.x and sys/asoundlib.h" elif test "$_alsaver" = '1.0.x-alsa' ; then _alsa1x=yes @@ -5382,7 +5308,7 @@ if test "$_alsaver" ; then _aomodules="alsa $_aomodules" _def_alsa='#define CONFIG_ALSA 1' _def_alsa1x="#define CONFIG_ALSA1X 1" - _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' + def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' _res_comment="using alsa 1.0.x and alsa/asoundlib.h" else _alsa=no @@ -5455,6 +5381,34 @@ echores "$_sgiaudio" fi #if irix +# set default CD/DVD devices +if win32 || os2 ; then + default_cdrom_device="D:" +elif darwin ; then + default_cdrom_device="/dev/disk1" +elif dragonfly ; then + default_cdrom_device="/dev/cd0" +elif freebsd ; then + default_cdrom_device="/dev/acd0" +elif openbsd ; then + default_cdrom_device="/dev/rcd0a" +elif sunos ; then + default_cdrom_device="/vol/dev/aliases/cdrom0" +elif amigaos ; then + default_cdrom_device="a1ide.device:2" +else + default_cdrom_device="/dev/cdrom" +fi + +if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then + default_dvd_device=$default_cdrom_device +elif darwin ; then + default_dvd_device="/dev/rdiskN" +else + default_dvd_device="/dev/dvd" +fi + + echocheck "VCD support" if linux || freebsd || netbsd || dragonfly || bsdos || darwin || sunos || mingw32; then _inputmodules="vcd $_inputmodules" @@ -5533,14 +5487,14 @@ fi if test "$_libdvdcss_internal" = yes ; then if linux || netbsd || openbsd || bsdos ; then _def_dvd_linux='#define HAVE_LINUX_DVD_STRUCT 1' - openbsd && _dev_dvd_openbsd='#define HAVE_OPENBSD_DVD_STRUCT 1' + openbsd && _def_dvd_openbsd='#define HAVE_OPENBSD_DVD_STRUCT 1' elif freebsd || dragonfly ; then _def_dvd_bsd='#define HAVE_BSD_DVD_STRUCT 1' elif darwin ; then _def_dvd_darwin='#define DARWIN_DVD_IOCTL' _ld_extra="$_ld_extra -framework IOKit" elif cygwin ; then - cflags_libdvdcss="-DSYS_CYGWIN" + cflags_libdvdcss="-DSYS_CYGWIN -DWIN32" elif beos ; then cflags_libdvdcss="-DSYS_BEOS" elif os2 ; then @@ -6019,9 +5973,8 @@ if test "$_theora" = auto ; then #include <theora/theora.h> #include <string.h> int main(void) { - /* theora is in flux, make sure that all interface routines and - * datatypes exist and work the way we expect it, so we don't break - * mplayer */ + /* Theora is in flux, make sure that all interface routines and datatypes + * exist and work the way we expect it, so we don't break MPlayer. */ ogg_packet op; theora_comment tc; theora_info inf; @@ -6072,6 +6025,9 @@ fi echores "$_theora" echocheck "internal mp3lib support" +if test "$_mp3lib" = auto ; then + test "$cc_vendor" = intel && _mp3lib=no || _mp3lib=yes +fi if test "$_mp3lib" = yes ; then _def_mp3lib='#define CONFIG_MP3LIB 1' _codecmodules="mp3lib $_codecmodules" @@ -6082,6 +6038,9 @@ fi echores "$_mp3lib" echocheck "liba52 support" +if test "$_liba52_internal" = auto ; then + test "$cc_vendor" = intel && _liba52_internal=no || _liba52_internal=yes +fi _def_liba52='#undef CONFIG_LIBA52' _def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL" if test "$_liba52_internal" = yes ; then @@ -6175,7 +6134,7 @@ fi echores "$_musepack" -echocheck "FAAC (AAC encoder) support" +echocheck "FAAC support" if test "$_faac" = auto ; then cat > $TMPC <<EOF #include <inttypes.h> @@ -6206,7 +6165,7 @@ _res_comment="in libavcodec: $_faac_lavc" echores "$_faac" -echocheck "FAAD2 (AAC) support" +echocheck "FAAD2 support" if test "$_faad_internal" = auto ; then if x86_32 && test cc_vendor=gnu; then case $cc_version in @@ -6959,7 +6918,7 @@ fi _res_comment="in libavcodec: $_mp3lame_lavc" echores "$_mp3lame" -fi +fi # test "$_mencoder" != no echocheck "mencoder" if test "$_mencoder" = yes ; then @@ -7822,6 +7781,7 @@ cat > config.mak << EOF # Ensure that locale settings do not interfere with shell commands. export LC_ALL = C +CHARSET = $_charset DOC_LANG = $doc_lang DOC_LANGS = $doc_langs DOC_LANG_ALL = $doc_lang_all @@ -7829,22 +7789,21 @@ MAN_LANG = $man_lang MAN_LANGS = $man_langs MAN_LANG_ALL = $man_lang_all -DESTDIR = prefix = \$(DESTDIR)$_prefix BINDIR = \$(DESTDIR)$_bindir DATADIR = \$(DESTDIR)$_datadir +LIBDIR = \$(DESTDIR)$_libdir MANDIR = \$(DESTDIR)$_mandir CONFDIR = \$(DESTDIR)$_confdir -LIBDIR = \$(DESTDIR)$_libdir AR = $_ar CC = $_cc CXX = $_cc HOST_CC = $_host_cc -RANLIB = $_ranlib -WINDRES = $_windres INSTALL = $_install INSTALLSTRIP = $_install_strip +RANLIB = $_ranlib +WINDRES = $_windres EXTRA_INC = $_inc_extra EXTRAXX_INC = $_inc_extra $_inc_extraxx @@ -7866,33 +7825,26 @@ EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm EXTRALIBS_MPLAYER = $_libs_mplayer EXTRALIBS_MENCODER = $_libs_mencoder -CHARSET = $_charset -HELP_FILE = $_mp_help - -EXESUF = $_exesuf +DEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&," -$_target_arch -$_target_arch_x86 -`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'` +MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," +MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.hh,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," GETCH = $_getch +HELP_FILE = $_mp_help TIMER = $_timer AO_SRCS = $_aosrc VO_SRCS = $_vosrc -MENCODER = $_mencoder -MPLAYER = $_mplayer +EXESUF = $_exesuf -#internal libraries -LIBA52 = $_liba52 -LIBA52_INTERNAL = $_liba52_internal -LIBMPEG2 = $_libmpeg2 -MP3LIB = $_mp3lib -TREMOR_INTERNAL = $_tremor_internal +$_target_arch +$_target_arch_x86 +`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'` -HAVE_SYS_MMAN_H = $_mman -HAVE_POSIX_SELECT = $_posix_select +MENCODER = $_mencoder +MPLAYER = $_mplayer NEED_GETTIMEOFDAY = $_need_gettimeofday NEED_GLOB = $_need_glob @@ -7903,12 +7855,9 @@ NEED_STRSEP = $_need_strsep NEED_SWAB = $_need_swab NEED_VSSCANF = $_need_vsscanf -# audio output -OSS = $_ossaudio -ALSA9 = $_alsa9 -ALSA1X = $_alsa1x - # features +ALSA1X = $_alsa1x +ALSA9 = $_alsa9 APPLE_IR = $_apple_ir APPLE_REMOTE = $_apple_remote AUDIO_INPUT = $_audio_input @@ -7930,9 +7879,14 @@ GIF = $_gif GUI = $_gui GUI_GTK = $_gui_gtk GUI_WIN32 = $_gui_win32 +HAVE_POSIX_SELECT = $_posix_select +HAVE_SYS_MMAN_H = $_mman +HAVE_XVMC = $_xvmc JOYSTICK = $_joystick JPEG = $_jpeg LADSPA = $_ladspa +LIBA52 = $_liba52 +LIBA52_INTERNAL = $_liba52_internal LIBASS = $_ass LIBDCA = $_libdca LIBDV = $_libdv @@ -7941,6 +7895,7 @@ LIBLZO = $_liblzo LIBMAD = $_mad LIBMENU = $_menu LIBMENU_DVBIN = $_menu_dvbin +LIBMPEG2 = $_libmpeg2 LIBNEMESI = $_nemesi LIBNUT = $_libnut LIBSMBCLIENT = $_smb @@ -7951,9 +7906,11 @@ LIVE555 = $_live MACOSX_BUNDLE = $_macosx_bundle MACOSX_FINDER = $_macosx_finder MP3LAME = $_mp3lame +MP3LIB = $_mp3lib MUSEPACK = $_musepack NATIVE_RTSP = $_native_rtsp NETWORK = $_network +OSS = $_ossaudio PE_EXECUTABLE = $_pe_executable PNG = $_png PVR = $_pvr @@ -7967,6 +7924,7 @@ REAL_CODECS = $_real SPEEX = $_speex STREAM_CACHE = $_stream_cache TOOLAME=$_toolame +TREMOR_INTERNAL = $_tremor_internal TV = $_tv TV_BSDBT848 = $_tv_bsdbt848 TV_DSHOW = $_tv_dshow @@ -8027,8 +7985,9 @@ LIBSUF=.a LIBNAME=\$(LIBPREF)\$(NAME)\$(LIBSUF) CONFIG_ENCODERS=yes +# Some FFmpeg codecs depend on this. Enable it unconditionally for now. +CONFIG_FFT=yes CONFIG_GPL=yes -CONFIG_MUXERS=$_mencoder CONFIG_LIBAMR=$_libamr CONFIG_LIBAMR_NB=$_libamr_nb CONFIG_LIBAMR_WB=$_libamr_wb @@ -8040,6 +7999,7 @@ CONFIG_LIBVORBIS=$_libvorbis CONFIG_LIBX264=$_x264_lavc CONFIG_LIBXVID=$_xvid_lavc CONFIG_MLIB = $_mlib +CONFIG_MUXERS=$_mencoder CONFIG_POSTPROC = yes # Prevent building libavcodec/imgresample.c with conflicting symbols CONFIG_SWSCALE=yes @@ -8047,7 +8007,6 @@ CONFIG_ZLIB=$_zlib HAVE_PTHREADS = $_pthreads HAVE_W32THREADS = $_w32threads -HAVE_XVMC = $_xvmc `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/'` @@ -8055,12 +8014,6 @@ HAVE_XVMC = $_xvmc `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 $_libavbsfs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` - -DEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&," - -MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," -MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," - EOF ############################################################################# @@ -8080,646 +8033,324 @@ done echo "Creating config.h" cat > $TMPH << EOF -/* -------- This file has been automatically generated by configure --------- - Note: Any changes in it will be lost when you run configure again. */ +/*---------------------------------------------------------------------------- +** This file has been automatically generated by configure any changes in it +** will be lost when you run configure again. +** Instead of modifying definitions here, use the --enable/--disable options +** of the configure script! See ./configure --help for details. +*---------------------------------------------------------------------------*/ -/* Protect against multiple inclusion */ #ifndef MPLAYER_CONFIG_H #define MPLAYER_CONFIG_H +/* Undefine this if you do not want to select mono audio (left or right) + with a stereo MPEG layer 2/3 audio stream. The command line option + -stereo has three possible values (0 for stereo, 1 for left-only, 2 for + right-only), with 0 being the default. + */ +#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 + +/* Enable fast OSD/SUB renderer (looks ugly, but uses less CPU power) */ +#undef FAST_OSD +#undef FAST_OSD_TABLE + +/* Define this to enable MPEG-1/2 image postprocessing in libmpeg2 */ +#define MPEG12_POSTPROC 1 +#define ATTRIBUTE_ALIGNED_MAX 16 + + + #define CONFIGURATION "$_configuration" -/* make sure we never get lavformat's poll() emulation, the results are - horrible if the X libs try to actually use it, see MPlayer-users - Message-ID: <45D49541.8060101@infernix.net> - Date: Thu, 15 Feb 2007 18:15:45 +0100 - Subject: [MPlayer-users] Crash with backtrace when playing back demuxed... -*/ -#define HAVE_SYS_POLL_H 1 +#define MPLAYER_DATADIR "$_datadir" +#define MPLAYER_CONFDIR "$_confdir" +#define MPLAYER_LIBDIR "$_libdir" -/* yes, we have inttypes.h */ +/* definitions needed by included libraries */ #define HAVE_INTTYPES_H 1 - -/* int_fastXY_t emulation */ +/* libmpeg2 + FFmpeg */ $_def_fast_inttypes - /* libdvdcss */ #define HAVE_ERRNO_H 1 - /* libdvdcss + libdvdread */ #define HAVE_LIMITS_H 1 - /* libdvdcss + libfaad2 */ #define HAVE_UNISTD_H 1 - /* libfaad2 + libdvdread */ #define STDC_HEADERS 1 - -/* libfaad2 */ #define HAVE_MEMCPY 1 -#define HAVE_STRCHR 1 - /* libdvdread */ #define HAVE_UINTPTR_T 1 -/* name of messages charset */ -$_def_charset - -/* Runtime CPU detection */ -$_def_runtime_cpudetection - -/* Dynamic a/v plugins */ -$_def_dynamic_plugins -/* "restrict" keyword */ -$_def_restrict_keyword +/* system headers */ +$def_alloca_h +$def_alsa_asoundlib_h +$def_altivec_h +$def_malloc_h +$def_mman_h +$_def_mman_has_map_failed +$def_soundcard_h +$def_sys_asoundlib_h +$def_sys_soundcard_h +$def_sys_sysinfo_h +$def_termios_h +$def_termios_sys_h +$def_winsock2_h -/* __builtin_expect branch prediction hint */ -$_def_builtin_expect -#ifdef HAVE_BUILTIN_EXPECT -#define likely(x) __builtin_expect ((x) != 0, 1) -#define unlikely(x) __builtin_expect ((x) != 0, 0) -#else -#define likely(x) (x) -#define unlikely(x) (x) -#endif -/* attribute(used) as needed by some compilers */ -#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 300) -# define attribute_used __attribute__((used)) -#else -# define attribute_used -#endif +/* system functions */ +$_def_gethostbyname2 +$_def_gettimeofday +$_def_glob +$_def_langinfo +$_def_llrint +$_def_lrint +$_def_lrintf +$_def_map_memalign +$_def_memalign +$_def_memalign_hack +$_def_nanosleep +$_def_posix_select +$_def_round +$_def_roundf +$_def_select +$_def_setenv +$_def_shm +$_def_strsep +$_def_swab +$_def_sysi86 +$_def_sysi86_iv +$_def_termcap +$_def_termios +$_def_vsscanf -/* extern symbol prefix */ -$_def_extern_prefix -/* compiler support for named assembler arguments */ +/* system-specific features */ +$_def_asmalign_pot +$_def_builtin_expect +$_def_dl +$_def_iconv +$_def_kstat +$_def_macosx_bundle +$_def_macosx_finder +$_def_maemo $_def_named_asm_args +$_def_quicktime +$_def_restrict_keyword +$_def_rtc +$_def_unrar_exec -/* enable/disable SIGHANDLER */ -$_def_sighandler -/* enable/disable automatic gdb attach on crash, requires SIGHANDLER */ +/* configurable options */ +$_def_charset $_def_crash_debug - -/* Toggles debugging informations */ $_def_debug +$_def_dynamic_plugins +$_def_fastmemcpy +$_def_menu +$_def_runtime_cpudetection +$_def_sighandler +$_def_sortsub +$_def_stream_cache -/* Indicates that libcdio is available for VCD and CD-DA playback */ -$_def_libcdio -/* Indicates that Ogle's libdvdread is available for DVD playback */ -$_def_dvdread +/* CPU stuff */ +#define __CPU__ $iproc +$_def_words_endian +`ff_config_enable "$_arch_all" "$_arch" "ARCH"` +`ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"` -/* Indicates that dvdread is internal */ -$_def_dvdread_internal -/* Additional options for libdvdread/libdvdcss */ -$_def_dvd -$_def_cdrom -$_def_cdio -$_def_dvdio +/* DVD/VCD/CD */ +#define DEFAULT_CDROM_DEVICE "$default_cdrom_device" +#define DEFAULT_DVD_DEVICE "$default_dvd_device" $_def_bsdi_dvd +$_def_cddb +$_def_cdio +$_def_cdparanoia +$_def_cdrom +$_def_dvd $_def_dvd_bsd -$_def_dvd_linux -$_dev_dvd_openbsd $_def_dvd_darwin -$_def_sol_scsi_h +$_def_dvd_linux +$_def_dvd_openbsd +$_def_dvdio +$_def_dvdnav +$_def_dvdread +$_def_dvdread_internal $_def_hpux_scsi_h +$_def_libcdio +$_def_sol_scsi_h +$_def_vcd -/* Common data directory (for fonts, etc) */ -#define MPLAYER_DATADIR "$_datadir" -#define MPLAYER_CONFDIR "$_confdir" -#define MPLAYER_LIBDIR "$_libdir" - -/* Define this to compile stream-caching support, it can be enabled via - -cache <kilobytes> */ -$_def_stream_cache - -/* Define if you are using Xvid library */ -$_def_xvid - -/* Define if you are using the X.264 library */ -$_def_x264 - -/* Define if you are using libnut */ -$_def_libnut -/* Define to include support for libdv-0.9.5 */ +/* codec libraries */ +$_def_faac +$_def_faad +$_def_faad_internal +$_def_liba52 +$_def_liba52_internal +$_def_libdca $_def_libdv - -/* Indicates if libmp3lame is available - Note: for mencoder */ +$_def_liblzo +$_def_libmpeg2 +$_def_mad $_def_mp3lame $_def_mp3lame_preset $_def_mp3lame_preset_medium - -/* Undefine this if you do not want to select mono audio (left or right) - with a stereo MPEG layer 2/3 audio stream. The command line option - -stereo has three possible values (0 for stereo, 1 for left-only, 2 for - right-only), with 0 being the default. - */ -#define CONFIG_FAKE_MONO 1 - -/* Undefine this if your sound card driver has no working select(). - If you have kernel Oops, player hangups, or just no audio, you should - try to recompile MPlayer with this option disabled! */ -$_def_select - -/* define this to use iconv(3) function to codepage conversions */ -$_def_iconv - -/* define this to use nl_langinfo function */ -$_def_langinfo - -/* define this to use RTC (/dev/rtc) for video timers */ -$_def_rtc - -/* 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 - -/* Define this if your system has the header file for the OSS sound interface */ -$_def_sys_soundcard - -/* Define this if your system has the header file for the OSS sound interface - * in /usr/include */ -$_def_soundcard - -/* Define this if your system has the sysinfo header */ -$_def_sys_sysinfo - -/* Define this if your system has the "malloc.h" header file */ -$_def_malloc - -/* memalign is mapped to malloc if unsupported */ -$_def_memalign -$_def_map_memalign -$_def_memalign_hack - -/* assembler handling of .align */ -$_def_asmalign_pot - -/* Define this if your system has the "alloca.h" header file */ -$_def_alloca - -/* Define this if your system has the "byteswap.h" header file */ -$_def_byteswap_h - -/* Define this if your system has the "sys/mman.h" header file */ -$_def_mman -$_def_mman_has_map_failed - -/* Define this if you have the elf dynamic linker -ldl library */ -$_def_dl - -/* Define this if you have the kstat kernel statistics library */ -$_def_kstat - -/* Define this if you have zlib */ +$_def_mp3lib +$_def_musepack +$_def_speex +$_def_theora +$_def_toolame +$_def_tremor +$_def_twolame +$_def_vorbis +$_def_x264 +$_def_xvid $_def_zlib -/* Define this if you have shm support */ -$_def_shm - -/* Define this if your system has strsep */ -$_def_strsep - -/* Define this if your system has vsscanf */ -$_def_vsscanf - -/* Define this if your system has swab */ -$_def_swab |