X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=0a315710f76975c69d11f43367c14b24ef70ee72;hb=2b6cee9f1e3741356462d25b2ac7221d75afdc56;hp=6403f94a26fde7739e1a86728e5edbd80c419b73;hpb=504a64b95db88247cff8d66999f82d536281f306;p=ffmpeg diff --git a/configure b/configure index 6403f94a26f..0a315710f76 100755 --- a/configure +++ b/configure @@ -2,24 +2,27 @@ # # FFmpeg configure script # -# Copyright (c) 2000, 2001, 2002 Fabrice Bellard -# Copyright (c) 2005-2006 Diego Biurrun -# Copyright (c) 2005-2006 Mans Rullgard +# Copyright (c) 2000-2002 Fabrice Bellard +# Copyright (c) 2005-2008 Diego Biurrun +# Copyright (c) 2005-2008 Mans Rullgard # +# Prevent locale nonsense from breaking basic text processing. +export LC_ALL=C + # make sure we are running under a compatible shell # try to make this part work with most shells 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 @@ -59,6 +62,7 @@ show_help(){ 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]" @@ -83,8 +87,6 @@ show_help(){ echo echo "External library support:" 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]" echo " --enable-libamr-nb enable libamr-nb floating point audio codec" echo " --enable-libamr-wb enable libamr-wb floating point audio codec" @@ -115,6 +117,7 @@ show_help(){ echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]" echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" + echo " --extra-version=STRING version string suffix []" echo " --build-suffix=SUFFIX suffix for application specific build []" echo " --arch=ARCH select architecture [$arch]" echo " --cpu=CPU selects the minimum cpu required (affects" @@ -132,8 +135,8 @@ show_help(){ 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)" echo " MPEG audio decoding [default=no]" echo " --enable-gray enable full grayscale support (slower color)" @@ -176,6 +179,8 @@ show_help(){ echo " --list-outdevs show all available output devices" echo echo "Developer options (useful when working on FFmpeg itself):" + echo " --disable-debug disable debugging symbols" + echo " --enable-debug=LEVEL set the debug level [$debuglevel]" echo " --enable-gprof enable profiling with gprof [$gprof]" echo " --disable-optimizations disable compiler optimizations" echo " --enable-extra-warnings enable more compiler warnings" @@ -186,12 +191,12 @@ show_help(){ } log(){ - echo "$@" >>$logfile + echo "$@" >> $logfile } log_file(){ log BEGIN $1 - pr -n -t $1 >>$logfile + pr -n -t $1 >> $logfile log END $1 } @@ -267,11 +272,13 @@ disable(){ } enabled(){ - eval test "x\$$1" = "xyes" + test "${1#!}" = "$1" && op== || op=!= + eval test "x\$${1#!}" $op "xyes" } disabled(){ - eval test "x\$$1" = "xno" + test "${1#!}" = "$1" && op== || op=!= + eval test "x\$${1#!}" $op "xno" } enabled_all(){ @@ -298,6 +305,12 @@ disabled_any(){ done } +set_default(){ + for opt; do + eval test -z "\$$opt" && eval $opt=\$${opt}_default + done +} + is_in(){ value=$1 shift @@ -309,6 +322,7 @@ is_in(){ check_deps(){ for cfg; do + cfg="${cfg#!}" enabled ${cfg}_checking && die "Circular dependency for $cfg." disabled ${cfg}_checking && continue enable ${cfg}_checking @@ -350,7 +364,7 @@ print_config(){ } flags_saved(){ - (: ${SAVE_CFLAGS?}) 2>/dev/null + (: ${SAVE_CFLAGS?}) 2> /dev/null } save_flags(){ @@ -406,19 +420,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 } @@ -433,6 +447,14 @@ int foo(void){ asm volatile($asm); } EOF } +check_yasm(){ + log check_yasm "$@" + echo "$1" > $TMPS + log_file $TMPS + shift 1 + check_cmd $yasmexe $YASMFLAGS "$@" -o $TMPO $TMPS +} + check_ld(){ log check_ld "$@" check_cc || return @@ -481,8 +503,8 @@ int main(void){ $func(); } EOF } -check_func2(){ - log check_func2 "$@" +check_func_headers(){ + log check_func_headers "$@" headers=$1 func=$2 shift 2 @@ -519,14 +541,14 @@ check_lib2(){ func="$2" shift 2 temp_extralibs "$@" - check_func2 "$headers" $func && add_extralibs "$@" + check_func_headers "$headers" $func && add_extralibs "$@" err=$? restore_flags return $err } check_exec(){ - check_ld "$@" && { enabled cross_compile || $TMPE >>$logfile 2>&1; } + check_ld "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; } } check_exec_crash(){ @@ -538,7 +560,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); @@ -611,6 +633,9 @@ apply(){ "$@" < "$file" > "$file.tmp" && mv "$file.tmp" "$file" || rm "$file.tmp" } +# CONFIG_LIST contains configurable options, while HAVE_LIST is for +# system-dependent things. + COMPONENT_LIST=" bsfs decoders @@ -630,6 +655,7 @@ CONFIG_LIST=" avfilter_lavf avisynth beos_netserver + bzlib ffmpeg ffplay ffserver @@ -638,8 +664,6 @@ CONFIG_LIST=" gray hardcoded_tables ipv6 - liba52 - liba52bin libamr_nb libamr_wb libdc1394 @@ -703,6 +727,7 @@ ARCH_EXT_LIST=' mmi mmx mmx2 + neon ssse3 vis ' @@ -761,9 +786,11 @@ HAVE_LIST=" sys_resource_h sys_select_h sys_soundcard_h + sys_videoio_h termios_h threads winsock2_h + yasm " CMDLINE_SELECT=" @@ -779,21 +806,28 @@ CMDLINE_SELECT=" static stripping " -CMDLINE_SET=' + +PATHS_LIST=' + bindir + incdir + libdir + mandir + prefix + shlibdir +' + +CMDLINE_SET=" + $PATHS_LIST arch build_suffix cc cpu cross_prefix - incdir - libdir + extra_version logfile - mandir - prefix - shlibdir source_path target_os -' +" # code dependency declarations @@ -806,14 +840,20 @@ iwmmxt_deps="armv4l" mmi_deps="mips" mmx_deps="x86" mmx2_deps="x86 mmx" +neon_deps="armv4l" ssse3_deps="x86" vis_deps="sparc" +# system headers and functions +byteswap_h_deps="!armv4l" + # decoders / encoders ac3_decoder_deps="gpl" dxa_decoder_deps="zlib" +eac3_decoder_deps="gpl" flashsv_decoder_deps="zlib" flashsv_encoder_deps="zlib" +mlp_decoder_deps="mlp_parser" mpeg_xvmc_decoder_deps="xvmc" png_decoder_deps="zlib" png_encoder_deps="zlib" @@ -821,13 +861,11 @@ zmbv_decoder_deps="zlib" zmbv_encoder_deps="zlib" # external libraries -liba52_decoder_deps="liba52" -liba52bin_decoder_extralibs='$ldl' 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_decoder_deps="libdirac !libschroedinger" libdirac_encoder_deps="libdirac" libfaac_encoder_deps="libfaac" libfaad_decoder_deps="libfaad" @@ -866,7 +904,7 @@ rtp_muxer_deps="network rtp_protocol" rtsp_demuxer_deps="sdp_demuxer" sdp_demuxer_deps="rtp_protocol mpegts_demuxer" v4l_demuxer_deps="linux_videodev_h" -v4l2_demuxer_deps="linux_videodev2_h" +v4l2_demuxer_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_demuxer_deps="capCreateCaptureWindow" vfwcap_demuxer_extralibs="-lvfw32" x11_grab_device_demuxer_deps="x11grab XShmCreateImage" @@ -893,21 +931,23 @@ vhook_extralibs='$ldl' 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" +yasmexe="yasm" ar="ar" nm="nm" ranlib="ranlib" strip="strip" asmalign_pot="unknown" ln_s="ln -sf" +objformat="elf" # machine arch=`uname -m` @@ -917,6 +957,7 @@ cpu="generic" target_os=$(tolower $(uname -s)) # libraries +enable bzlib enable zlib # configurable options @@ -934,9 +975,9 @@ enable stripping vhook="default" # build settings +add_cflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 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' FFSERVERLDFLAGS=-Wl,-E LIBPREF="lib" LIBSUF=".a" @@ -950,7 +991,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) $(CFLAGS) -MM -MG $< | sed "1s,^,$(@D)/,"' +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\"`" @@ -1057,16 +1098,110 @@ for opt do esac done +disabled logging && logfile=/dev/null + +echo "# $0 $@" > $logfile +set >> $logfile + cc="${cross_prefix}${cc}" +yasmexe="${cross_prefix}${yasmexe}" 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" + +check_cflags -fasm +check_cflags -std=c99 + +case "$arch" in + i386|i486|i586|i686|i86pc|BePC) + arch="x86_32" + enable fast_unaligned + ;; + x86_64|amd64) + arch="x86_32" + enable fast_unaligned + check_cc <$logfile -set >>$logfile - -case "$arch" in - i386|i486|i586|i686|i86pc|BePC) - arch="x86_32" - enable fast_unaligned - ;; - x86_64|amd64) - arch="x86_32" - enable fast_unaligned - check_cc < #ifndef FAAD2_VERSION ok faad1 @@ -1345,7 +1401,6 @@ if ! enabled gpl; then enabled_any $@ && die "$name is under GPL and --enable-gpl is not specified." } die_gpl_disabled "The Postprocessing code" postproc - die_gpl_disabled "liba52" liba52 die_gpl_disabled "libx264" libx264 die_gpl_disabled "libxvidcore" libxvid die_gpl_disabled "FAAD2" libfaad2 @@ -1373,7 +1428,7 @@ if test $target_os = darwin; then fi fi -disabled optimizations || add_cflags -fomit-frame-pointer +disabled optimizations || check_cflags -fomit-frame-pointer # Add processor-specific flags if test $cpu != "generic"; then @@ -1435,7 +1490,7 @@ if test $cpu != "generic"; then sparc64) add_cflags "-mcpu=v9" ;; - arm*) + arm*|cortex*) add_cflags "-mcpu=$cpu" ;; *) @@ -1445,11 +1500,11 @@ if test $cpu != "generic"; then fi # make sure we can execute files in $TMPDIR -cat >$TMPSH 2>>$logfile < $TMPSH 2>> $logfile <>$logfile 2>&1 -if ! $TMPSH >>$logfile 2>&1; then +chmod +x $TMPSH >> $logfile 2>&1 +if ! $TMPSH >> $logfile 2>&1; then cat < int main(void) { return ($func(3.999f) > 0)?0:1; } EOF @@ -1633,7 +1697,6 @@ done # these are off by default, so fail if requested and not available enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32 -enabled liba52 && require liba52 a52dec/a52.h a52_init -la52 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 libdirac && add_cflags "$(pkg-config --cflags dirac)" \ @@ -1645,19 +1708,13 @@ 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 libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) \ - && require libschroedinger schroedinger/schro.h schro_init -lschroedinger-1.0 -lpthread -loil-0.3 -lm -lrt + && require libschroedinger schroedinger/schro.h schro_init $(pkg-config --libs schroedinger-1.0) enabled libtheora && require libtheora theora/theora.h theora_info_init -ltheora -logg enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg enabled libx264 && require x264 x264.h x264_encoder_open -lx264 -lm enabled libxvid && require Xvid xvid.h xvid_global -lxvidcore enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib -# disable the native AC-3 decoder if liba52 is enabled -enabled liba52 && disable ac3_decoder - -# disable the slower libdirac decoder if libschroedinger is enabled -enabled libschroedinger && enabled libdirac && disable libdirac_decoder - # libdc1394 check if enabled libdc1394; then { check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 && @@ -1699,7 +1756,7 @@ check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType disable sdl_too_old disable sdl SDL_CONFIG="${cross_prefix}sdl-config" -if "${SDL_CONFIG}" --version >/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` @@ -1722,21 +1779,20 @@ EOF restore_flags fi -texi2html -version >/dev/null 2>&1 && enable texi2html || disable texi2html - -check_type sys/socket.h socklen_t +texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html ########################################## # Network check if enabled network; then + check_type sys/socket.h socklen_t # Prefer arpa/inet.h over winsock2 if check_header arpa/inet.h ; then check_func closesocket elif check_header winsock2.h ; then network_extralibs="-lws2_32" check_type ws2tcpip.h socklen_t - check_func2 winsock2.h closesocket + check_func_headers winsock2.h closesocket fi fi @@ -1759,8 +1815,9 @@ EOF check_header linux/videodev.h check_header linux/videodev2.h +check_header sys/videoio.h -check_func2 "windows.h vfw.h" capCreateCaptureWindow -lvfw32 +check_func_headers "windows.h vfw.h" capCreateCaptureWindow -lvfw32 # check for ioctl_meteor.h, ioctl_bt848.h and alternatives { check_header dev/bktr/ioctl_meteor.h && @@ -1798,7 +1855,8 @@ enabled extra_warnings && check_cflags -Winline # add some linker flags check_ldflags -Wl,--warn-common -check_ldflags $LDLATEFLAGS +check_ldflags -Wl,--as-needed +check_ldflags '-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' check_ldflags -Wl,-Bsymbolic if enabled small; then @@ -1816,7 +1874,7 @@ check_cflags -fno-math-errno check_cflags -fno-signed-zeros # add some flags for Intel C Compiler -if $cc --version | grep -q Intel; then +if $cc --version 2> /dev/null | grep -q Intel; then # Just warnings, no remarks check_cflags -w1 # -wd: Disable following warnings @@ -1827,6 +1885,8 @@ if $cc --version | grep -q Intel; then # 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 @@ -1834,7 +1894,7 @@ if enabled shared; then # LIBOBJFLAGS may have already been set in the OS configuration if test -z "$LIBOBJFLAGS" ; then case "$arch" in - x86_64|ia64|alpha|sparc*|power*) LIBOBJFLAGS='$(PIC)' ;; + x86_64|ia64|alpha|sparc*|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;; esac fi fi @@ -1890,8 +1950,12 @@ echo "ARCH $arch ($cpu)" if test "$build_suffix" != ""; then echo "build suffix $build_suffix" fi +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 + echo "yasm ${yasm-no}" echo "MMX enabled ${mmx-no}" echo "CMOV enabled ${cmov-no}" echo "CMOV is fast ${fast_cmov-no}" @@ -1903,6 +1967,7 @@ if test $arch = "armv4l"; then 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}" @@ -1937,8 +2002,6 @@ if enabled sdl_too_old; then fi 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 "libdc1394 support ${libdc1394-no}" @@ -1952,9 +2015,10 @@ 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 @@ -1966,11 +2030,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..." @@ -1980,14 +2047,15 @@ 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 "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> 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 "CC=$cc" >> config.mak +echo "YASM=$yasmexe" >> config.mak echo "AR=$ar" >> config.mak echo "RANLIB=$ranlib" >> config.mak echo "LN_S=$ln_s" >> config.mak @@ -1996,10 +2064,11 @@ enabled stripping && 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 +echo "YASMFLAGS=$YASMFLAGS" >> config.mak echo "VHOOKSHFLAGS=$VHOOKSHFLAGS" >> config.mak echo "VHOOKLIBS=$VHOOKLIBS" >> config.mak echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak @@ -2012,6 +2081,7 @@ echo "LIBNAME=$LIBNAME" >> config.mak echo "SLIBPREF=$SLIBPREF" >> config.mak echo "SLIBSUF=$SLIBSUF" >> config.mak echo "EXESUF=$EXESUF" >> config.mak +echo "EXTRA_VERSION=$extra_version" >> config.mak echo "DEPEND_CMD=$DEPEND_CMD" >> config.mak if enabled bigendian; then @@ -2048,6 +2118,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 @@ -2086,7 +2157,7 @@ echo "BUILD_ROOT=\"$PWD\"" >> config.mak # Apparently it's not possible to portably echo a backslash. enabled asmalign_pot && printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH || - printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH + printf '#define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\\n\\t"\n' >> $TMPH echo "#define EXTERN_PREFIX \"${extern_prefix}\"" >> $TMPH @@ -2153,7 +2224,7 @@ comment=$2 version=$3 libs=$4 requires=$5 -cat <$name.pc +cat < $name/$name.pc prefix=$prefix exec_prefix=\${prefix} libdir=$libdir @@ -2162,25 +2233,25 @@ 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} -l${shortname} -Libs.private: $libs +Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs) +Libs.private: $(enabled shared && echo $libs) Cflags: -I\${includedir} EOF -cat <$name-uninstalled.pc +cat < $name/$name-uninstalled.pc prefix= exec_prefix= -libdir=\${pcfiledir}/$name -includedir=\${pcfiledir} +libdir=\${pcfiledir} +includedir=${source_path} Name: $name Description: $comment Version: $version Requires: $requires Conflicts: -Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} -Libs.private: $libs +Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs Cflags: -I\${includedir} EOF } @@ -2189,13 +2260,13 @@ 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 && \ +enabled avfilter && pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" -enabled postproc && \ +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" - apply libswscale.pc sed s/^Libs:.*$/Libs:/ + apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/ fi