X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=e5133caf680987c7cd5f0fdb0cdda4bfbd463a4d;hb=ec5dc2c1af47e6f19e2bc482b3a1be09ba9e31bb;hp=096ba3b28bb29e4cc524602a41929d4a86ceee02;hpb=0d0677fbc7136d032ff86de20a9a7b30a4ac95c6;p=ffmpeg diff --git a/configure b/configure index 096ba3b28bb..e5133caf680 100755 --- a/configure +++ b/configure @@ -62,7 +62,6 @@ show_help(){ echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]" echo " --incdir=DIR install includes in DIR [PREFIX/include/ffmpeg]" echo " --mandir=DIR install man page in DIR [PREFIX/man]" - echo " --enable-mingwce enable MinGW native/cross WinCE compile" 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]" @@ -72,7 +71,6 @@ show_help(){ echo " --enable-pp enable GPLed postprocessing support [default=no]" echo " --enable-swscaler software scaler support [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]" @@ -84,10 +82,11 @@ show_help(){ echo " --enable-liba52 enable GPLed liba52 support [default=no]" echo " --enable-liba52bin open liba52.so.0 at runtime [default=no]" echo " --enable-avisynth allow reading AVISynth script files [default=no]" - echo " --enable-libdts enable GPLed libdts support [default=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-libfaac enable FAAC support via libfaac [default=no]" echo " --enable-libfaad enable FAAD support via libfaad [default=no]" - echo " --enable-libfaadbin build FAAD support with runtime linking [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 " --enable-libnut enable NUT (de)muxing via libnut," @@ -96,13 +95,9 @@ show_help(){ echo " --enable-libtheora enable Theora encoding via libtheora [default=no]" echo " --enable-libvorbis enable Vorbis en/decoding via libvorbis," echo " native implementations exist [default=no]" - echo " --enable-x264 enable H.264 encoding via x264 [default=no]" - echo " --enable-xvid enable Xvid encoding via xvidcore," + echo " --enable-libx264 enable H.264 encoding via x264 [default=no]" + echo " --enable-libxvid enable Xvid encoding via xvidcore," echo " native MPEG-4/Xvid encoder exists [default=no]" - echo " --enable-amr-nb enable amr-nb floating point audio codec" - echo " --enable-amr-nb-fixed enable amr-nb fixed-point codec" - echo " --enable-amr-wb enable amr-wb floating point audio codec" - echo " --enable-amr-if2 enable amr-wb IF2 audio codec" echo "" echo "Advanced options (experts only):" echo " --source-path=PATH path to source code [$source_path]" @@ -138,7 +133,7 @@ show_help(){ echo " --disable-debug disable debugging symbols" echo " --disable-mpegaudio-hp faster (but less accurate)" echo " MPEG audio decoding [default=no]" - echo " --disable-protocols disable I/O protocols support [default=no]" + 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" @@ -159,6 +154,19 @@ show_help(){ 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 " --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 echo "Developer options (useful when working on FFmpeg itself):" echo " --enable-gprof enable profiling with gprof [$gprof]" @@ -309,10 +317,13 @@ print_config(){ makefile=$3 shift 3 for cfg; do + ucname="`toupper $cfg`" if enabled $cfg; then - ucname="${pfx}`toupper $cfg`" - echo "#define ${ucname} 1" >> $header - echo "${ucname}=yes" >> $makefile + echo "#define ${pfx}${ucname} 1" >> $header + echo "#define ENABLE_${ucname} 1" >> $header + echo "${pfx}${ucname}=yes" >> $makefile + else + echo "#define ENABLE_${ucname} 0" >> $header fi done } @@ -394,7 +405,12 @@ check_cpp(){ check_ld(){ log check_ld "$@" check_cc || return - check_cmd $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs + flags='' + libs='' + for f; do + test "${f}" = "${f#-l}" && flags="$flags $f" || libs="$libs $f" + done + check_cmd $cc $LDFLAGS $flags -o $TMPE $TMPO $extralibs $libs } check_cflags(){ @@ -486,6 +502,32 @@ check_exec(){ check_ld "$@" && { enabled cross_compile || $TMPE >>$logfile 2>&1; } } +check_exec_crash(){ + code=`cat` + + # exit() is not async signal safe. _Exit (C99) and _exit (POSIX) + # are safe but may not be available everywhere. Thus we use + # raise(SIGTERM) instead. The check is run in a subshell so we + # can redirect the "Terminated" message from the shell. SIGBUS + # is not defined by standard C so it is used conditionally. + + (check_exec "$@") >>$logfile 2>&1 < +static void sighandler(int sig){ + raise(SIGTERM); +} +int main(){ + signal(SIGILL, sighandler); + signal(SIGFPE, sighandler); + signal(SIGSEGV, sighandler); +#ifdef SIGBUS + signal(SIGBUS, sighandler); +#endif + { $code } +} +EOF +} + require(){ name="$1" header="$2" @@ -526,33 +568,29 @@ apply(){ } CONFIG_LIST=' - encoders - decoders - parsers - muxers - demuxers - amr - amr_nb - amr_nb_fixed - amr_wb audio_beos audio_oss avisynth beos_netserver bktr + bsfs dc1394 + decoders + demuxers dv1394 - ebp_available - ebx_available + encoders ffmpeg ffplay ffserver gpl gprof + gray ipv6 liba52 liba52bin - libdts + libamr + libamr_nb + libamr_wb libfaac libfaad libfaadbin @@ -562,39 +600,68 @@ CONFIG_LIST=' libogg libtheora libvorbis + libx264 + libxvid memalign_hack mpegaudio_hp + muxers network + parsers powerpc_perf pp protocols + small swscaler vhook v4l v4l2 - wince x11grab - x264 - xvid zlib ' THREADS_LIST=' beosthreads - os2threads pthreads w32threads ' -HAVE_LIST=" - $THREADS_LIST +ARCH_LIST=' + alpha + armv4l + bfin + ia64 + m68k + mips + parisc + powerpc + s390 + sh4 + sparc + sparc64 + x86 + x86_32 + x86_64 +' + +ARCH_EXT_LIST=' altivec - altivec_h armv5te armv6 + iwmmxt + mmi + mmx + ssse3 +' + +HAVE_LIST=" + $ARCH_EXT_LIST + $THREADS_LIST + altivec_h arpa_inet_h byteswap_h + closesocket cmov + conio_h dcbzl dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h @@ -603,99 +670,129 @@ HAVE_LIST=" dev_video_bktr_ioctl_bt848_h dlfcn_h dlopen + ebp_available + ebx_available fast_64bit fast_cmov + fast_unaligned + fork freetype2 + GetProcessTimes + getrusage imlib2 inet_aton - iwmmxt - localtime_r lrintf machine_ioctl_bt848_h machine_ioctl_meteor_h malloc_h memalign + mkstemp mlib - mmi - mmx - os2 + ppc64 sdl sdl_video_size soundcard_h sys_poll_h sys_soundcard_h + termios_h threads + winsock2_h " -TARGET_LIST=' - altivec - armv5te - armv6 - iwmmxt - mmi - mmx -' - CMDLINE_SELECT=" + $ARCH_EXT_LIST $CONFIG_LIST - $TARGET_LIST $THREADS_LIST - amr_if2 debug extra_warnings shared static " +# code dependency declarations + +# architecture extensions +altivec_deps="powerpc" +armv5te_deps="armv4l" +armv6_deps="armv4l" +iwmmxt_deps="armv4l" +mmi_deps="mips" +mmx_deps="x86" +ssse3_deps="x86" + +# decoders / encoders +ac3_decoder_deps="gpl" dxa_decoder_deps="zlib" flashsv_decoder_deps="zlib" flashsv_encoder_deps="zlib" +flv_decoder_deps="h263_decoder" +h263_decoder_deps="h263_parser mpeg4video_parser" +h263i_decoder_deps="h263_decoder" +h264_decoder_deps="h264_parser" mpeg_xvmc_decoder_deps="xvmc" +mpeg4_decoder_deps="h263_decoder" +msmpeg4v1_decoder_deps="h263_decoder" +msmpeg4v2_decoder_deps="h263_decoder" +msmpeg4v3_decoder_deps="h263_decoder" png_decoder_deps="zlib" png_encoder_deps="zlib" -x264_encoder_deps="x264" -xvid_encoder_deps="xvid" +svq3_decoder_deps="h264_parser" +vc1_decoder_deps="h263_decoder" +wmv1_decoder_deps="h263_decoder" +wmv2_decoder_deps="h263_decoder" +wmv3_decoder_deps="h263_decoder" zmbv_decoder_deps="zlib" zmbv_encoder_deps="zlib" -aac_decoder_deps="libfaad" +# external libraries mpeg4aac_decoder_deps="libfaad" -amr_nb_decoder_deps_any="amr_nb amr_nb_fixed" -amr_nb_encoder_deps_any="amr_nb amr_nb_fixed" -amr_wb_decoder_deps="amr_wb" -amr_wb_encoder_deps="amr_wb" -dts_decoder_deps="libdts" -faac_encoder_deps="libfaac" liba52_decoder_deps="liba52" +libamr_nb_decoder_deps="libamr_nb" +libamr_nb_encoder_deps="libamr_nb" +libamr_wb_decoder_deps="libamr_wb" +libamr_wb_encoder_deps="libamr_wb" +libfaac_encoder_deps="libfaac" +libfaad_decoder_deps="libfaad" libgsm_decoder_deps="libgsm" libgsm_encoder_deps="libgsm" libgsm_ms_decoder_deps="libgsm" libgsm_ms_encoder_deps="libgsm" +libmp3lame_encoder_deps="libmp3lame" libtheora_encoder_deps="libtheora" -mp3lame_encoder_deps="libmp3lame" -oggvorbis_decoder_deps="libvorbis" -oggvorbis_encoder_deps="libvorbis" +libvorbis_decoder_deps="libvorbis" +libvorbis_encoder_deps="libvorbis" +libx264_encoder_deps="libx264" +libxvid_encoder_deps="libxvid" +# demuxers / muxers +ac3_demuxer_deps="ac3_parser" audio_demuxer_deps_any="audio_oss audio_beos" audio_muxer_deps_any="audio_oss audio_beos" dc1394_demuxer_deps="dc1394" dv1394_demuxer_deps="dv1394" -gxf_muxer_deps="gpl" libnut_demuxer_deps="libnut" libnut_muxer_deps="libnut" +mp3_demuxer_deps="mpegaudio_parser" ogg_muxer_deps="libogg" redir_demuxer_deps="network" -rtp_muxer_deps="network" -rtsp_demuxer_deps="network" -sdp_demuxer_deps="network" +rtp_muxer_deps="network mpegts_demuxer" +rtsp_demuxer_deps="rtp_protocol rtp_muxer" +sdp_demuxer_deps="rtsp_demuxer" v4l2_demuxer_deps="v4l2" video_grab_bktr_demuxer_deps="bktr" video_grab_v4l_demuxer_deps="v4l" x11_grab_device_demuxer_deps="x11grab" +# protocols +http_protocol_deps="network" +rtp_protocol_deps="udp_protocol" +tcp_protocol_deps="network" +udp_protocol_deps="network" + +# programs ffplay_deps="sdl" -ffserver_deps="network protocols muxers" -network_deps="protocols" +ffserver_deps="muxers rtp_protocol" + # set temporary file name if test ! -z "$TMPDIR" ; then @@ -719,15 +816,13 @@ logfile="config.err" # installation paths PREFIX="/usr/local" -libdir='${PREFIX}/lib' +libdir='$(PREFIX)/lib' shlibdir="$libdir" -incdir='${PREFIX}/include/ffmpeg' -mandir='${PREFIX}/man' -bindir='${PREFIX}/bin' +incdir='$(PREFIX)/include/ffmpeg' +mandir='$(PREFIX)/man' +bindir='$(PREFIX)/bin' # toolchain -cross_prefix="" -cross_compile="no" cc="gcc" ar="ar" ranlib="ranlib" @@ -738,26 +833,11 @@ asmalign_pot="unknown" # machine arch=`uname -m` cpu="generic" -powerpc_perf="no" -mmx="default" -cmov="no" -fast_cmov="no" -armv5te="default" -armv6="default" -iwmmxt="default" -altivec="default" -dcbzl="no" -mmi="default" -bigendian="no" # OS targetos=$(tolower $(uname -s)) -beos_netserver="no" -os2="no" -wince="no" # non-library system interfaces -audio_beos="default" audio_oss="yes" bktr="yes" dv1394="yes" @@ -765,66 +845,25 @@ v4l2="yes" v4l="yes" # libraries -amr_if2="no" -amr_nb="no" -amr_nb_fixed="no" -amr_wb="no" -avisynth="no" -dc1394="no" -dlfcn_h="no" -dlopen="no" -liba52="no" -liba52bin="no" -libdts="no" -libfaac="no" -libfaad2="no" -libfaad="no" -libfaadbin="no" -libgsm="no" -libmp3lame="no" -libnut="no" -libogg="no" -libtheora="no" -libvorbis="no" -mlib="no" -x11grab="no" -x264="no" -xvid="no" zlib="yes" # configurable options debug="yes" dostrip="yes" -extra_warnings="no" ffmpeg="yes" ffplay="yes" ffserver="yes" -gpl="no" -gprof="no" ipv6="yes" -shared="no" static="yes" -memalign_hack="no" mpegaudio_hp="yes" network="yes" optimize="yes" -pp="no" protocols="yes" -swscaler="no" vhook="default" -# threading -beosthreads="no" -os2threads="no" -pthreads="no" -w32threads="no" -thread_type="no" - # build settings SHFLAGS='-shared -Wl,-soname,$@' VHOOKSHFLAGS='$(SHFLAGS)' -LIBOBJFLAGS="" -FFLDFLAGS=-Wl,--warn-common LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' FFSERVERLDFLAGS=-Wl,-E LDCONFIG="ldconfig" @@ -836,9 +875,7 @@ SLIBSUF=".so" SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)' SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)' -EXESUF="" -BUILDSUF="" -LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(libdir)/$(LIB)"' +LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIB)"' # find source path source_path="`dirname \"$0\"`" @@ -858,13 +895,16 @@ fi FFMPEG_CONFIGURATION="$@" -ENCODER_LIST=`sed -n 's/^[^#]*ENC.*, *\(.*\)).*/\1_encoder/p' "$source_path/libavcodec/allcodecs.c"` -DECODER_LIST=`sed -n 's/^[^#]*DEC.*, *\(.*\)).*/\1_decoder/p' "$source_path/libavcodec/allcodecs.c"` -PARSER_LIST=`sed -n 's/^[^#]*PARSER.*, *\(.*\)).*/\1_parser/p' "$source_path/libavcodec/allcodecs.c"` -MUXER_LIST=`sed -n 's/^[^#]*_MUX.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavformat/allformats.c"` -DEMUXER_LIST=`sed -n 's/^[^#]*DEMUX.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavformat/allformats.c"` +ENCODER_LIST=`sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' "$source_path/libavcodec/allcodecs.c"` +DECODER_LIST=`sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' "$source_path/libavcodec/allcodecs.c"` +PARSER_LIST=`sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' "$source_path/libavcodec/allcodecs.c"` +BSF_LIST=`sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' "$source_path/libavcodec/allcodecs.c"` +MUXER_LIST=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavformat/allformats.c"` +DEMUXER_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavformat/allformats.c"` +PROTOCOL_LIST=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' "$source_path/libavformat/allformats.c"` -enable $ENCODER_LIST $DECODER_LIST $PARSER_LIST $MUXER_LIST $DEMUXER_LIST +enable $ENCODER_LIST $DECODER_LIST $PARSER_LIST $MUXER_LIST $DEMUXER_LIST $PROTOCOL_LIST $BSF_LIST +enable $ARCH_EXT_LIST die_unknown(){ echo "Unknown option \"$1\"." @@ -872,6 +912,13 @@ die_unknown(){ exit 1 } +show_list() { + for part in $*; do + echo $part | sed 's/_[^_]*$//' + done | sort + exit 0 +} + for opt do optval="${opt#*=}" case "$opt" in @@ -913,12 +960,8 @@ for opt do ;; --cpu=*) cpu="$optval" ;; - --enable-mingwce) wince="yes" - ;; --disable-opts) optimize="no" ;; - --enable-small) optimize="small" - ;; --enable-sunmlib) mlib="yes" ;; --disable-strip) dostrip="no" @@ -933,10 +976,14 @@ for opt do ;; --disable-parsers) disable $PARSER_LIST ;; + --disable-bsfs) disable $BSF_LIST + ;; + --disable-protocols) disable $PROTOCOL_LIST + ;; --enable-*=*|--disable-*=*) eval `echo "$opt" | sed 's/=/-/;s/--/action=/;s/-/ thing=/;s/-/ name=/'` case "$thing" in - encoder|decoder|muxer|demuxer|parser) $action ${optval}_${thing} ;; + encoder|decoder|muxer|demuxer|parser|bsf|protocol) $action ${optval}_${thing} ;; *) die_unknown "$opt" ;; esac ;; @@ -945,6 +992,11 @@ for opt do echo "$CMDLINE_SELECT" | grep -q "^ *$option\$" || die_unknown $opt $action $option ;; + --list-*) + NAME="${opt#--list-}" + NAME=$(toupper ${NAME%s}) + eval show_list \$${NAME}_LIST + ;; --help) show_help ;; *) @@ -956,9 +1008,11 @@ done case "$arch" in i386|i486|i586|i686|i86pc|BePC) arch="x86_32" + enable fast_unaligned ;; x86_64|amd64) arch="x86_32" + enable fast_unaligned canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`" if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then @@ -1020,6 +1074,10 @@ case "$arch" in ;; esac +enable $arch +enabled_any x86_32 x86_64 && enable x86 +enabled sparc64 && enable sparc + # OS specific osextralibs="-lm" case $targetos in @@ -1054,7 +1112,6 @@ case $targetos in fi ;; sunos) dv1394="no" - FFLDFLAGS="" FFSERVERLDFLAGS="" SHFLAGS="-shared -Wl,-h,\$@" add_extralibs "-lsocket -lnsl" @@ -1067,7 +1124,7 @@ case $targetos in dv1394="no" need_memalign="no" LIBOBJFLAGS="\$(PIC)" - LDCONFIG="ldconfig -m \$(shlibdir)" + LDCONFIG="ldconfig -m \$(SHLIBDIR)" SHFLAGS='-shared' SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)' SLIBNAME_WITH_VERSION='$(SLIBNAME)' @@ -1091,8 +1148,8 @@ case $targetos in darwin) dv1394="no" need_memalign="no" - SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION) -Wl,-read_only_relocs,suppress" - VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@' + SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(SHLIBDIR)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION) -Wl,-read_only_relocs,suppress" + VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@' osextralibs="" strip="strip -x" FFLDFLAGS="-Wl,-dynamic,-search_paths_first" @@ -1103,44 +1160,39 @@ case $targetos in ;; mingw32*) targetos=mingw32 - if enabled_all shared static; then - cat </dev/null 2>&1 - # we need to build at least one lib type -if disabled_all static shared; then +if ! enabled_any static shared; then cat <&1 | grep xlc`"; then add_cflags "-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto" else - gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`" - case "$gcc_version" in - *2.95*) - add_cflags "-no-cpp-precomp -pipe" - ;; - *[34].*) - add_cflags "-no-cpp-precomp -pipe -force_cpusubtype_ALL -Wno-sign-compare" - if disabled shared; then - needmdynamicnopic="yes" - fi - ;; - *) - add_cflags "-no-cpp-precomp -pipe" - if disabled shared; then - needmdynamicnopic="yes" - fi - ;; - esac + add_cflags "-no-cpp-precomp -pipe" + check_cflags "-force_cpusubtype_ALL" + check_cflags "-Wno-sign-compare" + disabled shared && needmdynamicnopic="yes" fi fi +enabled needmdynamicnopic && add_cflags -mdynamic-no-pic disabled optimize || add_cflags -fomit-frame-pointer -# Can only do AltiVec on PowerPC -if test $altivec = "default"; then - if test $arch = "powerpc"; then - altivec="yes" - else - altivec="no" - fi -fi - # Add processor-specific flags -POWERPCMODE="32bits" if test $cpu != "generic"; then warn_altivec(){ $1 altivec && echo "WARNING: Tuning for $2 but AltiVec $1."; @@ -1329,7 +1329,12 @@ if test $cpu != "generic"; then G5|g5|970|ppc970|PowerPC970|power4*|Power4*) add_cflags "-mcpu=970 -mpowerpc-gfxopt -mpowerpc64" warn_altivec disabled PPC970 - POWERPCMODE="64bits" + enable ppc64 + ;; + Cell|CELL|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) @@ -1392,34 +1397,24 @@ int main(){ EOF if test "$?" != 0; then echo "$cc is unable to create an executable file." - if test -z "$cross_prefix" && disabled cross_compile ; then + if test -z "$cross_prefix" && ! enabled cross_compile ; then echo "If $cc is a cross-compiler, use the --cross-compile option." echo "Only do this if you know what cross compiling means." fi die "C compiler test failed." fi -if test $arch = "x86_32" -o $arch = "x86_64"; then - if test "$targetos" = mingw32 -o "$targetos" = cygwin; then - cat <>$logfile 2>&1 && enable ebp_available -int main(){ + check_exec_crash <&1 | grep version | grep Apple`"; then - add_cflags "-faltivec" - else - add_cflags "-maltivec -mabi=altivec" - fi +if enabled altivec; then + if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then + add_cflags "-faltivec" + else + add_cflags "-maltivec -mabi=altivec" fi -fi -check_header altivec.h + check_header altivec.h -# check if our compiler supports Motorola AltiVec C API -if enabled altivec; then + # check if our compiler supports Motorola AltiVec C API if enabled altivec_h; then inc_altivec_h="#include " else @@ -1476,41 +1474,24 @@ EOF fi # check armv5te instructions support -if test $armv5te = "default" -a $arch = "armv4l"; then - armv5te=no - check_cc < int main(int argc, char ** argv){ @@ -1543,16 +1524,21 @@ fi check_header malloc.h check_func memalign -if disabled_all memalign memalign_hack && enabled need_memalign ; then +if ! enabled_any memalign memalign_hack && enabled need_memalign ; then die "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack." fi check_header byteswap.h +check_func mkstemp + +check_header termios.h +check_header conio.h + check_header arpa/inet.h +check_header winsock2.h check_func inet_aton -check_func localtime_r enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no" # ffserver uses poll(), @@ -1579,7 +1565,7 @@ fi for thread in $THREADS_LIST; do if enabled $thread; then - if ! disabled thread_type ; then + if test -n "$thread_type"; then die "ERROR: Only one thread type must be selected." else thread_type="$thread" @@ -1587,33 +1573,35 @@ for thread in $THREADS_LIST; do fi done -enabled_any amr_nb amr_nb_fixed amr_wb amr_if2 && enable amr -enabled_all amr_nb amr_nb_fixed && - die "Only one of amr_nb and amr_nb_fixed may be enabled." +# test for lrintf in math.h +check_exec < +int main( void ) { return (lrintf(3.999f) > 0)?0:1; } +EOF + +enabled_any libamr_nb libamr_wb && enable libamr # these are off by default, so fail if requested and not available enabled liba52 && require liba52 a52dec/a52.h a52_init -la52 -enabled libdts && require libdts dts.h dts_init -ldts -lm +enabled libamr_nb && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm +enabled libamr_wb && require libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm enabled libgsm && require libgsm gsm.h gsm_create -lgsm enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm enabled libtheora && require libtheora theora/theora.h theora_info_init -ltheora -logg enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg enabled libnut && require libnut libnut.h nut_demuxer_init -lnut -enabled xvid && require XviD xvid.h xvid_global -lxvidcore -enabled x264 && require x264 x264.h x264_encoder_open -lx264 +enabled libx264 && require x264 x264.h x264_encoder_open -lx264 +enabled libxvid && require Xvid xvid.h xvid_global -lxvidcore enabled dc1394 && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32 -# test for lrintf in math.h -check_exec < -int main( void ) { return (lrintf(3.999f) > 0)?0:1; } -EOF +# disable the native AC-3 decoder if liba52 is enabled +enabled liba52 && disable ac3_decoder _restrict= for restrict_keyword in restrict __restrict__ __restrict; do @@ -1632,14 +1620,20 @@ elif check_func dlopen -ldl; then ldl=-ldl fi +check_func getrusage +check_func2 windows.h GetProcessTimes + +check_func fork +check_func closesocket + test "$vhook" = "default" && vhook="$dlopen" enabled_any vhook liba52bin libfaadbin ffserver && add_extralibs $ldl -if test "$targetos" = cygwin && enabled static ; then +if test "$targetos" = cygwin -o "$targetos" = mingw32 && enabled_all static vhook ; then vhook="no" echo - echo "At the moment vhooks don't work on Cygwin static builds." + echo "At the moment vhooks don't work on Cygwin or MinGW static builds." echo "Patches welcome." echo fi @@ -1746,12 +1740,13 @@ check_cflags -Wno-pointer-sign enabled extra_warnings && check_cflags -Winline # add some linker flags +check_ldflags -Wl,--warn-common check_ldflags $LDLATEFLAGS -# not all compilers support -Os -test "$optimize" = "small" && check_cflags -Os - -if enabled optimize; then +if enabled small; then + check_cflags -Os # not all compilers support -Os + optimize="small" +elif enabled optimize; then if test -n "`$cc -v 2>&1 | grep xlc`"; then add_cflags "-O5" add_ldflags "-O5" @@ -1775,8 +1770,7 @@ if enabled gprof; then add_ldflags "-p" fi -VHOOKCFLAGS="-fPIC $CFLAGS" -enabled needmdynamicnopic && add_cflags -mdynamic-no-pic +VHOOKCFLAGS="-fPIC" # find if .align arg is power-of-two or not if test $asmalign_pot = "unknown"; then @@ -1784,15 +1778,17 @@ if test $asmalign_pot = "unknown"; then echo 'asm (".align 3");' | check_cc && asmalign_pot="yes" fi -enabled_any $ENCODER_LIST && enable encoders -enabled_any $DECODER_LIST && enable decoders -enabled_any $MUXER_LIST && enable muxers -enabled_any $DEMUXER_LIST && enable demuxers +enabled_any $ENCODER_LIST && enable encoders +enabled_any $DECODER_LIST && enable decoders +enabled_any $MUXER_LIST && enable muxers +enabled_any $DEMUXER_LIST && enable demuxers +enabled_any $PROTOCOL_LIST && enable protocols +enabled_any $BSF_LIST && enable bsfs -enabled_any $THREADS_LIST && enable threads +enabled_any $THREADS_LIST && enable threads check_deps $CONFIG_LIST $HAVE_LIST $DECODER_LIST $ENCODER_LIST $PARSER_LIST \ - $DEMUXER_LIST $MUXER_LIST + $BSF_LIST $DEMUXER_LIST $MUXER_LIST $PROTOCOL_LIST enabled libogg && append pkg_requires "ogg >= 1.1" enabled libtheora && append pkg_requires "theora" @@ -1808,68 +1804,65 @@ echo "ARCH $arch ($cpu)" if test "$BUILDSUF" != ""; then echo "build suffix $BUILDSUF" fi -echo "big-endian $bigendian" +echo "big-endian ${bigendian-no}" if test $arch = "x86_32" -o $arch = "x86_64"; then - echo "MMX enabled $mmx" - echo "CMOV enabled $cmov" - echo "CMOV is fast $fast_cmov" + echo "MMX enabled ${mmx-no}" + echo "CMOV enabled ${cmov-no}" + echo "CMOV is fast ${fast_cmov-no}" fi if test $arch = "armv4l"; then - echo "ARMv5TE enabled $armv5te" - echo "ARMv6 enabled $armv6" - echo "IWMMXT enabled $iwmmxt" + echo "ARMv5TE enabled ${armv5te-no}" + echo "ARMv6 enabled ${armv6-no}" + echo "IWMMXT enabled ${iwmmxt-no}" fi if test $arch = "mips"; then - echo "MMI enabled $mmi" + echo "MMI enabled ${mmi-no}" fi if test $arch = "powerpc"; then - echo "AltiVec enabled $altivec" - echo "dcbzl available $dcbzl" + echo "AltiVec enabled ${altivec-no}" + echo "dcbzl available ${dcbzl-no}" fi -echo "gprof enabled $gprof" -echo "debug symbols $debug" -echo "strip symbols $dostrip" -echo "optimize $optimize" -echo "static $static" -echo "shared $shared" -echo "postprocessing support $pp" -echo "software scaler enabled $swscaler" -echo "video hooking $vhook" +echo "gprof enabled ${gprof-no}" +echo "debug symbols ${debug-no}" +echo "strip symbols ${dostrip-no}" +echo "optimize ${optimize-no}" +echo "static ${static-no}" +echo "shared ${shared-no}" +echo "postprocessing support ${pp-no}" +echo "software scaler enabled ${swscaler-no}" +echo "video hooking ${vhook-no}" if enabled vhook; then - echo "Imlib2 support $imlib2" - echo "FreeType support $freetype2" + echo "Imlib2 support ${imlib2-no}" + echo "FreeType support ${freetype2-no}" fi -echo "network support $network" +echo "network support ${network-no}" if enabled network; then - echo "IPv6 support $ipv6" + echo "IPv6 support ${ipv6-no}" fi -echo "threading support $thread_type" -echo "SDL support $sdl" +echo "threading support ${thread_type-no}" +echo "SDL support ${sdl-no}" if enabled sdl_too_old; then echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support." fi -echo "Sun medialib support $mlib" -echo "AVISynth enabled $avisynth" -echo "liba52 support $liba52" -echo "liba52 dlopened $liba52bin" -echo "libdts support $libdts" -echo "libfaac enabled $libfaac" -echo "libfaad enabled $libfaad" -echo "faadbin enabled $libfaadbin" -echo "libgsm enabled $libgsm" -echo "libmp3lame enabled $libmp3lame" -echo "libnut enabled $libnut" -echo "libogg enabled $libogg" -echo "libtheora enabled $libtheora" -echo "libvorbis enabled $libvorbis" -echo "x264 enabled $x264" -echo "XviD enabled $xvid" -echo "zlib enabled $zlib" -echo "AMR-NB float support $amr_nb" -echo "AMR-NB fixed support $amr_nb_fixed" -echo "AMR-WB float support $amr_wb" -echo "AMR-WB IF2 support $amr_if2" -if disabled gpl; then +echo "Sun medialib support ${mlib-no}" +echo "AVISynth enabled ${avisynth-no}" +echo "liba52 support ${liba52-no}" +echo "liba52 dlopened ${liba52bin-no}" +echo "libamr-nb support ${libamr_nb-no}" +echo "libamr-wb support ${libamr_wb-no}" +echo "libfaac enabled ${libfaac-no}" +echo "libfaad enabled ${libfaad-no}" +echo "libfaad dlopened ${libfaadbin-no}" +echo "libgsm enabled ${libgsm-no}" +echo "libmp3lame enabled ${libmp3lame-no}" +echo "libnut enabled ${libnut-no}" +echo "libogg enabled ${libogg-no}" +echo "libtheora enabled ${libtheora-no}" +echo "libvorbis enabled ${libvorbis-no}" +echo "x264 enabled ${libx264-no}" +echo "XviD enabled ${libxvid-no}" +echo "zlib enabled ${zlib-no}" +if ! enabled gpl; then echo "License: LGPL" else echo "License: GPL" @@ -1882,12 +1875,12 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH echo "PREFIX=$PREFIX" >> config.mak -echo "prefix=\$(DESTDIR)\${PREFIX}" >> config.mak -echo "libdir=\$(DESTDIR)$libdir" >> config.mak -echo "shlibdir=\$(DESTDIR)$shlibdir" >> config.mak -echo "incdir=\$(DESTDIR)$incdir" >> config.mak -echo "bindir=\$(DESTDIR)$bindir" >> config.mak -echo "mandir=\$(DESTDIR)$mandir" >> config.mak +echo "prefix=\$(DESTDIR)\$(PREFIX)" >> config.mak +echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak +echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak +echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak +echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak +echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak echo "MAKE=$make" >> config.mak echo "CC=$cc" >> config.mak echo "AR=$ar" >> config.mak @@ -1911,36 +1904,11 @@ echo "BUILD_STATIC=$static" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak -if enabled static; then - echo "LIB=$LIB" >> config.mak -else # Some Make complain if this variable does not exist. - echo "LIB=" >> config.mak -fi +echo "LIB=$LIB" >> config.mak echo "SLIBPREF=$SLIBPREF" >> config.mak echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak -ucarch=`toupper $arch` -echo "TARGET_ARCH_${ucarch}=yes" >> config.mak -echo "#define ARCH_${ucarch} 1" >> $TMPH - -# special cases -case "$arch" in - x86_32|x86_64) - echo "TARGET_ARCH_X86=yes" >> config.mak - echo "#define ARCH_X86 1" >> $TMPH - ;; - powerpc) - if test "$POWERPCMODE" = "64bits"; then - echo "#define POWERPC_MODE_64BITS 1" >> $TMPH - fi - ;; - sparc64) - echo "TARGET_ARCH_SPARC=yes" >> config.mak - echo "#define ARCH_SPARC 1" >> $TMPH - ;; -esac - if enabled bigendian; then echo "WORDS_BIGENDIAN=yes" >> config.mak echo "#define WORDS_BIGENDIAN 1" >> $TMPH @@ -1987,9 +1955,16 @@ fi echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak 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 -print_config TARGET_ $TMPH config.mak $TARGET_LIST +print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \ + $DECODER_LIST \ + $ENCODER_LIST \ + $PARSER_LIST \ + $BSF_LIST \ + $DEMUXER_LIST \ + $MUXER_LIST \ + $PROTOCOL_LIST \ if test "$targetos" = darwin; then echo "#define CONFIG_DARWIN 1" >> $TMPH @@ -1997,19 +1972,14 @@ fi echo "#define restrict $_restrict" >> $TMPH -if test "$optimize" = "small"; then +if enabled small; then echo "#define always_inline" >> $TMPH - echo "#define CONFIG_SMALL 1" >> $TMPH fi echo "SRC_PATH=\"$source_path\"" >> config.mak echo "SRC_PATH_BARE=$source_path" >> config.mak echo "BUILD_ROOT=\"$PWD\"" >> config.mak -if enabled amr_if2; then - echo "AMR_CFLAGS=-DIF2=1" >> config.mak -fi - # Apparently it's not possible to portably echo a backslash. if enabled asmalign_pot; then printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH @@ -2018,19 +1988,6 @@ else fi -for part in $DECODER_LIST $ENCODER_LIST $PARSER_LIST $DEMUXER_LIST $MUXER_LIST; do - ucname="`toupper $part`" - config_name="CONFIG_$ucname" - enabled_name="ENABLE_$ucname" - if enabled $part; then - echo "#define $config_name 1" >> $TMPH - echo "#define $enabled_name 1" >> $TMPH - echo "$config_name=yes" >> config.mak - else - echo "#define $enabled_name 0" >> $TMPH - fi -done - # Do not overwrite config.h if unchanged to avoid superfluous rebuilds. if ! cmp -s $TMPH config.h; then mv -f $TMPH config.h @@ -2053,13 +2010,11 @@ if enabled source_path_used; then libavcodec/sparc \ libavcodec/mlib \ libavcodec/ppc \ - libavcodec/amr \ - libavcodec/amr_float \ - libavcodec/amrwb_float \ libpostproc \ libavutil \ libswscale \ tests \ + tools \ vhook \ " FILES="\ @@ -2070,9 +2025,6 @@ if enabled source_path_used; then libpostproc/Makefile \ libavutil/Makefile \ libswscale/Makefile \ - tests/Makefile \ - vhook/Makefile \ - doc/Makefile \ doc/texi2pod.pl \ " for dir in $DIRS ; do