Mercurial > mplayer.hg

comparison configure @ 6701:522713337297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support for Xvid using their new api. If divx4 compatiblity is disabeled in xvid it can be used along with divx4.
author albeu
date Wed, 10 Jul 2002 20:56:57 +0000
parents a953bd2e49a2
children be17a987e0a1
comparison
equal deleted inserted replaced
6700:3b1be2b0fa55 6701:522713337297
3545 _def_zr='#undef HAVE_ZR' 3545 _def_zr='#undef HAVE_ZR'
3546 _novomodules="zr $_novomodules" 3546 _novomodules="zr $_novomodules"
3547 echores "$_zr" 3547 echores "$_zr"
3548 fi 3548 fi
3549 3549
3550 3550 echocheck "XviD"
3551 echocheck "XviD/DivX4linux/DivX5linux/OpenDivX decore" 3551 cat > $TMPC << EOF
3552 #include <xvid.h>
3553 int main(void) { xvid_init(0, 0, 0, 0); return 0; }
3554 EOF
3555 if test "$_xvid" != no && cc_check -lm "$_xvidcore" ; then
3556 _xvid=yes
3557 _ld_xvid="$_xvidcore"
3558 _def_xvid='#define HAVE_XVID 1'
3559 _codecmodules="xvid $_codecmodules"
3560 elif test "$_xvid" != no && cc_check -lm -lxvidcore ; then
3561 _xvid=yes
3562 _ld_xvid='-lxvidcore'
3563 _def_xvid='#define HAVE_XVID 1'
3564 _codecmodules="xvid $_codecmodules"
3565 else
3566 _xvid=no
3567 _ld_xvid=''
3568 _def_xvid='#undef HAVE_XVID'
3569 _nocodecmodules="xvid $_nocodecmodules"
3570 fi
3571 echores "$_xvid"
3572
3573 _xvidcompat=no
3574 _def_divx4_h='#undef HAVE_DIVX4_H'
3575 if test "$_xvid" = yes ; then
3576 echocheck "DivX4 compatibility in XviD"
3577 cat > $TMPC << EOF
3578 #include <divx4.h>
3579 int main(void) { (void) decore(0, 0, 0, 0); return 0; }
3580 EOF
3581 if cc_check -lm "$_ld_xvid" ; then
3582 _xvidcompat='yes (using divx4.h)'
3583 _def_divx4_h='#define HAVE_DIVX4_H 1'
3584 else
3585 cat > $TMPC << EOF
3586 #include <decore.h>
3587 int main(void) { (void) decore(0, 0, 0, 0); return 0; }
3588 EOF
3589 cc_check -lm "$_ld_xvid" && _xvidcompat='yes (using decore.h)'
3590 fi
3591 echores "$_xvidcompat"
3592 fi
3593
3594 if test "$_xvidcompat" != no ; then
3595 _divx4linux=no
3596 _opendivx=no
3597 _ld_decore=''
3598 _def_decore='#define NEW_DECORE 1'
3599 _def_divx='#define USE_DIVX 1'
3600 _def_divx5='#undef DECORE_DIVX5'
3601 _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
3602 _nocodecmodules="opendivx divx5linux divx4linux $_nocodecmodules"
3603 else
3604 echocheck "DivX4linux/DivX5linux/OpenDivX decore"
3552 # DivX5: DEC_OPT_MEMORY_REQS - DivX4: DEC_OPT_FRAME_311 3605 # DivX5: DEC_OPT_MEMORY_REQS - DivX4: DEC_OPT_FRAME_311
3553 cat > $TMPC << EOF 3606 cat > $TMPC << EOF
3554 #include <decore.h> 3607 #include <decore.h>
3555 int main(void) { (void) decore(0, 0, 0, 0); return DEC_OPT_FRAME_311; } 3608 int main(void) { (void) decore(0, 0, 0, 0); return DEC_OPT_FRAME_311; }
3556 EOF 3609 EOF
3557 if test "$_xvidcore" && cc_check -lm "$_xvidcore" ; then 3610 if test "$_divx4linux" != no && cc_check -lm -ldivxdecore -lm ; then
3558 _xvid=yes
3559 _divx4linux=no
3560 _opendivx=no
3561 _ld_decore="$_xvidcore"
3562 _def_decore='#define NEW_DECORE 1'
3563 _def_divx='#define USE_DIVX'
3564 _def_divx5='#undef DECORE_DIVX5'
3565 _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
3566 _codecmodules="xvid $_codecmodules"
3567 echores "XviD (with $_xvidcore)"
3568 elif test "$_xvid" != no && cc_check -lm -lxvidcore ; then
3569 _xvid=yes
3570 _divx4linux=no
3571 _opendivx=no
3572 _ld_decore='-lxvidcore'
3573 _def_decore='#define NEW_DECORE 1'
3574 _def_divx='#define USE_DIVX'
3575 _def_divx5='#undef DECORE_DIVX5'
3576 _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
3577 _codecmodules="xvid $_codecmodules"
3578 echores "XviD (with libxvidcore.so)"
3579 elif test "$_divx4linux" != no && cc_check -lm -ldivxdecore -lm ; then
3580 _xvid=no
3581 _divx4linux=yes 3611 _divx4linux=yes
3582 _opendivx=no 3612 _opendivx=no
3583 _ld_decore='-ldivxdecore' 3613 _ld_decore='-ldivxdecore'
3584 _def_decore='#define NEW_DECORE 1' 3614 _def_decore='#define NEW_DECORE 1'
3585 _def_divx='#define USE_DIVX' 3615 _def_divx='#define USE_DIVX'
3586 _def_divx5='#undef DECORE_DIVX5' 3616 _def_divx5='#undef DECORE_DIVX5'
3587 _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS' 3617 _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
3588 _codecmodules="divx4linux $_codecmodules" 3618 _codecmodules="divx4linux $_codecmodules"
3589 _nocodecmodules="xvid $_nocodecmodules"
3590 echores "DivX4linux (with libdivxdecore.so)" 3619 echores "DivX4linux (with libdivxdecore.so)"
3591 elif test "$_divx4linux" != no ; then 3620 elif test "$_divx4linux" != no ; then
3592 # DivX5 check 3621 # DivX5 check
3593 # OdivxPP disabled because of: 3622 # OdivxPP disabled because of:
3594 # ld: Warning: type of symbol `dering' changed from 1 to 2 in opendivx/postprocess.o 3623 # ld: Warning: type of symbol `dering' changed from 1 to 2 in opendivx/postprocess.o
3595 cat > $TMPC << EOF 3624 cat > $TMPC << EOF
3596 #include <decore.h> 3625 #include <decore.h>
3597 int main(void) { (void) decore(0, 0, 0, 0); return DEC_OPT_MEMORY_REQS; } 3626 int main(void) { (void) decore(0, 0, 0, 0); return DEC_OPT_MEMORY_REQS; }
3598 EOF 3627 EOF
3599 if cc_check -lm -ldivxdecore -lm ; then 3628 if cc_check -lm -ldivxdecore -lm ; then
3600 _xvid=no
3601 _divx4linux=yes 3629 _divx4linux=yes
3602 _opendivx=no 3630 _opendivx=no
3603 # _ld_decore='-ldivxdecore opendivx/postprocess.o' 3631 # _ld_decore='-ldivxdecore opendivx/postprocess.o'
3604 _ld_decore='-ldivxdecore' 3632 _ld_decore='-ldivxdecore'
3605 _def_decore='#define NEW_DECORE 1' 3633 _def_decore='#define NEW_DECORE 1'
3609 _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS' 3637 _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
3610 _codecmodules="divx5linux $_codecmodules" 3638 _codecmodules="divx5linux $_codecmodules"
3611 _nocodecmodules="divx4linux $_nocodecmodules" 3639 _nocodecmodules="divx4linux $_nocodecmodules"
3612 echores "DivX5linux (with libdivxdecore.so)" 3640 echores "DivX5linux (with libdivxdecore.so)"
3613 elif test "$_opendivx" != no ; then 3641 elif test "$_opendivx" != no ; then
3614 _xvid=no
3615 _divx4linux=no 3642 _divx4linux=no
3616 _opendivx=yes 3643 _opendivx=yes
3617 _ld_decore='-Lopendivx -ldecore' 3644 _ld_decore='-Lopendivx -ldecore'
3618 _def_decore='#undef NEW_DECORE' 3645 _def_decore='#undef NEW_DECORE'
3619 _def_divx='#define USE_DIVX' 3646 _def_divx='#define USE_DIVX'
3621 _def_odivx_postprocess='#define HAVE_ODIVX_POSTPROCESS 1' 3648 _def_odivx_postprocess='#define HAVE_ODIVX_POSTPROCESS 1'
3622 _codecmodules="opendivx $_codecmodules" 3649 _codecmodules="opendivx $_codecmodules"
3623 _nocodecmodules="divx5linux $_nocodecmodules" 3650 _nocodecmodules="divx5linux $_nocodecmodules"
3624 echores "OpenDivX" 3651 echores "OpenDivX"
3625 else 3652 else
3626 _xvid=no
3627 _divx4linux=no 3653 _divx4linux=no
3628 _opendivx=no 3654 _opendivx=no
3629 _ld_decore='' 3655 _ld_decore=''
3630 _def_decore='#undef NEW_DECORE' 3656 _def_decore='#undef NEW_DECORE'
3631 _def_divx='#undef USE_DIVX' 3657 _def_divx='#undef USE_DIVX'
3633 _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS' 3659 _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS'
3634 _nocodecmodules="opendivx $_nocodecmodules" 3660 _nocodecmodules="opendivx $_nocodecmodules"
3635 echores "no" 3661 echores "no"
3636 fi # DivX5 check 3662 fi # DivX5 check
3637 fi 3663 fi
3638 3664 fi # XviD divx4 compatiblity check
3639 3665
3640 # mencoder requires (optional) those libs: libmp3lame and divx4linux encore 3666 # mencoder requires (optional) those libs: libmp3lame and divx4linux encore
3641 if test "$_mencoder" != no ; then 3667 if test "$_mencoder" != no ; then
3642 3668
3643 echocheck "libmp3lame (for mencoder)" 3669 echocheck "libmp3lame (for mencoder)"
4108 MP1E_DEP = $_dep_mp1e 4134 MP1E_DEP = $_dep_mp1e
4109 MP1E_LIB = $_ld_mp1e 4135 MP1E_LIB = $_ld_mp1e
4110 ARCH_LIB = $_ld_arch $_ld_iconv 4136 ARCH_LIB = $_ld_arch $_ld_iconv
4111 DIVX4LINUX = $_divx4linux 4137 DIVX4LINUX = $_divx4linux
4112 XVID = $_xvid 4138 XVID = $_xvid
4139 XVID_LIB = $_ld_xvid
4113 DECORE_LIB = $_ld_decore 4140 DECORE_LIB = $_ld_decore
4114 MENCODER = $_mencoder 4141 MENCODER = $_mencoder
4115 ENCORE_LIB = $_ld_encore $_ld_mp3lame $_ld_libdv 4142 ENCORE_LIB = $_ld_encore $_ld_mp3lame $_ld_libdv
4116 DIRECTFB_INC = $_inc_directfb 4143 DIRECTFB_INC = $_inc_directfb
4117 DIRECTFB_LIB = $_ld_directfb 4144 DIRECTFB_LIB = $_ld_directfb
4200 /* You have to change DECORE_LIBS in config.mak too! */ 4227 /* You have to change DECORE_LIBS in config.mak too! */
4201 $_def_decore 4228 $_def_decore
4202 4229
4203 /* Define if you are using DivX5Linux Decore library */ 4230 /* Define if you are using DivX5Linux Decore library */
4204 $_def_divx5 4231 $_def_divx5
4232
4233 /* Define if you are using XviD library */
4234 $_def_xvid
4235
4236 /* Define if you have divx4.h in place of decore.h */
4237 $_def_divx4_h
4205 4238
4206 /* Define to include support for libdv-0.9.5 */ 4239 /* Define to include support for libdv-0.9.5 */
4207 $_def_libdv 4240 $_def_libdv
4208 4241
4209 /* If build mencoder */ 4242 /* If build mencoder */