Mercurial > mplayer.hg

comparison configure @ 32654:85f0d7406e07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove forked internal libfaad2 copy. The FFmpeg AAC decoder is default now and surpasses libfaad2 in all regards, so there is no longer a reason to keep a forked library copy.
author diego
date Sat, 01 Jan 2011 14:27:41 +0000
parents 6eaa0d19ac10
children cccc340868f4
comparison
equal deleted inserted replaced
32653:5f92bf78a2c2 32654:85f0d7406e07
356 --enable-tremor enable external Tremor [autodetect] 356 --enable-tremor enable external Tremor [autodetect]
357 --disable-libvorbis disable libvorbis support [autodetect] 357 --disable-libvorbis disable libvorbis support [autodetect]
358 --disable-speex disable Speex support [autodetect] 358 --disable-speex disable Speex support [autodetect]
359 --disable-libgsm disable libgsm support [autodetect] 359 --disable-libgsm disable libgsm support [autodetect]
360 --enable-theora enable OggTheora libraries [autodetect] 360 --enable-theora enable OggTheora libraries [autodetect]
361 --enable-faad enable external FAAD2 (AAC) [autodetect] 361 --enable-faad enable FAAD2 (AAC) [autodetect]
362 --enable-faad-internal enable internal FAAD2 (AAC) [disabled]
363 --enable-faad-fixed enable fixed-point mode in internal FAAD2 [disabled]
364 --disable-faac disable support for FAAC (AAC encoder) [autodetect] 362 --disable-faac disable support for FAAC (AAC encoder) [autodetect]
365 --disable-faac-lavc disable support for FAAC in libavcodec [autodetect] 363 --disable-faac-lavc disable support for FAAC in libavcodec [autodetect]
366 --disable-ladspa disable LADSPA plugin support [autodetect] 364 --disable-ladspa disable LADSPA plugin support [autodetect]
367 --disable-libbs2b disable libbs2b audio filter support [autodetect] 365 --disable-libbs2b disable libbs2b audio filter support [autodetect]
368 --disable-libdv disable libdv 0.9.5 en/decoding support [autodetect] 366 --disable-libdv disable libdv 0.9.5 en/decoding support [autodetect]
667 _liba52=auto 665 _liba52=auto
668 _libdca=auto 666 _libdca=auto
669 _libmpeg2=auto 667 _libmpeg2=auto
670 _libmpeg2_internal=auto 668 _libmpeg2_internal=auto
671 _faad=auto 669 _faad=auto
672 _faad_internal=no
673 _faad_fixed=no
674 _faac=auto 670 _faac=auto
675 _faac_lavc=auto 671 _faac_lavc=auto
676 _ladspa=auto 672 _ladspa=auto
677 _libbs2b=auto 673 _libbs2b=auto
678 _xmms=no 674 _xmms=no
1074 --disable-libmpeg2-internal) _libmpeg2_internal=no ;; 1070 --disable-libmpeg2-internal) _libmpeg2_internal=no ;;
1075 --enable-musepack) _musepack=yes ;; 1071 --enable-musepack) _musepack=yes ;;
1076 --disable-musepack) _musepack=no ;; 1072 --disable-musepack) _musepack=no ;;
1077 --enable-faad) _faad=yes ;; 1073 --enable-faad) _faad=yes ;;
1078 --disable-faad) _faad=no ;; 1074 --disable-faad) _faad=no ;;
1079 --enable-faad-internal) _faad_internal=yes ;;
1080 --disable-faad-internal) _faad_internal=no ;;
1081 --enable-faad-fixed) _faad_fixed=yes ;;
1082 --disable-faad-fixed) _faad_fixed=no ;;
1083 --enable-faac) _faac=yes ;; 1075 --enable-faac) _faac=yes ;;
1084 --disable-faac) _faac=no ;; 1076 --disable-faac) _faac=no ;;
1085 --enable-faac-lavc) _faac_lavc=yes ;; 1077 --enable-faac-lavc) _faac_lavc=yes ;;
1086 --disable-faac-lavc) _faac_lavc=no ;; 1078 --disable-faac-lavc) _faac_lavc=no ;;
1087 --enable-ladspa) _ladspa=yes ;; 1079 --enable-ladspa) _ladspa=yes ;;
6628 res_comment="in FFmpeg: $_faac_lavc" 6620 res_comment="in FFmpeg: $_faac_lavc"
6629 echores "$_faac" 6621 echores "$_faac"
6630 6622
6631 6623
6632 echocheck "FAAD2 support" 6624 echocheck "FAAD2 support"
6633 if test "$_faad_internal" = auto ; then
6634 if cygwin ; then
6635 _faad_internal=no
6636 res_comment="does not compile on cygwin"
6637 elif x86_32 && test cc_vendor=gnu; then
6638 case $cc_version in
6639 3.1*|3.2) # ICE/insn with these versions
6640 _faad_internal=no
6641 res_comment="broken gcc"
6642 ;;
6643 *)
6644 _faad=yes
6645 _faad_internal=yes
6646 ;;
6647 esac
6648 else
6649 _faad=yes
6650 _faad_internal=yes
6651 fi
6652 fi
6653 if test "$_faad" = auto ; then 6625 if test "$_faad" = auto ; then
6626 _faad=no
6654 cat > $TMPC << EOF 6627 cat > $TMPC << EOF
6655 #include <faad.h> 6628 #include <faad.h>
6656 #ifndef FAAD_MIN_STREAMSIZE 6629 #ifndef FAAD_MIN_STREAMSIZE
6657 #error Too old version 6630 #error Too old version
6658 #endif 6631 #endif
6661 EOF 6634 EOF
6662 cc_check -lfaad $_ld_lm && _faad=yes 6635 cc_check -lfaad $_ld_lm && _faad=yes
6663 fi 6636 fi
6664 6637
6665 def_faad='#undef CONFIG_FAAD' 6638 def_faad='#undef CONFIG_FAAD'
6666 def_faad_internal="#undef CONFIG_FAAD_INTERNAL"
6667 if test "$_faad_internal" = yes ; then
6668 def_faad_internal="#define CONFIG_FAAD_INTERNAL 1"
6669 res_comment="internal floating-point"
6670 if test "$_faad_fixed" = yes ; then
6671 # The FIXED_POINT implementation of FAAD2 improves performance
6672 # on some platforms, especially for SBR files.
6673 cflags_faad_fixed="-DFIXED_POINT"
6674 res_comment="internal fixed-point"
6675 fi
6676 elif test "$_faad" = yes ; then
6677 extra_ldflags="$extra_ldflags -lfaad"
6678 fi
6679
6680 if test "$_faad" = yes ; then 6639 if test "$_faad" = yes ; then
6681 def_faad='#define CONFIG_FAAD 1' 6640 def_faad='#define CONFIG_FAAD 1'
6682 if test "$_faad_internal" = yes ; then 6641 extra_ldflags="$extra_ldflags -lfaad"
6683 codecmodules="faad2(internal) $codecmodules" 6642 codecmodules="faad2 $codecmodules"
6684 else 6643 else
6685 codecmodules="faad2 $codecmodules"
6686 fi
6687 else
6688 _faad=no
6689 nocodecmodules="faad2 $nocodecmodules" 6644 nocodecmodules="faad2 $nocodecmodules"
6690 fi 6645 fi
6691 echores "$_faad" 6646 echores "$_faad"
6692 6647
6693 6648
8024 CFLAGS = $WARNFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags 7979 CFLAGS = $WARNFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags
8025 CXXFLAGS = $WARNFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags 7980 CXXFLAGS = $WARNFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags
8026 CC_DEPFLAGS = $DEPFLAGS 7981 CC_DEPFLAGS = $DEPFLAGS
8027 7982
8028 CFLAGS_DHAHELPER = $cflags_dhahelper 7983 CFLAGS_DHAHELPER = $cflags_dhahelper
8029 CFLAGS_FAAD_FIXED = $cflags_faad_fixed
8030 CFLAGS_LIBDVDCSS = $cflags_libdvdcss 7984 CFLAGS_LIBDVDCSS = $cflags_libdvdcss
8031 CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread 7985 CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread
8032 CFLAGS_LIBDVDNAV = $cflags_libdvdnav 7986 CFLAGS_LIBDVDNAV = $cflags_libdvdnav
8033 CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer 7987 CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer
8034 CFLAGS_STACKREALIGN = $cflags_stackrealign 7988 CFLAGS_STACKREALIGN = $cflags_stackrealign
8093 DXR2 = $_dxr2 8047 DXR2 = $_dxr2
8094 DXR3 = $_dxr3 8048 DXR3 = $_dxr3
8095 ESD = $_esd 8049 ESD = $_esd
8096 FAAC=$_faac 8050 FAAC=$_faac
8097 FAAD = $_faad 8051 FAAD = $_faad
8098 FAAD_INTERNAL = $_faad_internal
8099 FASTMEMCPY = $_fastmemcpy 8052 FASTMEMCPY = $_fastmemcpy
8100 FBDEV = $_fbdev 8053 FBDEV = $_fbdev
8101 FREETYPE = $_freetype 8054 FREETYPE = $_freetype
8102 FTP = $_ftp 8055 FTP = $_ftp
8103 GIF = $_gif 8056 GIF = $_gif
8358 $def_fast_inttypes 8311 $def_fast_inttypes
8359 /* libdvdcss */ 8312 /* libdvdcss */
8360 #define HAVE_ERRNO_H 1 8313 #define HAVE_ERRNO_H 1
8361 /* libdvdcss + libdvdread */ 8314 /* libdvdcss + libdvdread */
8362 #define HAVE_LIMITS_H 1 8315 #define HAVE_LIMITS_H 1
8363 /* libdvdcss + libfaad2 */ 8316 /* libdvdcss */
8364 #define HAVE_UNISTD_H 1 8317 #define HAVE_UNISTD_H 1
8365 /* libfaad2 + libdvdread */ 8318 /* libdvdread */
8366 #define STDC_HEADERS 1 8319 #define STDC_HEADERS 1
8367 #define HAVE_MEMCPY 1 8320 #define HAVE_MEMCPY 1
8368 /* libfaad2 */
8369 #define HAVE_STDLIB_H 1
8370 #define HAVE_STRING_H 1
8371 #define HAVE_STRINGS_H 1
8372 #define HAVE_SYS_STAT_H 1
8373 #define HAVE_SYS_TYPES_H 1
8374 /* libdvdnav */ 8321 /* libdvdnav */
8375 #define READ_CACHE_TRACE 0 8322 #define READ_CACHE_TRACE 0
8376 /* libdvdread */ 8323 /* libdvdread */
8377 #define HAVE_DLFCN_H 1 8324 #define HAVE_DLFCN_H 1
8378 $def_dvdcss 8325 $def_dvdcss
8485 8432
8486 8433
8487 /* codec libraries */ 8434 /* codec libraries */
8488 $def_faac 8435 $def_faac
8489 $def_faad 8436 $def_faad
8490 $def_faad_internal
8491 $def_liba52 8437 $def_liba52
8492 $def_libdca 8438 $def_libdca
8493 $def_libdv 8439 $def_libdv
8494 $def_liblzo 8440 $def_liblzo
8495 $def_libmpeg2 8441 $def_libmpeg2