# HG changeset patch # User rfelker # Date 1013048995 0 # Node ID b3b2fc48b045bf3236bb535fed800ad18fbe548a # Parent aa349785b8d37684d5214b168b2128ea507f6ae3 finished making vesa optional diff -r aa349785b8d3 -r b3b2fc48b045 configure --- a/configure Thu Feb 07 02:21:39 2002 +0000 +++ b/configure Thu Feb 07 02:29:55 2002 +0000 @@ -1928,12 +1928,15 @@ if test "$_vesa" != no ; then echocheck "VESA support" if x86 && linux ; then + _def_vesa='#define HAVE_VESA 1' _vosrc="$_vosrc vo_vesa.c vesa_lvo.c" _vomodules="vesa $_vomodules" echores "yes" else + _def_vesa='#undef HAVE_VESA' echores "no (not supported on this OS/architecture)" fi +_def_vesa='#undef HAVE_VESA' fi @@ -3278,6 +3281,7 @@ $_def_dxr3 $_def_dvb $_def_svga +$_def_vesa $_def_xdpms $_def_aa diff -r aa349785b8d3 -r b3b2fc48b045 libvo/video_out.c --- a/libvo/video_out.c Thu Feb 07 02:21:39 2002 +0000 +++ b/libvo/video_out.c Thu Feb 07 02:29:55 2002 +0000 @@ -85,7 +85,7 @@ extern vo_functions_t video_out_aa; extern vo_functions_t video_out_mpegpes; extern vo_functions_t video_out_dxr3; -#ifdef TARGET_LINUX +#ifdef HAVE_VESA extern vo_functions_t video_out_vesa; #endif extern vo_functions_t video_out_directfb; @@ -154,7 +154,7 @@ &video_out_pgm, &video_out_md5, &video_out_mpegpes, -#if defined( ARCH_X86 ) && defined( TARGET_LINUX ) +#ifdef HAVE_VESA &video_out_vesa, #endif #ifdef HAVE_DIRECTFB