Mercurial > mplayer.hg

comparison configure @ 20723:18ba5bc68f40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove remnants of long-gone libfame.
author diego
date Mon, 06 Nov 2006 22:57:14 +0000
parents d3343db1d7ff
children 411880b516d4
comparison
equal deleted inserted replaced
20722:2edba6772316 20723:18ba5bc68f40
284 --disable-libavcodec_so disable shared libavcodec [autodetect] 284 --disable-libavcodec_so disable shared libavcodec [autodetect]
285 --disable-libavformat_so disable shared libavformat [autodetect] 285 --disable-libavformat_so disable shared libavformat [autodetect]
286 --disable-libpostproc_so disable shared libpostproc [autodetect] 286 --disable-libpostproc_so disable shared libpostproc [autodetect]
287 --disable-libavcodec_mpegaudio_hp disable high precision audio decoding 287 --disable-libavcodec_mpegaudio_hp disable high precision audio decoding
288 in libavcodec [enabled] 288 in libavcodec [enabled]
289 --enable-libfame enable libfame realtime encoder [autodetect]
290 --disable-tremor-internal disable internal Tremor [enabled] 289 --disable-tremor-internal disable internal Tremor [enabled]
291 --enable-tremor-low enable lower accuracy internal Tremor [disabled] 290 --enable-tremor-low enable lower accuracy internal Tremor [disabled]
292 --enable-tremor-external enable external Tremor [autodetect] 291 --enable-tremor-external enable external Tremor [autodetect]
293 --disable-libvorbis disable libvorbis support [autodetect] 292 --disable-libvorbis disable libvorbis support [autodetect]
294 --disable-speex disable Speex support [autodetect] 293 --disable-speex disable Speex support [autodetect]
1562 _libavformat=auto 1561 _libavformat=auto
1563 _libavformat_so=auto 1562 _libavformat_so=auto
1564 _libpostproc=auto 1563 _libpostproc=auto
1565 _libpostproc_so=auto 1564 _libpostproc_so=auto
1566 _libavcodec_mpegaudio_hp=yes 1565 _libavcodec_mpegaudio_hp=yes
1567 _libfame=auto
1568 _mencoder=yes 1566 _mencoder=yes
1569 _x11=auto 1567 _x11=auto
1570 _xshape=auto 1568 _xshape=auto
1571 _dga=auto # 1 2 no auto 1569 _dga=auto # 1 2 no auto
1572 _xv=auto 1570 _xv=auto
1957 --enable-libpostproc_so) _libpostproc_so=yes ;; 1955 --enable-libpostproc_so) _libpostproc_so=yes ;;
1958 --disable-libpostproc_so) _libpostproc_so=no ;; 1956 --disable-libpostproc_so) _libpostproc_so=no ;;
1959 --enable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=yes ;; 1957 --enable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=yes ;;
1960 --disable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=no ;; 1958 --disable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=no ;;
1961 1959
1962 --enable-libfame) _libfame=yes ;;
1963 --disable-libfame) _libfame=no ;;
1964 --enable-lirc) _lirc=yes ;; 1960 --enable-lirc) _lirc=yes ;;
1965 --disable-lirc) _lirc=no ;; 1961 --disable-lirc) _lirc=no ;;
1966 --enable-lircc) _lircc=yes ;; 1962 --enable-lircc) _lircc=yes ;;
1967 --disable-lircc) _lircc=no ;; 1963 --disable-lircc) _lircc=no ;;
1968 --enable-gui) _gui=yes ;; 1964 --enable-gui) _gui=yes ;;
4738 _noaomodules="ivtv $_noaomodules" 4734 _noaomodules="ivtv $_noaomodules"
4739 fi 4735 fi
4740 echores "$_ivtv" 4736 echores "$_ivtv"
4741 4737
4742 4738
4743 echocheck "libfame"
4744 if test "$_libfame" = auto ; then
4745 _libfame=no
4746 test "$_dxr2" = yes && _libfame=auto
4747 test "$_dxr3" = yes && _libfame=auto
4748 test "$_dvb" = yes && _libfame=auto
4749 fi
4750 if test "$_libfame" = auto ; then
4751 _libfame=no
4752 if test -d libfame && test -f libfame/fame.h ; then
4753 # disable libfame on Cygwin as porting makes no sense
4754 cygwin || _libfame=yes
4755 else
4756 _res_comment="no libfame dir"
4757 fi
4758 fi
4759 echores "$_libfame"
4760
4761 _def_libfame='#undef USE_LIBFAME'
4762 if test "$_libfame" = yes ; then
4763 _def_libfame='#define USE_LIBFAME 1'
4764 _ld_libfame='libfame/libfame.a'
4765 fi
4766
4767 4739
4768 ######### 4740 #########
4769 # AUDIO # 4741 # AUDIO #
4770 ######### 4742 #########
4771 4743
7421 EXTRALIBS = $_extra_libs 7393 EXTRALIBS = $_extra_libs
7422 EXTRA_LIB = $_ld_extra $_ld_live $_ld_vstream $_ld_network $_ld_enca \ 7394 EXTRA_LIB = $_ld_extra $_ld_live $_ld_vstream $_ld_network $_ld_enca \
7423 $_ld_static $_ld_zlib $_ld_termcap $_ld_lirc $_ld_lircc $_ld_win32 \ 7395 $_ld_static $_ld_zlib $_ld_termcap $_ld_lirc $_ld_lircc $_ld_win32 \
7424 $_ld_win32libs $_ld_lm $_ld_libC $_ld_fribidi $_ld_smb $_ld_gif \ 7396 $_ld_win32libs $_ld_lm $_ld_libC $_ld_fribidi $_ld_smb $_ld_gif \
7425 $_ld_libcdio $_ld_dvdread $_ld_dvdnav $_macosx_frameworks $_ld_cdparanoia \ 7397 $_ld_libcdio $_ld_dvdread $_ld_dvdnav $_macosx_frameworks $_ld_cdparanoia \
7426 $_ld_libfame $_ld_xvid $_ld_x264 $_ld_mp3lame $_ld_libdts $_ld_mad \ 7398 $_ld_xvid $_ld_x264 $_ld_mp3lame $_ld_libdts $_ld_mad \
7427 $_ld_vorbis $_ld_libdv $_ld_theora $_ld_faad $_ld_speex $_xmms_lib \ 7399 $_ld_vorbis $_ld_libdv $_ld_theora $_ld_faad $_ld_speex $_xmms_lib \
7428 $_toolame_lib $_twolame_lib $_ld_faac $_ld_musepack $_ld_liblzo $_ld_png \ 7400 $_toolame_lib $_twolame_lib $_ld_faac $_ld_musepack $_ld_liblzo $_ld_png \
7429 $_ld_jpeg $_ld_alsa $_ld_nut $_ld_arch $_ld_iconv $_ld_mlib 7401 $_ld_jpeg $_ld_alsa $_ld_nut $_ld_arch $_ld_iconv $_ld_mlib
7430 VO_LIBS = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \ 7402 VO_LIBS = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \
7431 $_ld_vesa $_ld_vidix_external $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm \ 7403 $_ld_vesa $_ld_vidix_external $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm \
7484 CONFIG_LIBAVFORMAT = $_libavformat 7456 CONFIG_LIBAVFORMAT = $_libavformat
7485 CONFIG_LIBAVFORMAT_SO = $_libavformat_so 7457 CONFIG_LIBAVFORMAT_SO = $_libavformat_so
7486 CONFIG_LIBPOSTPROC = $_libpostproc 7458 CONFIG_LIBPOSTPROC = $_libpostproc
7487 CONFIG_LIBPOSTPROC_SO = $_libpostproc_so 7459 CONFIG_LIBPOSTPROC_SO = $_libpostproc_so
7488 ZORAN = $_zr 7460 ZORAN = $_zr
7489 FAME = $_libfame
7490 LIBDV = $_libdv 7461 LIBDV = $_libdv
7491 XVID = $_xvid 7462 XVID = $_xvid
7492 XVID4 = $_xvid4 7463 XVID4 = $_xvid4
7493 X264 = $_x264 7464 X264 = $_x264
7494 LIBNUT = $_nut 7465 LIBNUT = $_nut
7906 /* Use codec libs included in mplayer CVS / source dist: */ 7877 /* Use codec libs included in mplayer CVS / source dist: */
7907 $_def_mp3lib 7878 $_def_mp3lib
7908 $_def_liba52 7879 $_def_liba52
7909 $_def_libdts 7880 $_def_libdts
7910 $_def_libmpeg2 7881 $_def_libmpeg2
7911
7912 /* Use libfame encoder filter */
7913 $_def_libfame
7914 7882
7915 /* XAnim DLL support */ 7883 /* XAnim DLL support */
7916 $_def_xanim 7884 $_def_xanim
7917 /* Default search path */ 7885 /* Default search path */
7918 $_def_xanim_path 7886 $_def_xanim_path