X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=4f27c24e3b0bc7770736b3b00c4394fe95497f00;hb=f4870943ea82ad7e8112037c7a205cbef1a89ff3;hp=01717ab9e36d092b8d37b1a115624b982c880a97;hpb=d88f7df899072b956ee6dbfae91a4afc48726821;p=ffmpeg diff --git a/configure b/configure index 01717ab9e36..4f27c24e3b0 100755 --- a/configure +++ b/configure @@ -64,18 +64,22 @@ show_help(){ echo " --disable-logging do not log configure debug information" echo " --prefix=PREFIX install in PREFIX [$prefix]" echo " --bindir=DIR install binaries in DIR [PREFIX/bin]" + echo " --datadir=DIR install data files in DIR [PREFIX/share/ffmpeg]" echo " --libdir=DIR install libs in DIR [PREFIX/lib]" 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]" @@ -86,13 +90,64 @@ show_help(){ echo " --enable-pthreads use pthreads [no]" echo " --enable-w32threads use Win32 threads [no]" echo " --enable-x11grab enable X11 grabbing [no]" + echo " --enable-vdpau enable VDPAU 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 " --enable-fastdiv enable 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 " --disable-rdft disable RDFT 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 [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-bzlib enable bzlib [autodetect]" + echo " --enable-libamr-nb enable libamr-nb floating point audio codec [no]" + echo " --enable-libamr-wb enable libamr-wb floating point audio codec [no]" echo " --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394" echo " and libraw1394 [no]" echo " --enable-libdirac enable Dirac support via libdirac [no]" @@ -103,6 +158,7 @@ show_help(){ echo " --enable-libmp3lame enable MP3 encoding via libmp3lame [no]" echo " --enable-libnut enable NUT (de)muxing via libnut," echo " native (de)muxer exists [no]" + echo " --enable-libopenjpeg enable JPEG 2000 decoding via OpenJPEG [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]" @@ -111,7 +167,8 @@ 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-zlib enable zlib [no]" + echo " --enable-mlib enable Sun medialib [no]" + echo " --enable-zlib enable zlib [autodetect]" echo "" echo "Advanced options (experts only):" echo " --source-path=PATH path to source code [$source_path]" @@ -120,7 +177,8 @@ show_help(){ 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 " --cc=CC use C compiler CC [$cc]" + echo " --nm=NM use nm tool" + 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" @@ -136,69 +194,21 @@ show_help(){ echo " --enable-powerpc-perf enable performance report on PPC" echo " (requires enabling PMC)" echo " --disable-altivec disable AltiVec optimizations" + echo " --disable-amd3dnow disable 3DNow! optimizations" + echo " --disable-amd3dnowext disable 3DNow! extended optimizations" echo " --disable-mmx disable MMX optimizations" echo " --disable-mmx2 disable MMX2 optimizations" + echo " --disable-sse disable SSE optimizations" 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 " --disable-yasm disable use of yasm assembler" echo echo "Developer options (useful when working on FFmpeg itself):" echo " --disable-debug disable debugging symbols" @@ -258,6 +268,10 @@ tolower(){ echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz } +c_escape(){ + echo "$*" | sed 's/["\\]/\\\0/g' +} + set_all(){ value=$1 shift @@ -422,10 +436,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 } @@ -510,7 +523,7 @@ check_asm(){ asm="$2" shift 2 check_cc "$@" <> $logfile 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}" +cc_default="${cross_prefix}${cc_default}" +nm_default="${cross_prefix}${nm_default}" ranlib="${cross_prefix}${ranlib}" strip="${cross_prefix}${strip}" -set_default cc +set_default cc nm enabled cross_compile || host_cc_default=$cc set_default host_cc +case $target_os in + mingw32*|cygwin*|*-dos|freedos|opendos|os/2*) EXESUF=.exe ;; +esac + # set temporary file name -if test ! -z "$TMPDIR" ; then - TMPDIR1="${TMPDIR}" -elif test ! -z "$TEMPDIR" ; then - TMPDIR1="${TEMPDIR}" -else - TMPDIR1="/tmp" +: ${TMPDIR:=$TEMPDIR} +: ${TMPDIR:=$TMP} +: ${TMPDIR:=/tmp} + +TMPC="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c" +TMPE="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}" +TMPH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" +TMPO="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" +TMPS="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" +TMPSH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh" + +# make sure we can execute files in $TMPDIR +cat > $TMPSH 2>> $logfile <> $logfile 2>&1 +if ! $TMPSH >> $logfile 2>&1; then + cat < 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."; } + if ! enabled x86_64; then + check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 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."; } + fi ;; cygwin*) target_os=cygwin @@ -1470,7 +1553,6 @@ case $target_os in VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale" VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)" fi - EXESUF=".exe" SLIBPREF="cyg" SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' @@ -1483,8 +1565,7 @@ case $target_os in disable ffplay ffserver vhook disable $INDEV_LIST $OUTDEV_LIST network_extralibs="-lsocket" - EXESUF=".exe" - objformat="win32" + objformat="coff" enable dos_paths ;; linux) @@ -1497,7 +1578,6 @@ case $target_os in os/2*) strip="lxlite" ln_s="cp -f" - EXESUF=".exe" FFLDFLAGS="-Zomf -Zbin-files -Zargs-wild -Zmap" SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' FFSERVERLDFLAGS="" @@ -1524,7 +1604,7 @@ case $target_os in ;; *) - target_os="${target_os}-UNKNOWN" + die "Unknown OS '$target_os'." ;; esac @@ -1589,11 +1669,11 @@ test -z "$need_memalign" && need_memalign="$mmx" #Darwin CC versions if test $target_os = darwin; then if $cc -v 2>&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 @@ -1607,68 +1687,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." @@ -1676,34 +1759,6 @@ if test $cpu != "generic"; then esac fi -# make sure we can execute files in $TMPDIR -cat > $TMPSH 2>> $logfile <> $logfile 2>&1 -if ! $TMPSH >> $logfile 2>&1; then - cat < int main(void) { return ($func(3.999f) > 0)?0:1; } @@ -1876,6 +1948,7 @@ enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad enabled libgsm && require libgsm gsm.h gsm_create -lgsm enabled libmp3lame && require libmp3lame lame/lame.h lame_init -lmp3lame -lm enabled libnut && require libnut libnut.h nut_demuxer_init -lnut +enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) && require libschroedinger schroedinger/schro.h schro_init $(pkg-config --libs schroedinger-1.0) enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex @@ -2003,6 +2076,9 @@ check_header dev/ic/bt8xx.h check_header sys/soundcard.h check_header soundcard.h +check_header alsa/asoundlib.h && +check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound + # deal with the X11 frame grabber enabled x11grab && check_header X11/Xlib.h && @@ -2023,6 +2099,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 @@ -2036,10 +2113,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 @@ -2065,15 +2142,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" @@ -2107,11 +2184,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" @@ -2124,27 +2196,39 @@ 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 "MMX2 enabled ${mmx2-no}" + echo "3DNow! enabled ${amd3dnow-no}" + echo "3DNow! extended enabled ${amd3dnowext-no}" + echo "SSE enabled ${sse-no}" + echo "SSSE3 enabled ${ssse3-no}" echo "CMOV enabled ${cmov-no}" echo "CMOV is fast ${fast_cmov-no}" echo "EBX available ${ebx_available-no}" echo "EBP available ${ebp_available-no}" + echo "10 operands supported ${ten_operands-no}" fi -if test $arch = "armv4l"; then +if enabled arm; then echo "ARMv5TE enabled ${armv5te-no}" echo "ARMv6 enabled ${armv6-no}" + echo "ARMv6T2 enabled ${armv6t2-no}" echo "ARM VFP enabled ${armvfp-no}" 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 = "powerpc"; then +if enabled ppc; then echo "AltiVec enabled ${altivec-no}" + echo "PPC 4xx optimizations ${ppc4xx-no}" echo "dcbzl available ${dcbzl-no}" + echo "performance report ${powerpc_perf-no}" +fi +if enabled sparc; then + echo "VIS enabled ${vis-no}" fi echo "gprof enabled ${gprof-no}" echo "debug symbols ${debug-no}" @@ -2182,12 +2266,14 @@ echo "libfaad dlopened ${libfaadbin-no}" echo "libgsm enabled ${libgsm-no}" echo "libmp3lame enabled ${libmp3lame-no}" echo "libnut enabled ${libnut-no}" +echo "libopenjpeg enabled ${libopenjpeg-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}" echo "libxvid enabled ${libxvid-no}" +echo "vdpau enabled ${vdpau-no}" echo "zlib enabled ${zlib-no}" echo "bzlib enabled ${bzlib-no}" echo @@ -2217,6 +2303,7 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH echo "#define FFMPEG_CONFIG_H" >> $TMPH echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH +echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH echo "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> config.mak echo "prefix=$prefix" >> config.mak @@ -2224,6 +2311,7 @@ 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 "DATADIR=\$(DESTDIR)$datadir" >> config.mak echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak echo "CC=$cc" >> config.mak echo "YASM=$yasmexe" >> config.mak @@ -2307,6 +2395,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 \ @@ -2354,13 +2444,13 @@ if enabled source_path_used; then doc \ libavcodec \ libavcodec/alpha \ - libavcodec/armv4l \ + libavcodec/arm \ libavcodec/bfin \ - libavcodec/i386 \ libavcodec/mlib \ libavcodec/ppc \ libavcodec/sh4 \ libavcodec/sparc \ + libavcodec/x86 \ libavdevice \ libavfilter \ libavformat \ @@ -2435,16 +2525,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