Mercurial > mplayer.hg

comparison configure @ 24288:f802a737f847

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make DGA 1 and DGA 2 separately selectable.
author diego
date Fri, 31 Aug 2007 13:08:13 +0000
parents 06dd2d1033ef
children b4e723b181b7
comparison
equal deleted inserted replaced
24287:6635801bbf1b 24288:f802a737f847
345 --disable-vidix-external disable external VIDIX [for x86 *nix] 345 --disable-vidix-external disable external VIDIX [for x86 *nix]
346 --with-vidix-drivers[=*] list of VIDIX drivers to be compiled in 346 --with-vidix-drivers[=*] list of VIDIX drivers to be compiled in
347 Available: cyberblade,ivtv,mach64,mga,mga_crtc2, 347 Available: cyberblade,ivtv,mach64,mga,mga_crtc2,
348 nvidia,pm2,pm3,radeon,rage128,savage,sis,unichrome 348 nvidia,pm2,pm3,radeon,rage128,savage,sis,unichrome
349 --enable-gl enable OpenGL video output [autodetect] 349 --enable-gl enable OpenGL video output [autodetect]
350 --enable-dga[=n] enable DGA [n in {1, 2} ] support [autodetect] 350 --enable-dga2 enable DGA 2 support [autodetect]
351 --enable-dga1 enable DGA 1 support [autodetect]
351 --enable-vesa enable VESA video output [autodetect] 352 --enable-vesa enable VESA video output [autodetect]
352 --enable-svga enable SVGAlib video output [autodetect] 353 --enable-svga enable SVGAlib video output [autodetect]
353 --enable-sdl enable SDL video output [autodetect] 354 --enable-sdl enable SDL video output [autodetect]
354 --enable-aa enable AAlib video output [autodetect] 355 --enable-aa enable AAlib video output [autodetect]
355 --enable-caca enable CACA video output [autodetect] 356 --enable-caca enable CACA video output [autodetect]
518 _libavcodec_mpegaudio_hp=yes 519 _libavcodec_mpegaudio_hp=yes
519 _mencoder=yes 520 _mencoder=yes
520 _mplayer=yes 521 _mplayer=yes
521 _x11=auto 522 _x11=auto
522 _xshape=auto 523 _xshape=auto
523 _dga=auto # 1 2 no auto 524 _dga1=auto
525 _dga2=auto
524 _xv=auto 526 _xv=auto
525 _xvmc=no #auto when complete 527 _xvmc=no #auto when complete
526 _sdl=auto 528 _sdl=auto
527 _directx=auto 529 _directx=auto
528 _win32waveout=auto 530 _win32waveout=auto
1118 --disable-inet6) _inet6=no ;; 1120 --disable-inet6) _inet6=no ;;
1119 1121
1120 --enable-gethostbyname2) _gethostbyname2=yes ;; 1122 --enable-gethostbyname2) _gethostbyname2=yes ;;
1121 --disable-gethostbyname2) _gethostbyname2=no ;; 1123 --disable-gethostbyname2) _gethostbyname2=no ;;
1122 1124
1123 --enable-dga) _dga=auto ;; # as we don't know if it's 1 or 2 1125 --enable-dga1) _dga1=yes ;;
1124 --enable-dga=*) _dga=`echo $ac_option | cut -d '=' -f 2` ;; 1126 --disable-dga1) _dga1=no ;;
1125 --disable-dga) _dga=no ;; 1127 --enable-dga2) _dga2=yes ;;
1128 --disable-dga2) _dga2=no ;;
1126 1129
1127 --enable-menu) _menu=yes ;; 1130 --enable-menu) _menu=yes ;;
1128 --disable-menu) _menu=no ;; 1131 --disable-menu) _menu=no ;;
1129 1132
1130 --enable-qtx) _qtx=yes ;; 1133 --enable-qtx) _qtx=yes ;;
3888 _x11=no 3891 _x11=no
3889 _def_x11='#undef HAVE_X11' 3892 _def_x11='#undef HAVE_X11'
3890 _novomodules="x11 $_novomodules" 3893 _novomodules="x11 $_novomodules"
3891 _res_comment="check if the dev(el) packages are installed" 3894 _res_comment="check if the dev(el) packages are installed"
3892 # disable stuff that depends on X 3895 # disable stuff that depends on X
3893 _xv=no ; _xvmc=no ; _xinerama=no ; _vm=no ; _xf86keysym=no ; _dga=no 3896 _xv=no ; _xvmc=no ; _xinerama=no ; _vm=no ; _xf86keysym=no
3894 fi 3897 fi
3895 echores "$_x11" 3898 echores "$_x11"
3896 3899
3897 3900
3898 echocheck "DPMS" 3901 echocheck "DPMS"
4053 _def_xf86keysym='#undef HAVE_XF86XK' 4056 _def_xf86keysym='#undef HAVE_XF86XK'
4054 fi 4057 fi
4055 echores "$_xf86keysym" 4058 echores "$_xf86keysym"
4056 4059
4057 echocheck "DGA" 4060 echocheck "DGA"
4058 # Version 2 is preferred to version 1 if available 4061 if test "$_dga2" = auto && test "$_x11" = yes ; then
4059 if test "$_dga" = auto ; then 4062 cat > $TMPC << EOF
4063 #include <X11/Xlib.h>
4064 #include <X11/extensions/xf86dga.h>
4065 int main (void) { (void) XDGASetViewport(0, 0, 0, 0, 0); return 0; }
4066 EOF
4067 _dga2=no
4068 cc_check -lXxf86dga && _dga2=yes
4069 fi
4070 if test "$_dga1" = auto && test "$_dga2" = no && test "$_vm" = yes ; then
4060 cat > $TMPC << EOF 4071 cat > $TMPC << EOF
4061 #include <X11/Xlib.h> 4072 #include <X11/Xlib.h>
4062 #include <X11/extensions/xf86dga.h> 4073 #include <X11/extensions/xf86dga.h>
4063 int main (void) { (void) XF86DGASetViewPort(0, 0, 0, 0); return 0; } 4074 int main (void) { (void) XF86DGASetViewPort(0, 0, 0, 0); return 0; }
4064 EOF 4075 EOF
4065 _dga=no 4076 _dga1=no
4066 cc_check -lXxf86dga -lXxf86vm && _dga=1 4077 cc_check -lXxf86dga -lXxf86vm && _dga1=yes
4067 4078 fi
4068 cat > $TMPC << EOF 4079
4069 #include <X11/Xlib.h> 4080 _dga=no
4070 #include <X11/extensions/xf86dga.h>
4071 int main (void) { (void) XDGASetViewport(0, 0, 0, 0, 0); return 0; }
4072 EOF
4073 cc_check -lXxf86dga && _dga=2
4074 fi
4075
4076 _def_dga='#undef HAVE_DGA' 4081 _def_dga='#undef HAVE_DGA'
4082 _def_dga1='#undef HAVE_DGA1'
4077 _def_dga2='#undef HAVE_DGA2' 4083 _def_dga2='#undef HAVE_DGA2'
4078 if test "$_dga" = 1 ; then 4084 if test "$_dga1" = yes ; then
4085 _dga=yes
4086 _def_dga1='#define HAVE_DGA1 1'
4087 _res_comment="using DGA 1.0"
4088 elif test "$_dga2" = yes ; then
4089 _dga=yes
4090 _def_dga2='#define HAVE_DGA2 1'
4091 _res_comment="using DGA 2.0"
4092 fi
4093 if test "$_dga" = yes ; then
4079 _def_dga='#define HAVE_DGA 1' 4094 _def_dga='#define HAVE_DGA 1'
4080 _libs_mplayer="$_libs_mplayer -lXxf86dga" 4095 _libs_mplayer="$_libs_mplayer -lXxf86dga"
4081 _vosrc="$_vosrc vo_dga.c" 4096 _vosrc="$_vosrc vo_dga.c"
4082 _vomodules="dga $_vomodules" 4097 _vomodules="dga $_vomodules"
4083 _res_comment="using DGA 1.0" 4098 else
4084 elif test "$_dga" = 2 ; then
4085 _def_dga='#define HAVE_DGA 1'
4086 _def_dga2='#define HAVE_DGA2 1'
4087 _libs_mplayer="$_libs_mplayer -lXxf86dga"
4088 _vosrc="$_vosrc vo_dga.c"
4089 _vomodules="dga $_vomodules"
4090 _res_comment="using DGA 2.0"
4091 elif test "$_dga" = no ; then
4092 _novomodules="dga $_novomodules" 4099 _novomodules="dga $_novomodules"
4093 else
4094 die "DGA version must be 1 or 2"
4095 fi 4100 fi
4096 echores "$_dga" 4101 echores "$_dga"
4097 4102
4098 4103
4099 echocheck "OpenGL" 4104 echocheck "OpenGL"
8374 $_def_xf86keysym 8379 $_def_xf86keysym
8375 $_def_xinerama 8380 $_def_xinerama
8376 $_def_gl 8381 $_def_gl
8377 $_def_gl_win32 8382 $_def_gl_win32
8378 $_def_dga 8383 $_def_dga
8384 $_def_dga1
8379 $_def_dga2 8385 $_def_dga2
8380 $_def_sdl 8386 $_def_sdl
8381 /* defined for SDLlib with keyrepeat bugs (before 1.2.1) */ 8387 /* defined for SDLlib with keyrepeat bugs (before 1.2.1) */
8382 $_def_sdlbuggy 8388 $_def_sdlbuggy
8383 $_def_directx 8389 $_def_directx