Mercurial > mplayer.hg
comparison configure @ 29391:e69a1d754130
Bandaid compilation fix: Disable ivtv VIDIX driver until a proper test exists.
author | diego |
---|---|
date | Sun, 19 Jul 2009 21:24:45 +0000 |
parents | 80c32e67306c |
children | 039160a7054b |
comparison
equal
deleted
inserted
replaced
29390:80c32e67306c | 29391:e69a1d754130 |
---|---|
4520 echores "$_vidix" | 4520 echores "$_vidix" |
4521 | 4521 |
4522 if test "$_vidix" = yes ; then | 4522 if test "$_vidix" = yes ; then |
4523 def_vidix='#define CONFIG_VIDIX 1' | 4523 def_vidix='#define CONFIG_VIDIX 1' |
4524 _vomodules="cvidix $_vomodules" | 4524 _vomodules="cvidix $_vomodules" |
4525 test "$_vidix_drivers" || _vidix_drivers="cyberblade ivtv mach64 mga mga_crtc2 nvidia pm2 pm3 radeon rage128 s3 sh_veu sis unichrome" | 4525 # FIXME: ivtv driver temporarily disabled until we have a proper test |
4526 #test "$_vidix_drivers" || _vidix_drivers="cyberblade ivtv mach64 mga mga_crtc2 nvidia pm2 pm3 radeon rage128 s3 sh_veu sis unichrome" | |
4527 test "$_vidix_drivers" || _vidix_drivers="cyberblade mach64 mga mga_crtc2 nvidia pm2 pm3 radeon rage128 s3 sh_veu sis unichrome" | |
4526 | 4528 |
4527 # some vidix drivers are architecture and os specific, discard them elsewhere | 4529 # some vidix drivers are architecture and os specific, discard them elsewhere |
4528 x86 || _vidix_drivers=$(echo $_vidix_drivers | sed -e s/cyberblade// -e s/sis// -e s/unichrome// -e s/s3//) | 4530 x86 || _vidix_drivers=$(echo $_vidix_drivers | sed -e s/cyberblade// -e s/sis// -e s/unichrome// -e s/s3//) |
4529 (test $host_arch = "sh" && linux) || _vidix_drivers=$(echo $_vidix_drivers | sed s/sh_veu//) | 4531 (test $host_arch = "sh" && linux) || _vidix_drivers=$(echo $_vidix_drivers | sed s/sh_veu//) |
4530 | 4532 |