X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=27782b5f9dbbb5d63e4ff57c586a56e0560de1e8;hb=9f3d3ecf929f776f2d328e3ad118e4abcd33feaa;hp=000cd2a87571b03edcd8d2850d8c7c59ebae8281;hpb=ff1c015d415352fe886cf85b6962d47cdbed1f6d;p=ffmpeg diff --git a/configure b/configure index 000cd2a8757..27782b5f9db 100755 --- a/configure +++ b/configure @@ -68,14 +68,17 @@ show_help(){ echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]" echo " --incdir=DIR install includes in DIR [PREFIX/include]" echo " --mandir=DIR install man page in DIR [PREFIX/share/man]" - echo " --enable-static build static libraries [yes]" + echo + echo "Configuration options:" echo " --disable-static do not build static libraries [no]" echo " --enable-shared build shared libraries [no]" - echo " --disable-shared do not build shared libraries [yes]" echo " --enable-gpl allow use of GPL code, the resulting libs" echo " and binaries will be under GPL [no]" echo " --enable-nonfree allow use of nonfree code, the resulting libs" echo " and binaries will be unredistributable [no]" + echo " --disable-ffmpeg disable ffmpeg build" + echo " --disable-ffplay disable ffplay build" + echo " --disable-ffserver disable ffserver build" echo " --enable-postproc enable GPLed postprocessing support [no]" echo " --enable-swscale enable GPLed software scaler support [no]" echo " --enable-avfilter video filter support (replaces vhook) [no]" @@ -84,13 +87,62 @@ show_help(){ echo " --enable-beosthreads use BeOS threads [no]" echo " --enable-os2threads use OS/2 threads [no]" echo " --enable-pthreads use pthreads [no]" - echo " --enable-vdpau enable VDPAU support [no]" echo " --enable-w32threads use Win32 threads [no]" echo " --enable-x11grab enable X11 grabbing [no]" + echo " --enable-vdpau enable VDPAU support [no]" echo " --enable-xvmc enable XvMC support [no]" + echo " --disable-network disable network support [no]" + echo " --disable-ipv6 disable IPv6 support [no]" + echo " --disable-mpegaudio-hp faster (but less accurate) MPEG audio decoding [no]" + echo " --enable-gray enable full grayscale support (slower color)" + echo " --disable-fastdiv disable table-based division" + echo " --enable-small optimize for size instead of speed" + echo " --disable-aandct disable AAN DCT code" + echo " --disable-fft disable FFT code" + echo " --disable-golomb disable Golomb code" + echo " --disable-mdct disable MDCT code" + echo " --enable-hardcoded-tables use hardcoded tables instead of runtime generation" + echo " --enable-memalign-hack emulate memalign, interferes with memory debuggers" + echo " --enable-beos-netserver enable BeOS netserver" + echo " --disable-encoder=NAME disable encoder NAME" + echo " --enable-encoder=NAME enable encoder NAME" + echo " --disable-encoders disable all encoders" + echo " --disable-decoder=NAME disable decoder NAME" + echo " --enable-decoder=NAME enable decoder NAME" + echo " --disable-decoders disable all decoders" + echo " --disable-muxer=NAME disable muxer NAME" + echo " --enable-muxer=NAME enable muxer NAME" + echo " --disable-muxers disable all muxers" + echo " --disable-demuxer=NAME disable demuxer NAME" + echo " --enable-demuxer=NAME enable demuxer NAME" + echo " --disable-demuxers disable all demuxers" + echo " --enable-parser=NAME enable parser NAME" + echo " --disable-parser=NAME disable parser NAME" + echo " --disable-parsers disable all parsers" + echo " --enable-bsf=NAME enable bitstream filter NAME" + echo " --disable-bsf=NAME disable bitstream filter NAME" + echo " --disable-bsfs disable all bitstream filters" + echo " --enable-protocol=NAME enable protocol NAME" + echo " --disable-protocol=NAME disable protocol NAME" + echo " --disable-protocols disable all protocols" + echo " --disable-indevs disable input devices" + echo " --disable-outdevs disable output devices" + echo " --disable-devices disable all devices" + echo " --enable-filter=NAME enable filter NAME" + echo " --disable-filter=NAME disable filter NAME" + echo " --disable-filters disable all filters" + echo " --list-decoders show all available decoders" + echo " --list-encoders show all available encoders" + echo " --list-muxers show all available muxers" + echo " --list-demuxers show all available demuxers" + echo " --list-parsers show all available parsers" + echo " --list-protocols show all available protocols" + echo " --list-bsfs show all available bitstream filters" + echo " --list-indevs show all available input devices" + echo " --list-outdevs show all available output devices" + echo " --list-filters show all available filters" echo echo "External library support:" - echo " --enable-mlib enable Sun medialib [no]" echo " --enable-avisynth enable reading of AVISynth script files [no]" echo " --enable-bzlib enable bzlib [autodetect]" echo " --enable-libamr-nb enable libamr-nb floating point audio codec [no]" @@ -113,6 +165,7 @@ show_help(){ echo " --enable-libx264 enable H.264 encoding via x264 [no]" echo " --enable-libxvid enable Xvid encoding via xvidcore," echo " native MPEG-4/Xvid encoder exists [no]" + echo " --enable-mlib enable Sun medialib [no]" echo " --enable-zlib enable zlib [autodetect]" echo "" echo "Advanced options (experts only):" @@ -123,7 +176,7 @@ show_help(){ echo " --target-exec=CMD command to run executables on target" echo " --target-path=DIR path to view of build directory on target" echo " --nm=NM use nm tool" - echo " --cc=CC use C compiler CC [$cc]" + echo " --cc=CC use C compiler CC [$cc_default]" echo " --host-cc=HOSTCC use host C compiler HOSTCC" echo " --host-cflags=HCFLAGS use HCFLAGS when compiling for host" echo " --host-ldflags=HLDFLAGS use HLDFLAGS when linking for host" @@ -145,64 +198,12 @@ show_help(){ echo " --disable-ssse3 disable SSSE3 optimizations" echo " --disable-armv5te disable armv5te optimizations" echo " --disable-armv6 disable armv6 optimizations" + echo " --disable-armv6t2 disable armv6t2 optimizations" echo " --disable-armvfp disable ARM VFP optimizations" echo " --disable-iwmmxt disable iwmmxt optimizations" echo " --disable-mmi disable MMI optimizations" echo " --disable-neon disable neon optimizations" echo " --disable-vis disable VIS optimizations" - echo " --disable-network disable network support [no]" - echo " --disable-ipv6 disable IPv6 support [no]" - echo " --disable-mpegaudio-hp faster (but less accurate)" - echo " MPEG audio decoding [no]" - echo " --disable-aandct disable AAN DCT code" - echo " --disable-fft disable FFT code" - echo " --disable-golomb disable Golomb code" - echo " --disable-mdct disable MDCT code" - echo " --enable-gray enable full grayscale support (slower color)" - echo " --disable-ffmpeg disable ffmpeg build" - echo " --disable-ffplay disable ffplay build" - echo " --disable-ffserver disable ffserver build" - echo " --enable-small optimize for size instead of speed" - echo " --enable-hardcoded-tables use hardcoded tables instead of runtime generation" - echo " --enable-memalign-hack emulate memalign, interferes with memory debuggers" - echo " --enable-beos-netserver enable BeOS netserver" - echo " --disable-encoder=NAME disable encoder NAME" - echo " --enable-encoder=NAME enable encoder NAME" - echo " --disable-encoders disable all encoders" - echo " --disable-decoder=NAME disable decoder NAME" - echo " --enable-decoder=NAME enable decoder NAME" - echo " --disable-decoders disable all decoders" - echo " --disable-muxer=NAME disable muxer NAME" - echo " --enable-muxer=NAME enable muxer NAME" - echo " --disable-muxers disable all muxers" - echo " --disable-demuxer=NAME disable demuxer NAME" - echo " --enable-demuxer=NAME enable demuxer NAME" - echo " --disable-demuxers disable all demuxers" - echo " --enable-parser=NAME enable parser NAME" - echo " --disable-parser=NAME disable parser NAME" - echo " --disable-parsers disable all parsers" - echo " --enable-bsf=NAME enable bitstream filter NAME" - echo " --disable-bsf=NAME disable bitstream filter NAME" - echo " --disable-bsfs disable all bitstream filters" - echo " --enable-protocol=NAME enable protocol NAME" - echo " --disable-protocol=NAME disable protocol NAME" - echo " --disable-protocols disable all protocols" - echo " --disable-indevs disable input devices" - echo " --disable-outdevs disable output devices" - echo " --disable-devices disable all devices" - echo " --enable-filter=NAME enable filter NAME" - echo " --disable-filter=NAME disable filter NAME" - echo " --disable-filters disable all filters" - echo " --list-decoders show all available decoders" - echo " --list-encoders show all available encoders" - echo " --list-muxers show all available muxers" - echo " --list-demuxers show all available demuxers" - echo " --list-parsers show all available parsers" - echo " --list-protocols show all available protocols" - echo " --list-bsfs show all available bitstream filters" - echo " --list-indevs show all available input devices" - echo " --list-outdevs show all available output devices" - echo " --list-filters show all available filters" echo echo "Developer options (useful when working on FFmpeg itself):" echo " --disable-debug disable debugging symbols" @@ -426,10 +427,9 @@ print_config(){ ucname="`toupper $cfg`" if enabled $cfg; then echo "#define ${pfx}${ucname} 1" >> $header - echo "#define ENABLE_${ucname} 1" >> $header echo "${pfx}${ucname}=yes" >> $makefile else - echo "#define ENABLE_${ucname} 0" >> $header + echo "#define ${pfx}${ucname} 0" >> $header fi done } @@ -740,6 +740,7 @@ CONFIG_LIST=" avisynth beos_netserver bzlib + fastdiv ffmpeg ffplay ffserver @@ -821,6 +822,7 @@ ARCH_EXT_LIST=' mmx mmx2 neon + ppc4xx sse ssse3 vis @@ -874,6 +876,7 @@ HAVE_LIST=" roundf sdl sdl_video_size + setmode socklen_t soundcard_h poll_h @@ -884,6 +887,7 @@ HAVE_LIST=" sys_videoio_h termios_h threads + truncf winsock2_h yasm " @@ -948,6 +952,7 @@ mmi_deps="mips" mmx_deps="x86" mmx2_deps="x86 mmx" neon_deps="arm" +ppc4xx_deps="ppc" sse_deps="mmx" ssse3_deps="x86 sse" vis_deps="sparc" @@ -991,6 +996,8 @@ mjpeg_encoder_select="aandct" mpeg1video_encoder_select="aandct" mpeg2video_encoder_select="aandct" mpeg4_encoder_select="aandct" +mpeg_vdpau_decoder_deps="vdpau" +mpeg1_vdpau_decoder_deps="vdpau" mpeg_xvmc_decoder_deps="xvmc X11_extensions_XvMClib_h" msmpeg4v1_encoder_select="aandct" msmpeg4v2_encoder_select="aandct" @@ -1011,6 +1018,7 @@ svq3_decoder_suggest="zlib" tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" tscc_decoder_select="zlib" +vc1_vdpau_decoder_deps="vdpau" vorbis_decoder_select="fft mdct" vorbis_encoder_select="fft mdct" wmav1_decoder_select="fft mdct" @@ -1019,6 +1027,7 @@ wmav2_decoder_select="fft mdct" wmav2_encoder_select="fft mdct" wmv1_encoder_select="aandct" wmv2_encoder_select="aandct" +wmv3_vdpau_decoder_deps="vdpau" zlib_decoder_select="zlib" zlib_encoder_select="zlib" zmbv_decoder_select="zlib" @@ -1224,11 +1233,11 @@ show_list() { for opt do optval="${opt#*=}" case "$opt" in - --extra-cflags=*) add_cflags "$optval" + --extra-cflags=*) add_cflags $optval ;; - --extra-ldflags=*) add_ldflags "$optval" + --extra-ldflags=*) add_ldflags $optval ;; - --extra-libs=*) add_extralibs "$optval" + --extra-libs=*) add_extralibs $optval ;; --disable-devices) disable $INDEV_LIST $OUTDEV_LIST ;; @@ -1302,15 +1311,17 @@ check_cflags -std=c99 case "$arch" in i386|i486|i586|i686|i86pc|BePC) - arch="x86_32" + arch="x86" + subarch="x86_32" enable fast_unaligned ;; x86_64|amd64) - arch="x86_32" + arch="x86" + subarch="x86_32" enable cmov enable fast_cmov enable fast_unaligned - check_cc <&1 | grep -q xlc; then - add_cflags "-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto" + add_cflags -qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto else - add_cflags "-pipe" - check_cflags "-force_cpusubtype_ALL" - check_cflags "-Wno-sign-compare" + add_cflags -pipe + check_cflags -force_cpusubtype_ALL + check_cflags -Wno-sign-compare enabled shared || check_cflags -mdynamic-no-pic fi fi @@ -1620,68 +1631,71 @@ if test $cpu != "generic"; then } case $cpu in 601|ppc601|PowerPC601) - add_cflags "-mcpu=601" + add_cflags -mcpu=601 warn_altivec enabled PPC601 ;; 603*|ppc603*|PowerPC603*) - add_cflags "-mcpu=603" + add_cflags -mcpu=603 warn_altivec enabled PPC603 ;; 604*|ppc604*|PowerPC604*) - add_cflags "-mcpu=604" + add_cflags -mcpu=604 warn_altivec enabled PPC604 ;; G3|g3|75*|ppc75*|PowerPC75*) - add_cflags "-mcpu=750 -mpowerpc-gfxopt" + add_cflags -mcpu=750 -mpowerpc-gfxopt warn_altivec enabled PPC75x ;; G4|g4|745*|ppc745*|PowerPC745*) - add_cflags "-mcpu=7450 -mpowerpc-gfxopt" + add_cflags -mcpu=7450 -mpowerpc-gfxopt warn_altivec disabled PPC745x ;; 74*|ppc74*|PowerPC74*) - add_cflags "-mcpu=7400 -mpowerpc-gfxopt" + add_cflags -mcpu=7400 -mpowerpc-gfxopt warn_altivec disabled PPC74xx ;; G5|g5|970|ppc970|PowerPC970|power4*|Power4*) - add_cflags "-mcpu=970 -mpowerpc-gfxopt -mpowerpc64" + add_cflags -mcpu=970 -mpowerpc-gfxopt -mpowerpc64 warn_altivec disabled PPC970 enable ppc64 ;; Cell|CELL|cell) - add_cflags "-mcpu=cell" + add_cflags -mcpu=cell warn_altivec disabled Cell enable ppc64 ;; # targets that do NOT support conditional mov (cmov) i[345]86|pentium|pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3) - add_cflags "-march=$cpu" + add_cflags -march=$cpu disable cmov ;; # targets that do support conditional mov (cmov) i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|core2) - add_cflags "-march=$cpu" + add_cflags -march=$cpu enable cmov enable fast_cmov ;; # targets that do support conditional mov but on which it's slow pentium4|pentium4m|prescott|nocona) - add_cflags "-march=$cpu" + add_cflags -march=$cpu enable cmov disable fast_cmov ;; sparc64) - add_cflags "-mcpu=v9" + add_cflags -mcpu=v9 ;; arm11*|cortex*) - add_cflags "-mcpu=$cpu" + add_cflags -mcpu=$cpu enable fast_unaligned ;; armv*) - add_cflags "-march=$cpu" + add_cflags -march=$cpu ;; arm*) - add_cflags "-mcpu=$cpu" + add_cflags -mcpu=$cpu + ;; + ev4|ev45|ev5|ev56|pca56|ev6|ev67) + add_cflags -mcpu=$cpu ;; *) echo "WARNING: Unknown CPU \"$cpu\", ignored." @@ -1746,7 +1760,7 @@ EOF check_asm bswap '"bswap %%eax" ::: "%eax"' - YASMFLAGS="-f $objformat -DARCH_$(toupper $arch)" + YASMFLAGS="-f $objformat -DARCH_$(toupper $subarch)" enabled x86_64 && append YASMFLAGS "-m amd64" enabled_all x86_64 shared && append YASMFLAGS "-DPIC" case "$objformat" in @@ -1759,9 +1773,8 @@ fi # check for assembler specific support -if test $arch = "ppc"; then - check_asm dcbzl '"dcbzl 0, 1"' -fi +enabled ppc && check_asm dcbzl '"dcbzl 0, 1"' +enabled ppc && check_asm ppc4xx '"maclhw r10, r11, r12"' # check for SIMD availability @@ -1799,7 +1812,7 @@ enabled mmi && check_asm mmi '"lq $2, 0($2)"' enabled neon && check_asm neon '"vadd.i16 q0, q0, q0"' enabled vis && check_asm vis '"pdist %f0, %f0, %f0"' -mcpu=ultrasparc -enabled vis && add_cflags "-mcpu=ultrasparc -mtune=ultrasparc" +enabled vis && add_cflags -mcpu=ultrasparc -mtune=ultrasparc # --- # big/little-endian test @@ -1824,6 +1837,7 @@ check_func inet_aton $network_extralibs check_func memalign check_func mkstemp check_func posix_memalign +check_func_headers io.h setmode check_func_headers windows.h GetProcessTimes check_header conio.h @@ -1874,7 +1888,7 @@ done check_lib math.h sin -lm # test for C99 functions in math.h -for func in llrint lrint lrintf round roundf; do +for func in llrint lrint lrintf round roundf truncf; do check_exec < int main(void) { return ($func(3.999f) > 0)?0:1; } @@ -2040,6 +2054,7 @@ check_cflags -Wno-pointer-sign check_cflags -Wcast-qual check_cflags -Wwrite-strings check_cflags -Wtype-limits +check_cflags -Wundef enabled extra_warnings && check_cflags -Winline # add some linker flags @@ -2053,10 +2068,10 @@ if enabled small; then optimizations="small" elif enabled optimizations; then if $cc -v 2>&1 | grep -q xlc; then - add_cflags "-O5" - add_ldflags "-O5" + add_cflags -O5 + add_ldflags -O5 else - add_cflags "-O3" + add_cflags -O3 fi fi check_cflags -fno-math-errno @@ -2082,15 +2097,15 @@ fi if enabled shared; then # LIBOBJFLAGS may have already been set in the OS configuration if test -z "$LIBOBJFLAGS" ; then - case "$arch" in + case "${subarch-$arch}" in x86_64|ia64|alpha|sparc*|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;; esac fi fi if enabled gprof; then - add_cflags "-p" - add_ldflags "-p" + add_cflags -p + add_ldflags -p fi VHOOKCFLAGS="-fPIC" @@ -2136,7 +2151,7 @@ if test "$extra_version" != ""; then echo "version string suffix $extra_version" fi echo "big-endian ${bigendian-no}" -if test $arch = "x86_32" -o $arch = "x86_64"; then +if enabled x86; then echo "yasm ${yasm-no}" echo "MMX enabled ${mmx-no}" echo "SSE enabled ${sse-no}" @@ -2145,7 +2160,7 @@ if test $arch = "x86_32" -o $arch = "x86_64"; then echo "EBX available ${ebx_available-no}" echo "EBP available ${ebp_available-no}" fi -if test $arch = "arm"; then +if enabled arm; then echo "ARMv5TE enabled ${armv5te-no}" echo "ARMv6 enabled ${armv6-no}" echo "ARMv6T2 enabled ${armv6t2-no}" @@ -2153,10 +2168,10 @@ if test $arch = "arm"; then echo "IWMMXT enabled ${iwmmxt-no}" echo "NEON enabled ${neon-no}" fi -if test $arch = "mips"; then +if enabled mips; then echo "MMI enabled ${mmi-no}" fi -if test $arch = "ppc"; then +if enabled ppc; then echo "AltiVec enabled ${altivec-no}" echo "dcbzl available ${dcbzl-no}" fi @@ -2322,6 +2337,8 @@ fi echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak echo "EXTRALIBS=$extralibs" >> config.mak +echo "ARCH=$arch" >> config.mak + print_config ARCH_ $TMPH config.mak $ARCH_LIST print_config HAVE_ $TMPH config.mak $HAVE_LIST print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \