Mercurial > mplayer.hg

comparison configure @ 33284:326bd394efab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: Handle X11 dependencies in the checks for dependent features. This makes each individual feature check self-contained, which is desirable.
author diego
date Thu, 05 May 2011 10:25:17 +0000
parents 7b18f6e6e11c
children de313ef61a85
comparison
equal deleted inserted replaced
33283:7b18f6e6e11c 33284:326bd394efab
4301 else 4301 else
4302 _x11=no 4302 _x11=no
4303 def_x11='#undef CONFIG_X11' 4303 def_x11='#undef CONFIG_X11'
4304 novomodules="x11 $novomodules" 4304 novomodules="x11 $novomodules"
4305 res_comment="check if the dev(el) packages are installed" 4305 res_comment="check if the dev(el) packages are installed"
4306 # disable stuff that depends on X
4307 _xv=no ; _xvmc=no ; _xinerama=no ; _vm=no ; _xf86keysym=no ; _vdpau=no
4308 fi 4306 fi
4309 echores "$_x11" 4307 echores "$_x11"
4310 4308
4311 echocheck "Xss screensaver extensions" 4309 echocheck "Xss screensaver extensions"
4312 if test "$_xss" = auto ; then 4310 if test "$_xss" = auto ; then
4350 echores "no" 4348 echores "no"
4351 fi 4349 fi
4352 4350
4353 4351
4354 echocheck "Xv" 4352 echocheck "Xv"
4355 if test "$_xv" = auto ; then 4353 if test "$_xv" = auto && test "$_x11" = yes ; then
4356 _xv=no 4354 _xv=no
4357 statement_check_broken X11/Xlib.h X11/extensions/Xvlib.h 'XvGetPortAttribute(0, 0, 0, 0)' -lXv && _xv=yes 4355 statement_check_broken X11/Xlib.h X11/extensions/Xvlib.h 'XvGetPortAttribute(0, 0, 0, 0)' -lXv && _xv=yes
4358 fi 4356 fi
4359 4357
4360 if test "$_xv" = yes ; then 4358 if test "$_xv" = yes ; then
4367 fi 4365 fi
4368 echores "$_xv" 4366 echores "$_xv"
4369 4367
4370 4368
4371 echocheck "XvMC" 4369 echocheck "XvMC"
4372 if test "$_xv" = yes && test "$_xvmc" != no ; then 4370 if test "$_xvmc" != no && test "$_xv" = yes ; then
4373 _xvmc=no 4371 _xvmc=no
4374 cat > $TMPC <<EOF 4372 cat > $TMPC <<EOF
4375 #include <X11/Xlib.h> 4373 #include <X11/Xlib.h>
4376 #include <X11/extensions/Xvlib.h> 4374 #include <X11/extensions/Xvlib.h>
4377 #include <X11/extensions/XvMClib.h> 4375 #include <X11/extensions/XvMClib.h>
4396 fi 4394 fi
4397 echores "$_xvmc" 4395 echores "$_xvmc"
4398 4396
4399 4397
4400 echocheck "VDPAU" 4398 echocheck "VDPAU"
4401 if test "$_vdpau" = auto ; then 4399 if test "$_vdpau" = auto && test "$_x11" = yes ; then
4402 _vdpau=no 4400 _vdpau=no
4403 if test "$_dl" = yes ; then 4401 if test "$_dl" = yes ; then
4404 return_statement_check vdpau/vdpau_x11.h 'vdp_device_create_x11(0, 0, 0, 0)' VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 -lvdpau && _vdpau=yes 4402 return_statement_check vdpau/vdpau_x11.h 'vdp_device_create_x11(0, 0, 0, 0)' VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 -lvdpau && _vdpau=yes
4405 fi 4403 fi
4406 fi 4404 fi
4416 fi 4414 fi
4417 echores "$_vdpau" 4415 echores "$_vdpau"
4418 4416
4419 4417
4420 echocheck "Xinerama" 4418 echocheck "Xinerama"
4421 if test "$_xinerama" = auto ; then 4419 if test "$_xinerama" = auto && test "$_x11" = yes ; then
4422 _xinerama=no 4420 _xinerama=no
4423 statement_check X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes 4421 statement_check X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes
4424 fi 4422 fi
4425 4423
4426 if test "$_xinerama" = yes ; then 4424 if test "$_xinerama" = yes ; then
4436 # needed for DGA, AFAIK every distribution packages together with DGA stuffs 4434 # needed for DGA, AFAIK every distribution packages together with DGA stuffs
4437 # named 'X extensions' or something similar. 4435 # named 'X extensions' or something similar.
4438 # This check may be useful for future mplayer versions (to change resolution) 4436 # This check may be useful for future mplayer versions (to change resolution)
4439 # If you run into problems, remove '-lXxf86vm'. 4437 # If you run into problems, remove '-lXxf86vm'.
4440 echocheck "Xxf86vm" 4438 echocheck "Xxf86vm"
4441 if test "$_vm" = auto ; then 4439 if test "$_vm" = auto && test "$_x11" = yes ; then
4442 _vm=no 4440 _vm=no
4443 statement_check_broken X11/Xlib.h X11/extensions/xf86vmode.h 'XF86VidModeQueryExtension(0, 0, 0)' -lXxf86vm && _vm=yes 4441 statement_check_broken X11/Xlib.h X11/extensions/xf86vmode.h 'XF86VidModeQueryExtension(0, 0, 0)' -lXxf86vm && _vm=yes
4444 fi 4442 fi
4445 if test "$_vm" = yes ; then 4443 if test "$_vm" = yes ; then
4446 def_vm='#define CONFIG_XF86VM 1' 4444 def_vm='#define CONFIG_XF86VM 1'
4453 # Check for the presence of special keycodes, like audio control buttons 4451 # Check for the presence of special keycodes, like audio control buttons
4454 # that XFree86 might have. Used to be bundled with the xf86vm check, but 4452 # that XFree86 might have. Used to be bundled with the xf86vm check, but
4455 # has nothing to do with xf86vm and XFree 3.x has xf86vm but does NOT 4453 # has nothing to do with xf86vm and XFree 3.x has xf86vm but does NOT
4456 # have these new keycodes. 4454 # have these new keycodes.
4457 echocheck "XF86keysym" 4455 echocheck "XF86keysym"
4458 if test "$_xf86keysym" = auto; then 4456 if test "$_xf86keysym" = auto && test "$_x11" = yes ; then
4459 _xf86keysym=no 4457 _xf86keysym=no
4460 return_check X11/XF86keysym.h XF86XK_AudioPause && _xf86keysym=yes 4458 return_check X11/XF86keysym.h XF86XK_AudioPause && _xf86keysym=yes
4461 fi 4459 fi
4462 if test "$_xf86keysym" = yes ; then 4460 if test "$_xf86keysym" = yes ; then
4463 def_xf86keysym='#define CONFIG_XF86XK 1' 4461 def_xf86keysym='#define CONFIG_XF86XK 1'