| Index: source/patched-ffmpeg-mt/configure
|
| ===================================================================
|
| --- source/patched-ffmpeg-mt/configure (revision 50820)
|
| +++ source/patched-ffmpeg-mt/configure (working copy)
|
| @@ -61,7 +61,7 @@
|
|
|
| Standard options:
|
| --help print this message
|
| - --logfile=FILE log tests and output to FILE [config.err]
|
| + --logfile=FILE log tests and output to FILE [config.log]
|
| --disable-logging do not log configure debug information
|
| --prefix=PREFIX install in PREFIX [$prefix]
|
| --bindir=DIR install binaries in DIR [PREFIX/bin]
|
| @@ -169,8 +169,6 @@
|
| and libraw1394 [no]
|
| --enable-libdirac enable Dirac support via libdirac [no]
|
| --enable-libfaac enable FAAC support via libfaac [no]
|
| - --enable-libfaad enable FAAD support via libfaad [no]
|
| - --enable-libfaadbin open libfaad.so.0 at runtime [no]
|
| --enable-libgsm enable GSM support via libgsm [no]
|
| --enable-libmp3lame enable MP3 encoding via libmp3lame [no]
|
| --enable-libnut enable NUT (de)muxing via libnut,
|
| @@ -252,6 +250,8 @@
|
| exit 0
|
| }
|
|
|
| +quotes='""'
|
| +
|
| log(){
|
| echo "$@" >> $logfile
|
| }
|
| @@ -913,8 +913,6 @@
|
| libdc1394
|
| libdirac
|
| libfaac
|
| - libfaad
|
| - libfaadbin
|
| libgsm
|
| libmp3lame
|
| libnut
|
| @@ -1084,6 +1082,9 @@
|
| struct_sockaddr_in6
|
| struct_sockaddr_sa_len
|
| struct_sockaddr_storage
|
| + symver
|
| + symver_gnu_asm
|
| + symver_asm_label
|
| sys_mman_h
|
| sys_resource_h
|
| sys_select_h
|
| @@ -1198,6 +1199,8 @@
|
| need_memalign="altivec neon sse"
|
| inline_asm_deps="!tms470"
|
|
|
| +symver_if_any="symver_asm_label symver_gnu_asm"
|
| +
|
| # subsystems
|
| mdct_select="fft"
|
| rdft_select="fft"
|
| @@ -1253,6 +1256,8 @@
|
| mpeg4_encoder_select="h263_encoder"
|
| mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder"
|
| mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder"
|
| +mpeg2_dxva2_hwaccel_deps="dxva2api_h"
|
| +mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder"
|
| mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
|
| mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
|
| mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder"
|
| @@ -1334,8 +1339,6 @@
|
| libdirac_decoder_deps="libdirac !libschroedinger"
|
| libdirac_encoder_deps="libdirac"
|
| libfaac_encoder_deps="libfaac"
|
| -libfaad_decoder_deps="libfaad"
|
| -libfaadbin_extralibs='$ldl'
|
| libgsm_decoder_deps="libgsm"
|
| libgsm_encoder_deps="libgsm"
|
| libgsm_ms_decoder_deps="libgsm"
|
| @@ -1433,7 +1436,7 @@
|
|
|
| # default parameters
|
|
|
| -logfile="config.err"
|
| +logfile="config.log"
|
|
|
| # installation paths
|
| prefix_default="/usr/local"
|
| @@ -2161,7 +2164,7 @@
|
| darwin)
|
| enable malloc_aligned
|
| SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress'
|
| - strip="strip -x"
|
| + strip="${strip} -x"
|
| FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
|
| SLIBSUF=".dylib"
|
| SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
|
| @@ -2291,27 +2294,10 @@
|
|
|
| disabled static && LIBNAME=""
|
|
|
| -if enabled_any libfaad libfaadbin ; then
|
| - if check_header faad.h; then
|
| - check_cc <<EOF
|
| -#include <faad.h>
|
| -#ifndef FAAD2_VERSION
|
| -ok faad1
|
| -#endif
|
| -int main(void) { return 0; }
|
| -EOF
|
| - test $? = 0 && enable libfaad2
|
| - else
|
| - die "FAAD test failed."
|
| - fi
|
| -fi
|
| -
|
| -
|
| die_license_disabled() {
|
| enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; }
|
| }
|
|
|
| -die_license_disabled gpl libfaad2
|
| die_license_disabled gpl libx264
|
| die_license_disabled gpl libxvid
|
| die_license_disabled gpl postproc
|
| @@ -2588,7 +2574,6 @@
|
| require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) &&
|
| require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac)
|
| enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
|
| -enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad
|
| enabled libgsm && require libgsm gsm/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
|
| @@ -2717,8 +2702,17 @@
|
| check_ldflags -Wl,-Bsymbolic
|
|
|
| echo "X{};" > $TMPV
|
| -test_ldflags -Wl,--version-script,$TMPV &&
|
| +if test_ldflags -Wl,--version-script,$TMPV; then
|
| append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
|
| + check_cc <<EOF && enable symver_asm_label
|
| +void ff_foo(void) __asm__ ("av_foo@VERSION");
|
| +void ff_foo(void) { ${inline_asm+__asm__($quotes);} }
|
| +EOF
|
| + check_cc <<EOF && enable symver_gnu_asm
|
| +__asm__(".symver ff_foo,av_foo@VERSION");
|
| +void ff_foo(void) {}
|
| +EOF
|
| +fi
|
|
|
| if enabled small; then
|
| add_cflags $size_cflags
|
| @@ -2855,8 +2849,6 @@
|
| 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}"
|
|
|