X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=c9eda03e33c6a3372b066809431de06b726f565a;hb=d5d3536dcb94417335380bb7c3c8014c668f95be;hp=dcfdbaa63805fb0a1e9a2d024e45b63ac2e9b83b;hpb=abe39c0f31317f888d7e3cda98f4506201725b60;p=ffmpeg diff --git a/configure b/configure index dcfdbaa6380..c9eda03e33c 100755 --- a/configure +++ b/configure @@ -12,14 +12,14 @@ try_exec(){ echo "Trying shell $1" - type "$1" >/dev/null 2>&1 && exec "$@" + type "$1" > /dev/null 2>&1 && exec "$@" } unset foo -(: ${foo%%bar}) 2>/dev/null +(: ${foo%%bar}) 2> /dev/null E1="$?" -(: ${foo?}) 2>/dev/null +(: ${foo?}) 2> /dev/null E2="$?" if test "$E1" != 0 || test "$E2" = 0; then @@ -56,11 +56,13 @@ show_help(){ echo echo "Standard options:" echo " --help print this message" - echo " --log[=FILE|yes|no] log tests and output to FILE [config.err]" - echo " --prefix=PREFIX install in PREFIX [$PREFIX]" + echo " --logfile=FILE log tests and output to FILE [config.err]" + 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 " --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/ffmpeg]" + 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]" @@ -81,7 +83,7 @@ show_help(){ echo " --enable-x11grab enable X11 grabbing [default=no]" echo echo "External library support:" - echo " --enable-sunmlib use Sun medialib [default=no]" + echo " --enable-mlib use Sun medialib [default=no]" 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]" @@ -89,6 +91,7 @@ show_help(){ 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]" @@ -96,6 +99,7 @@ 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-libschroedinger enable Dirac support via libschroedinger [default=no]" echo " --enable-libtheora enable Theora encoding via libtheora [default=no]" echo " --enable-libvorbis enable Vorbis encoding via libvorbis," echo " native implementation exists [default=no]" @@ -106,10 +110,9 @@ show_help(){ 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 " --cross-compile assume a cross-compiler is used" - echo " --target-os=OS compiler targets OS [$targetos]" + echo " --enable-cross-compile assume a cross-compiler is used" + echo " --target-os=OS compiler targets OS [$target_os]" echo " --cc=CC use C compiler CC [$cc]" - echo " --make=MAKE use specified make [$make]" 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]" @@ -120,13 +123,17 @@ show_help(){ 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-debug disable debugging symbols" echo " --disable-mpegaudio-hp faster (but less accurate)" @@ -174,19 +181,19 @@ show_help(){ echo " --enable-gprof enable profiling with gprof [$gprof]" 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 " --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 } log(){ - echo "$@" >>$logfile + echo "$@" >> $logfile } log_file(){ log BEGIN $1 - pr -n -t $1 >>$logfile + pr -n -t $1 >> $logfile log END $1 } @@ -202,18 +209,18 @@ If you think configure made a mistake, make sure you are using the latest version from SVN. If the latest version fails, report the problem to the ffmpeg-user@mplayerhq.hu mailing list or IRC #ffmpeg on irc.freenode.net. EOF - if enabled logging; then + if disabled logging; then cat </dev/null + (: ${SAVE_CFLAGS?}) 2> /dev/null } save_flags(){ @@ -401,19 +414,19 @@ add_extralibs(){ check_cmd(){ log "$@" - "$@" >>$logfile 2>&1 + "$@" >> $logfile 2>&1 } check_cc(){ log check_cc "$@" - cat >$TMPC + cat > $TMPC log_file $TMPC check_cmd $cc $CFLAGS "$@" -c -o $TMPO $TMPC } check_cpp(){ log check_cpp "$@" - cat >$TMPC + cat > $TMPC log_file $TMPC check_cmd $cc $CFLAGS "$@" -E -o $TMPO $TMPC } @@ -424,9 +437,7 @@ check_asm(){ asm="$2" shift 2 check_cc "$@" <>$logfile 2>&1; } + check_ld "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; } } check_exec_crash(){ @@ -539,7 +546,7 @@ check_exec_crash(){ # 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 <> $logfile 2>&1 < static void sighandler(int sig){ raise(SIGTERM); @@ -631,6 +638,7 @@ CONFIG_LIST=" avfilter_lavf avisynth beos_netserver + bzlib ffmpeg ffplay ffserver @@ -644,17 +652,20 @@ CONFIG_LIST=" libamr_nb libamr_wb libdc1394 + libdirac libfaac libfaad libfaadbin libgsm libmp3lame libnut + libschroedinger libtheora libvorbis libx264 libxvid memalign_hack + mlib mpegaudio_hp network nonfree @@ -696,9 +707,12 @@ ARCH_EXT_LIST=' altivec armv5te armv6 + armvfp iwmmxt mmi mmx + mmx2 + neon ssse3 vis ' @@ -707,6 +721,7 @@ HAVE_LIST=" $ARCH_EXT_LIST $THREADS_LIST altivec_h + altivec_vector_braces arpa_inet_h bswap byteswap_h @@ -744,7 +759,7 @@ HAVE_LIST=" malloc_h memalign mkstemp - mlib + pld ppc64 round roundf @@ -753,6 +768,8 @@ HAVE_LIST=" socklen_t soundcard_h poll_h + sys_mman_h + sys_resource_h sys_select_h sys_soundcard_h termios_h @@ -764,11 +781,35 @@ CMDLINE_SELECT=" $ARCH_EXT_LIST $CONFIG_LIST $THREADS_LIST + cross_compile debug extra_warnings + logging optimizations shared static + stripping +" + +PATHS_LIST=' + bindir + incdir + libdir + mandir + prefix + shlibdir +' + +CMDLINE_SET=" + $PATHS_LIST + arch + build_suffix + cc + cpu + cross_prefix + logfile + source_path + target_os " # code dependency declarations @@ -777,9 +818,12 @@ CMDLINE_SELECT=" altivec_deps="powerpc" armv5te_deps="armv4l" armv6_deps="armv4l" +armvfp_deps="armv4l" iwmmxt_deps="armv4l" mmi_deps="mips" mmx_deps="x86" +mmx2_deps="x86 mmx" +neon_deps="armv4l" ssse3_deps="x86" vis_deps="sparc" @@ -801,6 +845,8 @@ libamr_nb_decoder_deps="libamr_nb" libamr_nb_encoder_deps="libamr_nb" libamr_wb_decoder_deps="libamr_wb" libamr_wb_encoder_deps="libamr_wb" +libdirac_decoder_deps="libdirac" +libdirac_encoder_deps="libdirac" libfaac_encoder_deps="libfaac" libfaad_decoder_deps="libfaad" libfaadbin_decoder_extralibs='$ldl' @@ -809,6 +855,8 @@ libgsm_encoder_deps="libgsm" libgsm_ms_decoder_deps="libgsm" libgsm_ms_encoder_deps="libgsm" libmp3lame_encoder_deps="libmp3lame" +libschroedinger_decoder_deps="libschroedinger" +libschroedinger_encoder_deps="libschroedinger" libtheora_encoder_deps="libtheora" libvorbis_encoder_deps="libvorbis" libx264_encoder_deps="libx264" @@ -823,6 +871,7 @@ audio_beos_muxer_deps="audio_beos" audio_beos_muxer_extralibs="-lmedia -lbe" avisynth_demuxer_deps="avisynth" bktr_demuxer_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" +dirac_demuxer_deps="dirac_parser" dv1394_demuxer_deps="dv1394 dv_demuxer" libdc1394_demuxer_deps="libdc1394" libnut_demuxer_deps="libnut" @@ -834,8 +883,8 @@ redir_demuxer_deps="network" rtp_muxer_deps="network rtp_protocol" rtsp_demuxer_deps="sdp_demuxer" sdp_demuxer_deps="rtp_protocol mpegts_demuxer" -v4l2_demuxer_deps="linux_videodev2_h" v4l_demuxer_deps="linux_videodev_h" +v4l2_demuxer_deps="linux_videodev2_h" vfwcap_demuxer_deps="capCreateCaptureWindow" vfwcap_demuxer_extralibs="-lvfw32" x11_grab_device_demuxer_deps="x11grab XShmCreateImage" @@ -857,39 +906,23 @@ ffserver_extralibs='$ldl' vhook_extralibs='$ldl' -# set temporary file name -if test ! -z "$TMPDIR" ; then - TMPDIR1="${TMPDIR}" -elif test ! -z "$TEMPDIR" ; then - TMPDIR1="${TEMPDIR}" -else - TMPDIR1="/tmp" -fi - -TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c" -TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" -TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}" -TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" -TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" - # default parameters -enable logging logfile="config.err" # installation paths -PREFIX="/usr/local" -libdir='$(PREFIX)/lib' -shlibdir="$libdir" -incdir='$(PREFIX)/include' -mandir='$(PREFIX)/share/man' -bindir='$(PREFIX)/bin' +prefix_default="/usr/local" +bindir_default='${prefix}/bin' +incdir_default='${prefix}/include' +libdir_default='${prefix}/lib' +mandir_default='${prefix}/share/man' +shlibdir_default="$libdir_default" # toolchain cc="gcc" ar="ar" +nm="nm" ranlib="ranlib" -make="make" strip="strip" asmalign_pot="unknown" ln_s="ln -sf" @@ -899,29 +932,30 @@ arch=`uname -m` cpu="generic" # OS -targetos=$(tolower $(uname -s)) +target_os=$(tolower $(uname -s)) # libraries +enable bzlib enable zlib # configurable options enable debug -enable dostrip enable ffmpeg enable ffplay enable ffserver enable ipv6 -enable static enable mpegaudio_hp enable network enable optimizations enable protocols +enable static +enable stripping vhook="default" # build settings -SHFLAGS='-shared -Wl,-soname,$@' +SHFLAGS='-shared -Wl,-soname,$$(@F)' VHOOKSHFLAGS='$(SHFLAGS)' -LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' +LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' FFSERVERLDFLAGS=-Wl,-E LIBPREF="lib" LIBSUF=".a" @@ -935,8 +969,7 @@ 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) -MM $(CFLAGS) $(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \($(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"' -VHOOK_DEPEND_CMD='$(CC) -MM $(VHOOKCFLAGS) $(filter-out %.h,$^) | sed "s,^\([a-z]\),vhook/\\1,"' +DEPEND_CMD='$(CC) $(CFLAGS) -MM -MG $< | sed -e "/^\#.*/d" -e "1s,^,$(@D)/," -e "s,\\([[:space:]]\\)\\(version\\.h\\),\\1\$$(BUILD_ROOT_REL)/\\2,"' # find source path source_path="`dirname \"$0\"`" @@ -998,48 +1031,12 @@ show_list() { for opt do optval="${opt#*=}" case "$opt" in - --log) - ;; - --log=*) logging="$optval" - ;; - --prefix=*) PREFIX="$optval" - ;; - --libdir=*) libdir="$optval" - ;; - --shlibdir=*) shlibdir="$optval" - ;; - --incdir=*) incdir="$optval" - ;; - --mandir=*) mandir="$optval" - ;; - --source-path=*) source_path="$optval" - ;; - --cross-prefix=*) cross_prefix="$optval" - ;; - --cross-compile) enable cross_compile - ;; - --target-os=*) targetos="$optval" - ;; - --cc=*) cc="$optval" - ;; - --make=*) make="$optval" - ;; --extra-cflags=*) add_cflags "$optval" ;; --extra-ldflags=*) add_ldflags "$optval" ;; --extra-libs=*) add_extralibs "$optval" ;; - --build-suffix=*) BUILDSUF="$optval" - ;; - --arch=*) arch="$optval" - ;; - --cpu=*) cpu="$optval" - ;; - --enable-sunmlib) enable mlib - ;; - --disable-strip) disable dostrip - ;; --disable-devices) disable $INDEV_LIST $OUTDEV_LIST ;; --enable-debug=*) debuglevel="$optval" @@ -1070,11 +1067,42 @@ for opt do --help|-h) show_help ;; *) - die_unknown $opt + optname="${opt%=*}" + optname="${optname#--}" + optname=$(echo "$optname" | sed 's/-/_/g') + is_in $optname $CMDLINE_SET || die_unknown $opt + eval $optname='$optval' ;; esac done +disabled logging && logfile=/dev/null + +echo "# $0 $@" > $logfile +set >> $logfile + +cc="${cross_prefix}${cc}" +ar="${cross_prefix}${ar}" +nm="${cross_prefix}${nm}" +ranlib="${cross_prefix}${ranlib}" +strip="${cross_prefix}${strip}" + +# set temporary file name +if test ! -z "$TMPDIR" ; then + TMPDIR1="${TMPDIR}" +elif test ! -z "$TEMPDIR" ; then + TMPDIR1="${TEMPDIR}" +else + TMPDIR1="/tmp" +fi + +TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c" +TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}" +TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" +TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" +TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" +TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh" + case "$arch" in i386|i486|i586|i686|i86pc|BePC) arch="x86_32" @@ -1083,13 +1111,9 @@ case "$arch" in 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 - arch="x86_64" - enable fast_64bit - fi - fi + check_cc </dev/null); then + if echo $BEINCLUDES | grep -q 'headers/be/bone'; then network_extralibs="-lbind -lsocket" else enable beos_netserver @@ -1178,7 +1202,7 @@ case $targetos in fi ;; sunos) FFSERVERLDFLAGS="" - SHFLAGS='-shared -Wl,-h,$@' + SHFLAGS='-shared -Wl,-h,$$(@F)' network_extralibs="-lsocket -lnsl" ;; netbsd) @@ -1205,7 +1229,7 @@ case $targetos in darwin) disable need_memalign SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress' - VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@' + VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$$(@F)' strip="strip -x" FFLDFLAGS="-Wl,-dynamic,-search_paths_first" SLIBSUF=".dylib" @@ -1214,8 +1238,13 @@ case $targetos in FFSERVERLDFLAGS=-Wl,-bind_at_load ;; mingw32*) - targetos=mingw32 - shlibdir="$bindir" + target_os=mingw32 + LIBTARGET=i386 + if test $arch = x86_64; then + disable need_memalign + LIBTARGET=x64 + fi + shlibdir_default="$bindir_default" VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' if enabled swscale; then @@ -1228,14 +1257,15 @@ case $targetos in EXESUF=".exe" 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:$(SLIBSUF)=.lib)"' + SLIB_EXTRA_CMD='-lib /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)' + SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"; \ + install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(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' + SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base' ;; cygwin*) - targetos=cygwin - shlibdir="$bindir" + target_os=cygwin + shlibdir_default="$bindir_default" VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' if enabled swscale; then @@ -1260,33 +1290,30 @@ case $targetos in enable dv1394 ;; irix*) - targetos=irix + target_os=irix ranlib="echo ignoring ranlib" ;; os/2*) - ar="emxomfar -p256" - ranlib="echo ignoring ranlib" strip="lxlite" ln_s="cp -f" - add_cflags "-Zomf" EXESUF=".exe" FFLDFLAGS="-Zomf -Zbin-files -Zargs-wild -Zmap" - SHFLAGS='$(NAME).def -Zdll -Zomf' + SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' FFSERVERLDFLAGS="" - LIBSUF="_s.lib" + LIBSUF="_s.a" SLIBPREF="" SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)' - SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(NAME).def; \ - echo PROTMODE >> $(NAME).def; \ - echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(NAME).def; \ - echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(NAME).def; \ - echo EXPORTS >> $(NAME).def; \ - emxexp -o $(OBJS) >> $(NAME).def' - SLIB_EXTRA_CMD='emximp -o $(LIBPREF)$(NAME)_dll.a $(NAME).def; \ - emximp -o $(LIBPREF)$(NAME)_dll.lib $(NAME).def;' - SLIB_INSTALL_EXTRA_CMD='install -m 644 $(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib "$(LIBDIR)"' + SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \ + echo PROTMODE >> $(SUBDIR)$(NAME).def; \ + echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \ + echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(NAME).def; \ + echo EXPORTS >> $(SUBDIR)$(NAME).def; \ + emxexp -o $(OBJS) >> $(SUBDIR)$(NAME).def' + SLIB_EXTRA_CMD='emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(NAME).def; \ + emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;' + 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 ;; @@ -1295,28 +1322,18 @@ case $targetos in ;; *) - targetos="${targetos}-UNKNOWN" + target_os="${target_os}-UNKNOWN" ;; esac -add_extralibs $osextralibs +set_default $PATHS_LIST -if ! disabled logging ; then - enabled logging || logfile="$logging" - echo "# $0 $@" >$logfile - set >>$logfile -else - logfile=/dev/null -fi +add_extralibs $osextralibs # Combine FFLDFLAGS and the LDFLAGS environment variable. LDFLAGS="$FFLDFLAGS $LDFLAGS" test -n "$cross_prefix" && enable cross_compile -cc="${cross_prefix}${cc}" -ar="${cross_prefix}${ar}" -ranlib="${cross_prefix}${ranlib}" -strip="${cross_prefix}${strip}" # we need to build at least one lib type if ! enabled_any static shared; then @@ -1371,14 +1388,14 @@ check_deps $ARCH_EXT_LIST test -z "$need_memalign" && need_memalign="$mmx" #Darwin CC versions -if test $targetos = darwin; then - if test -n "`$cc -v 2>&1 | grep xlc`"; then +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" else add_cflags "-pipe" check_cflags "-force_cpusubtype_ALL" check_cflags "-Wno-sign-compare" - enabled shared || add_cflags -mdynamic-no-pic + enabled shared || check_cflags -mdynamic-no-pic fi fi @@ -1444,7 +1461,7 @@ if test $cpu != "generic"; then sparc64) add_cflags "-mcpu=v9" ;; - arm*) + arm*|cortex*) add_cflags "-mcpu=$cpu" ;; *) @@ -1453,20 +1470,12 @@ if test $cpu != "generic"; then esac fi -gnu_make(){ - $1 --version 2>&1 | grep -q GNU -} - -if ! gnu_make $make; then - gnu_make gmake && make=gmake || die "GNU make not found." -fi - # make sure we can execute files in $TMPDIR -cat >$TMPE 2>>$logfile < $TMPSH 2>> $logfile <>$logfile 2>&1 -if ! $TMPE >>$logfile 2>&1; then +chmod +x $TMPSH >> $logfile 2>&1 +if ! $TMPSH >> $logfile 2>&1; then cat </dev/null 2>&1; then +if "${SDL_CONFIG}" --version > /dev/null 2>&1; then sdl_cflags=`"${SDL_CONFIG}" --cflags` temp_cflags $sdl_cflags temp_extralibs `"${SDL_CONFIG}" --libs` @@ -1719,7 +1754,7 @@ EOF restore_flags fi -texi2html -version >/dev/null 2>&1 && enable texi2html || disable texi2html +texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html check_type sys/socket.h socklen_t @@ -1802,7 +1837,7 @@ if enabled small; then check_cflags -Os # not all compilers support -Os optimizations="small" elif enabled optimizations; then - if test -n "`$cc -v 2>&1 | grep xlc`"; then + if $cc -v 2>&1 | grep -q xlc; then add_cflags "-O5" add_ldflags "-O5" else @@ -1812,6 +1847,22 @@ fi check_cflags -fno-math-errno check_cflags -fno-signed-zeros +# add some flags for Intel C Compiler +if $cc --version | grep -q Intel; then + # Just warnings, no remarks + check_cflags -w1 + # -wd: Disable following warnings + # 144, 167, 556: -Wno-pointer-sign + # 10006: ignoring unknown option -fno-signed-zeros + # 10156: ignoring option '-W'; no argument required + check_cflags -wd144,167,556,10006,10156 + # 11030: Warning unknown option --as-needed + # 10156: ignoring option '-export'; no argument required + check_ldflags -wd10156,11030 + # Allow to compile with optimizations + check_ldflags -march=$cpu +fi + # PIC flags for shared library objects where they are needed if enabled shared; then # LIBOBJFLAGS may have already been set in the OS configuration @@ -1861,17 +1912,17 @@ check_deps $CONFIG_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 "install prefix $prefix" echo "source path $source_path" echo "C compiler $cc" -echo "make $make" echo ".align is power-of-two $asmalign_pot" echo "ARCH $arch ($cpu)" -if test "$BUILDSUF" != ""; then - echo "build suffix $BUILDSUF" +if test "$build_suffix" != ""; then + echo "build suffix $build_suffix" fi echo "big-endian ${bigendian-no}" if test $arch = "x86_32" -o $arch = "x86_64"; then @@ -1884,7 +1935,9 @@ fi if test $arch = "armv4l"; then echo "ARMv5TE enabled ${armv5te-no}" echo "ARMv6 enabled ${armv6-no}" + echo "ARM VFP enabled ${armvfp-no}" echo "IWMMXT enabled ${iwmmxt-no}" + echo "NEON enabled ${neon-no}" fi if test $arch = "mips"; then echo "MMI enabled ${mmi-no}" @@ -1895,7 +1948,7 @@ if test $arch = "powerpc"; then fi echo "gprof enabled ${gprof-no}" echo "debug symbols ${debug-no}" -echo "strip symbols ${dostrip-no}" +echo "strip symbols ${stripping-no}" echo "optimizations ${optimizations-no}" echo "static ${static-no}" echo "shared ${shared-no}" @@ -1924,17 +1977,20 @@ echo "liba52 dlopened ${liba52bin-no}" echo "libamr-nb support ${libamr_nb-no}" echo "libamr-wb support ${libamr_wb-no}" echo "libdc1394 support ${libdc1394-no}" +echo "libdirac enabled ${libdirac-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 "libschroedinger enabled ${libschroedinger-no}" echo "libtheora enabled ${libtheora-no}" echo "libvorbis enabled ${libvorbis-no}" -echo "x264 enabled ${libx264-no}" -echo "XviD enabled ${libxvid-no}" +echo "libx264 enabled ${libx264-no}" +echo "libxvid enabled ${libxvid-no}" echo "zlib enabled ${zlib-no}" +echo "bzlib enabled ${bzlib-no}" echo for type in decoder encoder parser demuxer muxer protocol filter bsf indev outdev; do @@ -1946,11 +2002,14 @@ for type in decoder encoder parser demuxer muxer protocol filter bsf indev outde echo done -enabled nonfree && - echo "License: unredistributable" || - (enabled gpl && - echo "License: GPL" || - echo "License: LGPL") +license="LGPL" +if enabled nonfree; then + license="unredistributable" +elif enabled gpl; then + license="GPL" +fi + +echo "License: $license" echo "Creating config.mak and config.h..." @@ -1960,24 +2019,22 @@ echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH echo "#define FFMPEG_CONFIG_H" >> $TMPH echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH -echo "PREFIX=$PREFIX" >> config.mak -echo "prefix=\$(DESTDIR)\$(PREFIX)" >> config.mak +echo "prefix=$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 echo "RANLIB=$ranlib" >> config.mak echo "LN_S=$ln_s" >> config.mak -enabled dostrip && +enabled stripping && echo "STRIP=$strip" >> config.mak || echo "STRIP=echo ignoring strip" >> config.mak echo "OPTFLAGS=$CFLAGS" >> config.mak -echo "VHOOKCFLAGS=$VHOOKCFLAGS">>config.mak +echo "VHOOKCFLAGS=$VHOOKCFLAGS" >> config.mak echo "LDFLAGS=$LDFLAGS" >> config.mak echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak @@ -1985,7 +2042,7 @@ echo "VHOOKSHFLAGS=$VHOOKSHFLAGS" >> config.mak echo "VHOOKLIBS=$VHOOKLIBS" >> config.mak echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak echo "BUILD_STATIC=$static" >> config.mak -echo "BUILDSUF=$BUILDSUF" >> config.mak +echo "BUILDSUF=$build_suffix" >> config.mak echo "FULLNAME=$FULLNAME" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak echo "LIBSUF=$LIBSUF" >> config.mak @@ -1994,7 +2051,6 @@ echo "SLIBPREF=$SLIBPREF" >> config.mak echo "SLIBSUF=$SLIBSUF" >> config.mak echo "EXESUF=$EXESUF" >> config.mak echo "DEPEND_CMD=$DEPEND_CMD" >> config.mak -echo "VHOOK_DEPEND_CMD=$VHOOK_DEPEND_CMD" >> config.mak if enabled bigendian; then echo "WORDS_BIGENDIAN=yes" >> config.mak @@ -2030,6 +2086,7 @@ get_version LIBAVFILTER libavfilter/avfilter.h if enabled shared; then echo "BUILD_SHARED=yes" >> config.mak echo "PIC=-fPIC -DPIC" >> config.mak + echo "LIBTARGET=${LIBTARGET}" >> config.mak echo "SLIBNAME=${SLIBNAME}" >> config.mak echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak @@ -2070,6 +2127,7 @@ enabled asmalign_pot && printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH || printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH +echo "#define EXTERN_PREFIX \"${extern_prefix}\"" >> $TMPH echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH @@ -2078,7 +2136,7 @@ cmp -s $TMPH config.h && echo "config.h is unchanged" || mv -f $TMPH config.h -rm -f $TMPO $TMPC $TMPE $TMPS $TMPH +rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH # build tree in object directory if source path is different from current one if enabled source_path_used; then @@ -2106,6 +2164,7 @@ if enabled source_path_used; then FILES="\ Makefile \ common.mak \ + subdir.mak \ doc/texi2pod.pl \ libavcodec/Makefile \ libavdevice/Makefile \ @@ -2125,38 +2184,31 @@ fi # build pkg-config files -# FIXME: libdir and includedir are hardcoded and may differ from the real path. pkgconfig_generate(){ name=$1 +shortname=${name#lib} comment=$2 version=$3 libs=$4 requires=$5 -cat <$name.pc -prefix=$PREFIX +cat < $name/$name.pc +prefix=$prefix exec_prefix=\${prefix} -libdir=\${exec_prefix}/lib -includedir=\${prefix}/include +libdir=$libdir +includedir=$incdir Name: $name Description: $comment Version: $version -Requires: $requires +Requires: $(disabled shared && echo $requires) +Requires.private: $(enabled shared && echo $requires) Conflicts: -Libs: -L\${libdir} $libs +Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs) +Libs.private: $(enabled shared && echo $libs) Cflags: -I\${includedir} EOF -} - -pkgconfig_generate_uninstalled(){ -name=$1 -shortname=${name#lib} -comment=$2 -version=$3 -libs=$4 -requires=$5 -cat <$name-uninstalled.pc +cat < $name/$name-uninstalled.pc prefix= exec_prefix= libdir=\${pcfiledir}/$name @@ -2172,33 +2224,17 @@ Cflags: -I\${includedir} EOF } -pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" -lavutil "" -pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" - -pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "-lavcodec $extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" -pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" - -pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "-lavformat $extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" -pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" - -pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "-lavdevice $extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION" -pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION" -if enabled postproc; then - pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" -lpostproc "" - pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" -fi - +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" +enabled avfilter && + pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires 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" -lswscale "libavutil = $LIBAVUTIL_VERSION" - pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" + 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_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" - apply libswscale.pc sed s/^Libs:.*$/Libs:/ - apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/ -fi - -if enabled avfilter; then - pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "-lavfilter $extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" ffmpeg - pkgconfig_generate_uninstalled libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" + apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/ fi