X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure;h=4d23c9c57cce55931225631ffb98eb651ff0a6d9;hb=c325b5054f7cedb541ebd2f36059d7315a965d5f;hp=0a315710f76975c69d11f43367c14b24ef70ee72;hpb=d8d12c1594ca31f8089c0fd21cd62f013a677bed;p=ffmpeg diff --git a/configure b/configure index 0a315710f76..4d23c9c57cc 100755 --- a/configure +++ b/configure @@ -8,7 +8,8 @@ # # Prevent locale nonsense from breaking basic text processing. -export LC_ALL=C +LC_ALL=C +export LC_ALL # make sure we are running under a compatible shell # try to make this part work with most shells @@ -67,107 +68,129 @@ 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 [default=yes]" - echo " --disable-static do not build static libraries [default=no]" - echo " --enable-shared build shared libraries [default=no]" - echo " --disable-shared do not build shared libraries [default=yes]" - echo " --enable-gpl allow use of GPL code, the resulting libav*" - echo " and ffmpeg will be under GPL [default=no]" - echo " --enable-nonfree allow use of nonfree code, the resulting libav*" - echo " and ffmpeg will be unredistributable [default=no]" - echo " --enable-postproc enable GPLed postprocessing support [default=no]" - echo " --enable-swscale software scaler support [default=no]" - echo " --enable-avfilter video filter support (replaces vhook) [default=no]" - echo " --enable-avfilter-lavf video filters dependant on avformat [default=no]" - echo " --enable-beosthreads use BeOS threads [default=no]" - echo " --enable-os2threads use OS/2 threads [default=no]" - echo " --enable-pthreads use pthreads [default=no]" - echo " --enable-w32threads use Win32 threads [default=no]" - echo " --enable-x11grab enable X11 grabbing [default=no]" + echo " --enable-static build static libraries [yes]" + 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 " --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]" + echo " --enable-avfilter-lavf video filters dependent on avformat [no]" + echo " --disable-vhook disable video hooking support" + echo " --enable-beosthreads use BeOS threads [no]" + echo " --enable-os2threads use OS/2 threads [no]" + echo " --enable-pthreads use pthreads [no]" + echo " --enable-w32threads use Win32 threads [no]" + echo " --enable-x11grab enable X11 grabbing [no]" + echo " --enable-xvmc enable XvMC support [no]" echo echo "External library support:" - echo " --enable-mlib use Sun medialib [default=no]" - echo " --enable-avisynth allow reading AVISynth script files [default=no]" + echo " --enable-mlib enable Sun medialib [no]" + echo " --enable-avisynth enable reading of AVISynth script files [no]" + echo " --enable-bzlib enable bzlib [no]" echo " --enable-libamr-nb enable libamr-nb floating point audio codec" echo " --enable-libamr-wb enable libamr-wb floating point audio codec" echo " --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394" - echo " and libraw1394 [default=no]" - echo " --enable-libdirac enable Dirac support via libdirac [default=no]" - echo " --enable-libfaac enable FAAC support via libfaac [default=no]" - echo " --enable-libfaad enable FAAD support via libfaad [default=no]" - echo " --enable-libfaadbin open libfaad.so.0 at runtime [default=no]" - echo " --enable-libgsm enable GSM support via libgsm [default=no]" - echo " --enable-libmp3lame enable MP3 encoding via libmp3lame [default=no]" + echo " and libraw1394 [no]" + echo " --enable-libdirac enable Dirac support via libdirac [no]" + echo " --enable-libfaac enable FAAC support via libfaac [no]" + echo " --enable-libfaad enable FAAD support via libfaad [no]" + echo " --enable-libfaadbin open libfaad.so.0 at runtime [no]" + echo " --enable-libgsm enable GSM support via libgsm [no]" + echo " --enable-libmp3lame enable MP3 encoding via libmp3lame [no]" echo " --enable-libnut enable NUT (de)muxing via libnut," - echo " native demuxer exists [default=no]" - echo " --enable-libschroedinger enable Dirac support via libschroedinger [default=no]" - echo " --enable-libtheora enable Theora encoding via libtheora [default=no]" + echo " native (de)muxer exists [no]" + echo " --enable-libschroedinger enable Dirac support via libschroedinger [no]" + echo " --enable-libspeex enable Speex decoding via libspeex [no]" + echo " --enable-libtheora enable Theora encoding via libtheora [no]" echo " --enable-libvorbis enable Vorbis encoding via libvorbis," - echo " native implementation exists [default=no]" - echo " --enable-libx264 enable H.264 encoding via x264 [default=no]" + echo " native implementation exists [no]" + 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 [default=no]" + echo " native MPEG-4/Xvid encoder exists [no]" + echo " --enable-zlib enable zlib [no]" echo "" echo "Advanced options (experts only):" echo " --source-path=PATH path to source code [$source_path]" echo " --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix]" echo " --enable-cross-compile assume a cross-compiler is used" echo " --target-os=OS compiler targets OS [$target_os]" + 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 " --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" + echo " --host-libs=HLIBS use libs HLIBS when linking for host" echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]" echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" echo " --extra-version=STRING version string suffix []" - echo " --build-suffix=SUFFIX suffix for application specific build []" - echo " --arch=ARCH select architecture [$arch]" - echo " --cpu=CPU selects the minimum cpu required (affects" + echo " --build-suffix=SUFFIX library name suffix []" + echo " --arch=ARCH select architecture [$arch]" + echo " --cpu=CPU select the minimum required CPU (affects" echo " instruction selection, may crash on older CPUs)" echo " --enable-powerpc-perf enable performance report on PPC" echo " (requires enabling PMC)" - echo " --disable-mmx disable MMX usage" - echo " --disable-mmx2 disable MMX2 usage" - echo " --disable-ssse3 disable SSSE3 usage" - echo " --disable-armv5te disable armv5te usage" - echo " --disable-armv6 disable armv6 usage" - echo " --disable-armvfp disable ARM VFP usage" - echo " --disable-iwmmxt disable iwmmxt usage" - echo " --disable-altivec disable AltiVec usage" - echo " --disable-network disable network support [default=no]" - echo " --disable-ipv6 disable ipv6 support [default=no]" - echo " --disable-zlib disable zlib [default=no]" - echo " --disable-bzlib disable bzlib [default=no]" - echo " --disable-vhook disable video hooking support" + echo " --disable-altivec disable AltiVec optimizations" + echo " --disable-mmx disable MMX optimizations" + echo " --disable-mmx2 disable MMX2 optimizations" + echo " --disable-ssse3 disable SSSE3 optimizations" + echo " --disable-armv5te disable armv5te optimizations" + echo " --disable-armv6 disable armv6 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 [default=no]" + 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-ffserver disable ffserver 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 " --disable-encoder=NAME disables encoder NAME" - echo " --enable-encoder=NAME enables encoder NAME" - echo " --disable-decoder=NAME disables decoder NAME" - echo " --enable-decoder=NAME enables decoder NAME" - echo " --disable-encoders disables all encoders" - echo " --disable-decoders disables all decoders" - echo " --disable-muxer=NAME disables muxer NAME" - echo " --enable-muxer=NAME enables muxer NAME" - echo " --disable-muxers disables all muxers" - echo " --disable-demuxer=NAME disables demuxer NAME" - echo " --enable-demuxer=NAME enables demuxer NAME" - echo " --disable-demuxers disables all demuxers" - echo " --enable-parser=NAME enables parser NAME" - echo " --disable-parser=NAME disables parser NAME" - echo " --disable-parsers disables all parsers" - echo " --enable-bsf=NAME enables bitstream filter NAME" - echo " --disable-bsf=NAME disables bitstream filter NAME" - echo " --disable-bsfs disables all bitstream filters" - echo " --enable-protocol=NAME enables protocol NAME" - echo " --disable-protocol=NAME disables protocol NAME" - echo " --disable-protocols disables all protocols" - echo " --disable-devices disables all devices" + 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" @@ -177,6 +200,7 @@ show_help(){ 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" @@ -187,7 +211,7 @@ show_help(){ echo " --disable-stripping disable stripping of executables and shared libraries" echo "" echo "NOTE: Object files are built at the place where configure is launched." - exit 1 + exit 0 } log(){ @@ -244,6 +268,14 @@ set_all(){ done } +set_weak(){ + value=$1 + shift + for var; do + eval : \${$var:=$value} + done +} + pushvar(){ for var in $*; do eval level=\${${var}_level:=0} @@ -271,6 +303,37 @@ disable(){ set_all no $* } +enable_weak(){ + set_weak yes $* +} + +disable_weak(){ + set_weak no $* +} + +do_enable_deep(){ + for var; do + enabled $var && continue + eval sel="\$${var}_select" + eval sgs="\$${var}_suggest" + pushvar var sgs + enable_deep $sel + popvar sgs + enable_deep_weak $sgs + popvar var + done +} + +enable_deep(){ + do_enable_deep $* + enable $* +} + +enable_deep_weak(){ + do_enable_deep $* + enable_weak $* +} + enabled(){ test "${1#!}" = "$1" && op== || op=!= eval test "x\$${1#!}" $op "xyes" @@ -303,11 +366,12 @@ disabled_any(){ for opt; do disabled $opt && return 0 done + return 1 } set_default(){ for opt; do - eval test -z "\$$opt" && eval $opt=\$${opt}_default + eval : \${$opt:=\$${opt}_default} done } @@ -329,17 +393,22 @@ check_deps(){ eval dep_all="\$${cfg}_deps" eval dep_any="\$${cfg}_deps_any" + eval dep_sel="\$${cfg}_select" + eval dep_sgs="\$${cfg}_suggest" - pushvar cfg dep_all dep_any - check_deps $dep_all $dep_any - popvar cfg dep_all dep_any + pushvar cfg dep_all dep_any dep_sel dep_sgs + check_deps $dep_all $dep_any $dep_sel $dep_sgs + popvar cfg dep_all dep_any dep_sel dep_sgs - enabled_all $dep_all || disable $cfg - enabled_any $dep_any || disable $cfg + enabled_all $dep_all || disable $cfg + enabled_any $dep_any || disable $cfg + disabled_any $dep_sel && disable $cfg if enabled $cfg; then eval dep_extralibs="\$${cfg}_extralibs" test -n "$dep_extralibs" && add_extralibs $dep_extralibs + enable_deep $dep_sel + enable_deep_weak $dep_sgs fi disable ${cfg}_checking @@ -443,7 +512,7 @@ check_asm(){ asm="$2" shift 2 check_cc "$@" < +#if !($condition) +#error "unsatisfied condition: $condition" +#endif +EOF +} + check_lib(){ log check_lib "$@" header="$1" @@ -651,6 +732,7 @@ COMPONENT_LIST=" CONFIG_LIST=" $COMPONENT_LIST + aandct avfilter avfilter_lavf avisynth @@ -659,6 +741,8 @@ CONFIG_LIST=" ffmpeg ffplay ffserver + fft + golomb gpl gprof gray @@ -675,10 +759,12 @@ CONFIG_LIST=" libmp3lame libnut libschroedinger + libspeex libtheora libvorbis libx264 libxvid + mdct memalign_hack mlib mpegaudio_hp @@ -690,6 +776,7 @@ CONFIG_LIST=" swscale vhook x11grab + xvmc zlib " @@ -702,7 +789,7 @@ THREADS_LIST=' ARCH_LIST=' alpha - armv4l + arm bfin ia64 m68k @@ -738,7 +825,6 @@ HAVE_LIST=" altivec_h arpa_inet_h bswap - byteswap_h closesocket cmov conio_h @@ -750,6 +836,7 @@ HAVE_LIST=" dev_video_bktr_ioctl_bt848_h dlfcn_h dlopen + dos_paths ebp_available ebx_available fast_64bit @@ -793,6 +880,12 @@ HAVE_LIST=" yasm " +# options emitted with CONFIG_ prefix but not available on command line +CONFIG_EXTRA=" + fft_mmx + oldscaler +" + CMDLINE_SELECT=" $ARCH_EXT_LIST $CONFIG_LIST @@ -824,41 +917,103 @@ CMDLINE_SET=" cpu cross_prefix extra_version + host_cc + host_cflags + host_ldflags + host_libs logfile + nm source_path + target_exec target_os + target_path " # code dependency declarations # architecture extensions altivec_deps="powerpc" -armv5te_deps="armv4l" -armv6_deps="armv4l" -armvfp_deps="armv4l" -iwmmxt_deps="armv4l" +armv5te_deps="arm" +armv6_deps="arm" +armvfp_deps="arm" +iwmmxt_deps="arm" mmi_deps="mips" mmx_deps="x86" mmx2_deps="x86 mmx" -neon_deps="armv4l" +neon_deps="arm" ssse3_deps="x86" vis_deps="sparc" -# system headers and functions -byteswap_h_deps="!armv4l" +# common features +fft_suggest="fft_mmx" +fft_mmx_deps="mmx yasm" +oldscaler_deps="!swscale" # decoders / encoders +aac_decoder_select="fft mdct" ac3_decoder_deps="gpl" -dxa_decoder_deps="zlib" +ac3_decoder_select="fft mdct" +atrac3_decoder_select="fft mdct" +cavs_decoder_select="golomb" +cook_decoder_select="fft mdct" +cscd_decoder_suggest="zlib" +dca_decoder_select="fft mdct" +dnxhd_encoder_select="aandct" +dxa_decoder_select="zlib" eac3_decoder_deps="gpl" -flashsv_decoder_deps="zlib" -flashsv_encoder_deps="zlib" -mlp_decoder_deps="mlp_parser" -mpeg_xvmc_decoder_deps="xvmc" -png_decoder_deps="zlib" -png_encoder_deps="zlib" -zmbv_decoder_deps="zlib" -zmbv_encoder_deps="zlib" +eac3_decoder_select="fft mdct" +eatgq_decoder_select="aandct" +ffv1_decoder_select="golomb" +flac_decoder_select="golomb" +flac_encoder_select="golomb" +flashsv_decoder_select="zlib" +flashsv_encoder_select="zlib" +flv_encoder_select="aandct" +h261_encoder_select="aandct" +h263_encoder_select="aandct" +h263p_encoder_select="aandct" +h264_decoder_select="golomb" +imc_decoder_select="fft mdct" +jpegls_decoder_select="golomb" +jpegls_encoder_select="golomb" +ljpeg_encoder_select="aandct" +loco_decoder_select="golomb" +mjpeg_encoder_select="aandct" +mpeg1video_encoder_select="aandct" +mpeg2video_encoder_select="aandct" +mpeg4_encoder_select="aandct" +mpeg_xvmc_decoder_deps="xvmc X11_extensions_XvMClib_h" +msmpeg4v1_encoder_select="aandct" +msmpeg4v2_encoder_select="aandct" +msmpeg4v3_encoder_select="aandct" +nellymoser_decoder_select="fft mdct" +nellymoser_encoder_select="fft mdct" +png_decoder_select="zlib" +png_encoder_select="zlib" +qdm2_decoder_select="fft mdct" +rv10_encoder_select="aandct" +rv20_encoder_select="aandct" +shorten_decoder_select="golomb" +sonic_decoder_select="golomb" +sonic_encoder_select="golomb" +sonic_ls_encoder_select="golomb" +svq3_decoder_select="golomb" +svq3_decoder_suggest="zlib" +tiff_decoder_suggest="zlib" +tiff_encoder_suggest="zlib" +tscc_decoder_select="zlib" +vorbis_decoder_select="fft mdct" +vorbis_encoder_select="fft mdct" +wmav1_decoder_select="fft mdct" +wmav1_encoder_select="fft mdct" +wmav2_decoder_select="fft mdct" +wmav2_encoder_select="fft mdct" +wmv1_encoder_select="aandct" +wmv2_encoder_select="aandct" +zlib_decoder_select="zlib" +zlib_encoder_select="zlib" +zmbv_decoder_select="zlib" +zmbv_encoder_select="zlib" # external libraries libamr_nb_decoder_deps="libamr_nb" @@ -877,6 +1032,7 @@ libgsm_ms_encoder_deps="libgsm" libmp3lame_encoder_deps="libmp3lame" libschroedinger_decoder_deps="libschroedinger" libschroedinger_encoder_deps="libschroedinger" +libspeex_decoder_deps="libspeex" libtheora_encoder_deps="libtheora" libvorbis_encoder_deps="libvorbis" libx264_encoder_deps="libx264" @@ -896,6 +1052,8 @@ dv1394_demuxer_deps="dv1394 dv_demuxer" libdc1394_demuxer_deps="libdc1394" libnut_demuxer_deps="libnut" libnut_muxer_deps="libnut" +matroska_demuxer_suggest="zlib bzlib" +mov_demuxer_suggest="zlib" mp3_demuxer_deps="mpegaudio_parser" oss_demuxer_deps_any="soundcard_h sys_soundcard_h" oss_muxer_deps_any="soundcard_h sys_soundcard_h" @@ -939,13 +1097,13 @@ mandir_default='${prefix}/share/man' shlibdir_default="$libdir_default" # toolchain -cc="gcc" +cc_default="gcc" +host_cc_default="gcc" yasmexe="yasm" ar="ar" -nm="nm" +nm_default="nm" ranlib="ranlib" strip="strip" -asmalign_pot="unknown" ln_s="ln -sf" objformat="elf" @@ -956,10 +1114,6 @@ cpu="generic" # OS target_os=$(tolower $(uname -s)) -# libraries -enable bzlib -enable zlib - # configurable options enable debug enable ffmpeg @@ -968,6 +1122,7 @@ enable ffserver enable ipv6 enable mpegaudio_hp enable network +enable oldscaler enable optimizations enable protocols enable static @@ -990,8 +1145,14 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)' SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)' LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"' -# gcc stupidly only outputs the basename of targets with -MM -DEPEND_CMD='$(CC) $(CFLAGS) -MM -MG $< | sed -e "/^\#.*/d" -e "1s,^,$(@D)/," -e "s,\\([[:space:]]\\)\\(version\\.h\\),\\1\$$(BUILD_ROOT_REL)/\\2,"' +host_cflags='-O3 -g -Wall' +host_libs='-lm' + +target_path='.' + +# gcc stupidly only outputs the basename of targets with -MM, but we need the +# full relative path for objects in subdirectories for non-recursive Make. +DEPEND_CMD='$(CC) $(CFLAGS) -MM -MG $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," -e "s,\\([[:space:]]\\)\\(version\\.h\\),\\1\$$(BUILD_ROOT_REL)/\\2,"' # find source path source_path="`dirname \"$0\"`" @@ -1089,7 +1250,7 @@ for opt do --help|-h) show_help ;; *) - optname="${opt%=*}" + optname="${opt%%=*}" optname="${optname#--}" optname=$(echo "$optname" | sed 's/-/_/g') is_in $optname $CMDLINE_SET || die_unknown $opt @@ -1103,13 +1264,19 @@ disabled logging && logfile=/dev/null echo "# $0 $@" > $logfile set >> $logfile -cc="${cross_prefix}${cc}" +test -n "$cross_prefix" && enable cross_compile + +cc_default="${cross_prefix}${cc_default}" yasmexe="${cross_prefix}${yasmexe}" ar="${cross_prefix}${ar}" -nm="${cross_prefix}${nm}" +nm_default="${cross_prefix}${nm_default}" ranlib="${cross_prefix}${ranlib}" strip="${cross_prefix}${strip}" +set_default cc nm +enabled cross_compile || host_cc_default=$cc +set_default host_cc + # set temporary file name if test ! -z "$TMPDIR" ; then TMPDIR1="${TMPDIR}" @@ -1126,7 +1293,6 @@ TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh" -check_cflags -fasm check_cflags -std=c99 case "$arch" in @@ -1136,14 +1302,15 @@ case "$arch" in ;; x86_64|amd64) arch="x86_32" + enable cmov + enable fast_cmov enable fast_unaligned check_cc < 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" || + die "ERROR: MinGW runtime version must be >= 3.15." + enabled_any avisynth vfwcap_demuxer && + { check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3) || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION >= 13)" || + die "ERROR: avisynth and vfwcap_demuxer require w32api version 3.13 or later."; } ;; cygwin*) target_os=cygwin @@ -1308,6 +1484,7 @@ case $target_os in SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' SHFLAGS='-shared -Wl,--enable-auto-image-base' objformat="win32" + enable dos_paths ;; *-dos|freedos|opendos) disable ffplay ffserver vhook @@ -1315,6 +1492,7 @@ case $target_os in network_extralibs="-lsocket" EXESUF=".exe" objformat="win32" + enable dos_paths ;; linux) enable dv1394 @@ -1346,6 +1524,7 @@ case $target_os in SLIB_INSTALL_EXTRA_CMD='install -m 644 $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib "$(LIBDIR)"' SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.a "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.lib' disable vhook + enable dos_paths ;; interix) disable vhook @@ -1363,8 +1542,6 @@ add_extralibs $osextralibs # Combine FFLDFLAGS and the LDFLAGS environment variable. LDFLAGS="$FFLDFLAGS $LDFLAGS" -test -n "$cross_prefix" && enable cross_compile - # we need to build at least one lib type if ! enabled_any static shared; then cat <= 65" || + die "ERROR: libx264 version must be >= 0.65."; } +enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib # libdc1394 check @@ -1785,7 +1965,7 @@ texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html # Network check if enabled network; then - check_type sys/socket.h socklen_t + check_type "sys/types.h sys/socket.h" socklen_t # Prefer arpa/inet.h over winsock2 if check_header arpa/inet.h ; then check_func closesocket @@ -1907,10 +2087,7 @@ fi VHOOKCFLAGS="-fPIC" # Find out if the .align argument is a power of two or not. -if test $asmalign_pot = "unknown"; then - disable asmalign_pot - echo 'asm (".align 3");' | check_cc && enable asmalign_pot -fi +check_asm asmalign_pot '".align 3"' enabled_any $DECODER_LIST && enable decoders enabled_any $ENCODER_LIST && enable encoders @@ -1925,6 +2102,7 @@ enabled_any $PROTOCOL_LIST && enable protocols enabled_any $THREADS_LIST && enable threads check_deps $CONFIG_LIST \ + $CONFIG_EXTRA \ $HAVE_LIST \ $DECODER_LIST \ $ENCODER_LIST \ @@ -1937,11 +2115,6 @@ check_deps $CONFIG_LIST \ $OUTDEV_LIST \ $PROTOCOL_LIST \ -enabled libdc1394 && append pkg_requires "libraw1394" -enabled libdirac && append pkg_requires "dirac" -enabled libtheora && append pkg_requires "theora" -enabled libvorbis && append pkg_requires "vorbisenc" - echo "install prefix $prefix" echo "source path $source_path" echo "C compiler $cc" @@ -1962,7 +2135,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 = "armv4l"; then +if test $arch = "arm"; then echo "ARMv5TE enabled ${armv5te-no}" echo "ARMv6 enabled ${armv6-no}" echo "ARM VFP enabled ${armvfp-no}" @@ -2013,6 +2186,7 @@ echo "libgsm enabled ${libgsm-no}" echo "libmp3lame enabled ${libmp3lame-no}" echo "libnut enabled ${libnut-no}" echo "libschroedinger enabled ${libschroedinger-no}" +echo "libspeex enabled ${libspeex-no}" echo "libtheora enabled ${libtheora-no}" echo "libvorbis enabled ${libvorbis-no}" echo "libx264 enabled ${libx264-no}" @@ -2083,6 +2257,12 @@ echo "SLIBSUF=$SLIBSUF" >> config.mak echo "EXESUF=$EXESUF" >> config.mak echo "EXTRA_VERSION=$extra_version" >> config.mak echo "DEPEND_CMD=$DEPEND_CMD" >> config.mak +echo "HOSTCC=$host_cc" >> config.mak +echo "HOSTCFLAGS=$host_cflags" >> config.mak +echo "HOSTLDFLAGS=$host_ldflags" >> config.mak +echo "HOSTLIBS=$host_libs" >> config.mak +echo "TARGET_EXEC=$target_exec" >> config.mak +echo "TARGET_PATH=$target_path" >> config.mak if enabled bigendian; then echo "WORDS_BIGENDIAN=yes" >> config.mak @@ -2133,6 +2313,7 @@ echo "EXTRALIBS=$extralibs" >> 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 \ + $CONFIG_EXTRA \ $DECODER_LIST \ $ENCODER_LIST \ $PARSER_LIST \ @@ -2176,7 +2357,7 @@ if enabled source_path_used; then doc \ libavcodec \ libavcodec/alpha \ - libavcodec/armv4l \ + libavcodec/arm \ libavcodec/bfin \ libavcodec/i386 \ libavcodec/mlib \ @@ -2219,7 +2400,7 @@ fi pkgconfig_generate(){ name=$1 -shortname=${name#lib} +shortname=${name#lib}${build_suffix} comment=$2 version=$3 libs=$4 @@ -2257,16 +2438,16 @@ EOF } pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" -pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" -pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" -pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION" +pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" +pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" +pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" enabled avfilter && - pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" + pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" enabled postproc && pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" if enabled swscale; then pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" else - pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" + pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavcodec = $LIBAVCODEC_VERSION" apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/ fi