X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=e556be2763e30d340f3ba73a386837f68a8e0310;hb=9cdcb04f5a536da3c66323773ebc37c22d5e056b;hp=6f4dfc6b77a37cc1c0a09ff10503608bd73a5489;hpb=24743a767f732fcced0af9cbe18897777c8125c2;p=ffmpeg diff --git a/configure b/configure index 6f4dfc6b77a..e556be2763e 100755 --- a/configure +++ b/configure @@ -91,10 +91,9 @@ show_help(){ echo " --enable-libmp3lame enable MP3 encoding via libmp3lame [default=no]" echo " --enable-libnut enable NUT (de)muxing via libnut," echo " native demuxer exists [default=no]" - echo " --enable-libogg enable Ogg muxing via libogg [default=no]" 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-libvorbis enable Vorbis encoding via libvorbis," + echo " native implementation exists [default=no]" 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]" @@ -164,7 +163,7 @@ show_help(){ echo echo "Developer options (useful when working on FFmpeg itself):" echo " --enable-gprof enable profiling with gprof [$gprof]" - echo " --disable-opts disable compiler optimizations" + echo " --disable-optimizations disable compiler optimizations" echo " --enable-extra-warnings enable more compiler warnings" echo " --disable-strip disable stripping of executables and shared libraries" echo "" @@ -620,7 +619,6 @@ CONFIG_LIST=" libgsm libmp3lame libnut - libogg libtheora libvorbis libx264 @@ -725,6 +723,7 @@ CMDLINE_SELECT=" $THREADS_LIST debug extra_warnings + optimizations shared static " @@ -781,7 +780,6 @@ libgsm_ms_decoder_deps="libgsm" libgsm_ms_encoder_deps="libgsm" libmp3lame_encoder_deps="libmp3lame" libtheora_encoder_deps="libtheora" -libvorbis_decoder_deps="libvorbis" libvorbis_encoder_deps="libvorbis" libx264_encoder_deps="libx264" libxvid_encoder_deps="libxvid" @@ -800,7 +798,6 @@ libdc1394_demuxer_deps="libdc1394" libnut_demuxer_deps="libnut" libnut_muxer_deps="libnut" mp3_demuxer_deps="mpegaudio_parser" -ogg_muxer_deps="libogg" oss_demuxer_deps_any="soundcard_h sys_soundcard_h" oss_muxer_deps_any="soundcard_h sys_soundcard_h" redir_demuxer_deps="network" @@ -882,7 +879,7 @@ enable ipv6 enable static enable mpegaudio_hp enable network -enable optimize +enable optimizations enable protocols vhook="default" @@ -894,10 +891,11 @@ FFSERVERLDFLAGS=-Wl,-E LDCONFIG="ldconfig" LIBPREF="lib" LIBSUF=".a" -LIBNAME='$(LIBPREF)$(NAME)$(LIBSUF)' +FULLNAME='$(NAME)$(BUILDSUF)' +LIBNAME='$(LIBPREF)$(FULLNAME)$(LIBSUF)' SLIBPREF="lib" SLIBSUF=".so" -SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)' +SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)' SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)' LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"' @@ -934,9 +932,9 @@ die_unknown(){ } show_list() { - for part in $*; do - echo $part | sed 's/_[^_]*$//' - done | sort + suffix=_$1 + shift + echo $* | sed s/$suffix//g | tr ' ' '\n' | sort exit 0 } @@ -981,8 +979,6 @@ for opt do ;; --cpu=*) cpu="$optval" ;; - --disable-opts) disable optimize - ;; --enable-sunmlib) enable mlib ;; --disable-strip) disable dostrip @@ -1016,8 +1012,8 @@ for opt do --list-*) NAME="${opt#--list-}" is_in $NAME $COMPONENT_LIST || die_unknown $opt - NAME=$(toupper ${NAME%s}) - eval show_list \$${NAME}_LIST + NAME=${NAME%s} + eval show_list $NAME \$$(toupper $NAME)_LIST ;; --help|-h) show_help ;; @@ -1143,7 +1139,7 @@ case $targetos in LIBOBJFLAGS='$(PIC)' LDCONFIG='ldconfig -m $(SHLIBDIR)' SHFLAGS='-shared' - SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)' + SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)' SLIBNAME_WITH_VERSION='$(SLIBNAME)' SLIBNAME_WITH_MAJOR='$(SLIBNAME)' oss_demuxer_extralibs="-lossaudio" @@ -1163,8 +1159,8 @@ case $targetos in strip="strip -x" FFLDFLAGS="-Wl,-dynamic,-search_paths_first" SLIBSUF=".dylib" - SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)' - SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)' + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' FFSERVERLDFLAGS=-Wl,-bind_at_load ;; mingw32*) @@ -1180,11 +1176,11 @@ case $targetos in SLIBPREF="" SLIBSUF=".dll" EXESUF=".exe" - SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' - SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)' + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' SLIB_EXTRA_CMD='-lib /machine:i386 /def:$(@:$(SLIBSUF)=.def)' - SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"' - SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"' + SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"' + SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"' SHFLAGS='-shared -Wl,--output-def,$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base' ;; cygwin*) @@ -1199,8 +1195,8 @@ case $targetos in EXESUF=".exe" SLIBPREF="cyg" SLIBSUF=".dll" - SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' - SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)' + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' SHFLAGS='-shared -Wl,--enable-auto-image-base' ;; linux) @@ -1246,14 +1242,7 @@ EOF exit 1; fi -if disabled static; then - LIBNAME="" -fi - -if ! enabled libogg; then - enabled libtheora && die "libogg must be enabled to enable libtheora." - enabled libvorbis && die "libogg must be enabled to enable libvorbis." -fi +disabled static && LIBNAME="" if enabled_any libfaad libfaadbin ; then if check_header faad.h; then @@ -1302,7 +1291,7 @@ if test $targetos = darwin; then fi fi -disabled optimize || add_cflags -fomit-frame-pointer +disabled optimizations || add_cflags -fomit-frame-pointer # Add processor-specific flags if test $cpu != "generic"; then @@ -1568,9 +1557,8 @@ enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad enabled libgsm && require libgsm gsm.h gsm_create -lgsm enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm enabled libnut && require libnut libnut.h nut_demuxer_init -lnut -enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg 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 libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg enabled libx264 && require x264 x264.h x264_encoder_open -lx264 enabled libxvid && require Xvid xvid.h xvid_global -lxvidcore enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib @@ -1704,8 +1692,8 @@ check_ldflags $LDLATEFLAGS if enabled small; then check_cflags -Os # not all compilers support -Os - optimize="small" -elif enabled optimize; then + optimizations="small" +elif enabled optimizations; then if test -n "`$cc -v 2>&1 | grep xlc`"; then add_cflags "-O5" add_ldflags "-O5" @@ -1750,9 +1738,8 @@ check_deps $CONFIG_LIST $HAVE_LIST $DECODER_LIST $ENCODER_LIST $PARSER_LIST \ $BSF_LIST $DEMUXER_LIST $MUXER_LIST $PROTOCOL_LIST enabled libdc1394 && append pkg_requires "libraw1394" -enabled libogg && append pkg_requires "ogg >= 1.1" enabled libtheora && append pkg_requires "theora" -enabled libvorbis && append pkg_requires "vorbis vorbisenc" +enabled libvorbis && append pkg_requires "vorbisenc" echo "install prefix $PREFIX" echo "source path $source_path" @@ -1786,7 +1773,7 @@ fi echo "gprof enabled ${gprof-no}" echo "debug symbols ${debug-no}" echo "strip symbols ${dostrip-no}" -echo "optimize ${optimize-no}" +echo "optimizations ${optimizations-no}" echo "static ${static-no}" echo "shared ${shared-no}" echo "postprocessing support ${pp-no}" @@ -1818,7 +1805,6 @@ 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}" @@ -1828,6 +1814,18 @@ enabled gpl && echo "License: GPL" || echo "License: LGPL" +for type in decoder encoder parser demuxer muxer protocol bsf; do + echo "Enabled ${type}s:" + ucname="\$`toupper $type`_LIST" + list="`eval echo $ucname`" + partlist="" + for part in $list; do + enabled $part && partlist="$partlist $part" + done + partlist=`echo $partlist | sed s/_$type//g | tr ' ' '\n' | sort` + echo $partlist +done + echo "Creating config.mak and config.h..." echo "# Automatically generated by configure - do not modify!" > config.mak @@ -1863,12 +1861,13 @@ echo "VHOOKLIBS=$VHOOKLIBS" >> config.mak echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak echo "BUILD_STATIC=$static" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak +echo "FULLNAME=$FULLNAME" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak -echo "LIBSUF=\$(BUILDSUF)$LIBSUF" >> config.mak +echo "LIBSUF=$LIBSUF" >> config.mak echo "LIBNAME=$LIBNAME" >> config.mak echo "SLIBPREF=$SLIBPREF" >> config.mak -echo "SLIBSUF=\$(BUILDSUF)$SLIBSUF" >> config.mak -echo "EXESUF=\$(BUILDSUF)$EXESUF" >> config.mak +echo "SLIBSUF=$SLIBSUF" >> config.mak +echo "EXESUF=$EXESUF" >> config.mak if enabled bigendian; then echo "WORDS_BIGENDIAN=yes" >> config.mak