# HG changeset patch
# User diego
# Date 1228315711 0
# Node ID 7df791e22c3f2bfde55c218ed915c8fe5ef15e9f
# Parent  d55bae757b4e4e0527974c1153709bbac59f86bd
Treat video output objects the same as everything else in the build system,
i.e. have lines that conditionally enable each in the Makefile and
corresponding variables set from configure.

diff -r d55bae757b4e -r 7df791e22c3f Makefile
--- a/Makefile	Wed Dec 03 14:39:45 2008 +0000
+++ b/Makefile	Wed Dec 03 14:48:31 2008 +0000
@@ -519,18 +519,32 @@
                libvo/video_out.c \
                libvo/vo_mpegpes.c \
                libvo/vo_null.c \
-               $(addprefix libvo/,$(VO_SRCS)) \
 
+SRCS_MPLAYER-$(3DFX)         += libvo/vo_3dfx.c
+SRCS_MPLAYER-$(AA)           += libvo/vo_aa.c
 SRCS_MPLAYER-$(ALSA1X)       += libao2/ao_alsa.c
 SRCS_MPLAYER-$(ALSA5)        += libao2/ao_alsa5.c
 SRCS_MPLAYER-$(ALSA9)        += libao2/ao_alsa.c
 SRCS_MPLAYER-$(APPLE_IR)     += input/appleir.c
 SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
 SRCS_MPLAYER-$(ARTS)         += libao2/ao_arts.c
+SRCS_MPLAYER-$(BL)           += libvo/vo_bl.c
+SRCS_MPLAYER-$(CACA)         += libvo/vo_caca.c
 SRCS_MPLAYER-$(COREAUDIO)    += libao2/ao_macosx.c
-SRCS_MPLAYER-$(DIRECTX)      += libao2/ao_dsound.c
-SRCS_MPLAYER-$(DXR2)         += libao2/ao_dxr2.c
+SRCS_MPLAYER-$(COREVIDEO)    += libvo/vo_macosx.m
+SRCS_MPLAYER-$(DFBMGA)       += libvo/vo_dfbmga.c
+SRCS_MPLAYER-$(DGA)          += libvo/vo_dga.c
+SRCS_MPLAYER-$(DIRECT3D)     += libvo/vo_direct3d.c libvo/w32_common.c
+SRCS_MPLAYER-$(DIRECTFB)     += libvo/vo_directfb2.c
+SRCS_MPLAYER-$(DIRECTX)      += libao2/ao_dsound.c libvo/vo_directx.c
+SRCS_MPLAYER-$(DXR2)         += libao2/ao_dxr2.c libvo/vo_dxr2.c
+SRCS_MPLAYER-$(DXR3)         += libvo/vo_dxr3.c
 SRCS_MPLAYER-$(ESD)          += libao2/ao_esd.c
+SRCS_MPLAYER-$(FBDEV)        += libvo/vo_fbdev.c libvo/vo_fbdev2.c
+SRCS_MPLAYER-$(GGI)          += libvo/vo_ggi.c
+SRCS_MPLAYER-$(GIF)          += libvo/vo_gif89a.c
+SRCS_MPLAYER-$(GL)           += libvo/gl_common.c libvo/vo_gl.c libvo/vo_gl2.c
+SRCS_MPLAYER-$(GL_WIN32)     += libvo/w32_common.c
 SRCS_MPLAYER-$(GUI)          += gui/bitmap.c
 SRCS_MPLAYER-$(GUI_GTK)      += gui/app.c \
                                 gui/cfg.c \
@@ -567,9 +581,10 @@
                                 gui/win32/widgetrender.c \
                                 gui/win32/wincfg.c \
 
-SRCS_MPLAYER-$(IVTV)         += libao2/ao_ivtv.c
+SRCS_MPLAYER-$(IVTV)         += libao2/ao_ivtv.c libvo/vo_ivtv.c
 SRCS_MPLAYER-$(JACK)         += libao2/ao_jack.c
 SRCS_MPLAYER-$(JOYSTICK)     += input/joystick.c
+SRCS_MPLAYER-$(JPEG)         += libvo/vo_jpeg.c
 SRCS_MPLAYER-$(LIBMENU)      += libmenu/menu.c \
                                 libmenu/menu_chapsel.c \
                                 libmenu/menu_cmdlist.c  \
@@ -583,15 +598,28 @@
 
 SRCS_MPLAYER-$(LIBMENU_DVBIN) += libmenu/menu_dvbin.c
 SRCS_MPLAYER-$(LIRC)          += input/lirc.c
+SRCS_MPLAYER-$(MD5SUM)        += libvo/vo_md5sum.c
+SRCS_MPLAYER-$(MGA)           += libvo/vo_mga.c
 SRCS_MPLAYER-$(NAS)           += libao2/ao_nas.c
 SRCS_MPLAYER-$(OPENAL)        += libao2/ao_openal.c
 SRCS_MPLAYER-$(OSS)           += libao2/ao_oss.c
+SRCS_MPLAYER-$(PNG)           += libvo/vo_png.c
+SRCS_MPLAYER-$(PNM)           += libvo/vo_pnm.c
 SRCS_MPLAYER-$(PULSE)         += libao2/ao_pulse.c
-SRCS_MPLAYER-$(SDL)           += libao2/ao_sdl.c
+SRCS_MPLAYER-$(QUARTZ)        += libvo/vo_quartz.c
+SRCS_MPLAYER-$(S3FB)          += libvo/vo_s3fb.c
+SRCS_MPLAYER-$(SDL)           += libao2/ao_sdl.c libvo/vo_sdl.c
 SRCS_MPLAYER-$(SGIAUDIO)      += libao2/ao_sgi.c
 SRCS_MPLAYER-$(SUNAUDIO)      += libao2/ao_sun.c
+SRCS_MPLAYER-$(SVGA)          += libvo/vo_svga.c
+SRCS_MPLAYER-$(TDFXFB)        += libvo/vo_tdfxfb.c
+SRCS_MPLAYER-$(TDFXVID)       += libvo/vo_tdfx_vid.c
+SRCS_MPLAYER-$(TGA)           += libvo/vo_tga.c
+SRCS_MPLAYER-$(V4L2)          += libvo/vo_v4l2.c
 SRCS_MPLAYER-$(V4L2)          += libao2/ao_v4l2.c
-SRCS_MPLAYER-$(VIDIX)         += libvo/vosub_vidix.c \
+SRCS_MPLAYER-$(VESA)          += libvo/gtf.c libvo/vo_vesa.c libvo/vesa_lvo.c
+SRCS_MPLAYER-$(VIDIX)         += libvo/vo_cvidix.c \
+                                 libvo/vosub_vidix.c \
                                  vidix/vidix.c \
                                  vidix/drivers.c \
                                  vidix/dha.c \
@@ -614,7 +642,17 @@
 SRCS_MPLAYER-$(VIDIX_SH_VEU)        += vidix/sh_veu_vid.c
 SRCS_MPLAYER-$(VIDIX_SIS)           += vidix/sis_vid.c vidix/sis_bridge.c
 SRCS_MPLAYER-$(VIDIX_UNICHROME)     += vidix/unichrome_vid.c
+SRCS_MPLAYER-$(WII)           += libvo/vo_wii.c
 SRCS_MPLAYER-$(WIN32WAVEOUT)  += libao2/ao_win32.c
+SRCS_MPLAYER-$(WINVIDIX)      += libvo/vo_winvidix.c
+SRCS_MPLAYER-$(X11)           += libvo/vo_x11.c libvo/vo_xover.c libvo/x11_common.c
+SRCS_MPLAYER-$(XMGA)          += libvo/vo_xmga.c
+SRCS_MPLAYER-$(XV)            += libvo/vo_xv.c
+SRCS_MPLAYER-$(XVIDIX)        += libvo/vo_xvidix.c
+SRCS_MPLAYER-$(XVMC)          += libvo/vo_xvmc.c
+SRCS_MPLAYER-$(XVR100)        += libvo/vo_xvr100.c
+SRCS_MPLAYER-$(YUV4MPEG)      += libvo/vo_yuv4mpeg.c
+SRCS_MPLAYER-$(ZR)            += libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.c
 
 SRCS_MENCODER = mencoder.c \
                 mp_msg-mencoder.c \
diff -r d55bae757b4e -r 7df791e22c3f configure
--- a/configure	Wed Dec 03 14:39:45 2008 +0000
+++ b/configure	Wed Dec 03 14:48:31 2008 +0000
@@ -3633,7 +3633,6 @@
     _ld_extra="$_ld_extra -framework Carbon -framework QuickTime"
     _quartz=yes
     _def_quartz='#define CONFIG_QUARTZ 1'
-    _vosrc="$_vosrc vo_quartz.c"
     _vomodules="quartz $_vomodules"
     _def_quicktime='#define CONFIG_QUICKTIME 1'
   else
@@ -3648,7 +3647,6 @@
 int main(void) { return 0; }
 EOF
 	if cc_check -framework Carbon -framework QuartzCore -framework OpenGL; then
-		_vosrc="$_vosrc vo_macosx.m"
 		_vomodules="macosx $_vomodules"
 		_ld_extra="$_ld_extra -framework Cocoa -framework QuartzCore -framework OpenGL"
 		_def_corevideo='#define CONFIG_COREVIDEO 1'
@@ -3796,7 +3794,6 @@
 echocheck "tdfxfb"
 if test "$_tdfxfb" = yes ; then
   _def_tdfxfb='#define CONFIG_TDFXFB 1'
-  _vosrc="$_vosrc vo_tdfxfb.c"
   _vomodules="tdfxfb $_vomodules"
 else
   _def_tdfxfb='#undef CONFIG_TDFXFB'
@@ -3807,7 +3804,6 @@
 echocheck "s3fb"
 if test "$_s3fb" = yes ; then
   _def_s3fb='#define CONFIG_S3FB 1'
-  _vosrc="$_vosrc vo_s3fb.c"
   _vomodules="s3fb $_vomodules"
 else
   _def_s3fb='#undef CONFIG_S3FB'
@@ -3818,7 +3814,6 @@
 echocheck "wii"
 if test "$_wii" = yes ; then
   _def_wii='#define CONFIG_WII 1'
-  _vosrc="$_vosrc vo_wii.c"
   _vomodules="wii $_vomodules"
 else
   _def_wii='#undef CONFIG_WII'
@@ -3829,7 +3824,6 @@
 echocheck "tdfxvid"
 if test "$_tdfxvid" = yes ; then
   _def_tdfxvid='#define CONFIG_TDFX_VID 1'
-  _vosrc="$_vosrc vo_tdfx_vid.c"
   _vomodules="tdfx_vid $_vomodules"
 else
   _def_tdfxvid='#undef CONFIG_TDFX_VID'
@@ -3856,7 +3850,6 @@
 fi
 if test "$_xvr100" = yes ; then
   _def_xvr100='#define CONFIG_XVR100 1'
-  _vosrc="$_vosrc vo_xvr100.c"
   _vomodules="xvr100 $_vomodules"
 else
   _def_tdfxvid='#undef CONFIG_XVR100'
@@ -3867,7 +3860,6 @@
 echocheck "tga"
 if test "$_tga" = yes ; then
   _def_tga='#define CONFIG_TGA 1'
-  _vosrc="$_vosrc vo_tga.c"
   _vomodules="tga $_vomodules"
 else
   _def_tga='#undef CONFIG_TGA'
@@ -3879,7 +3871,6 @@
 echocheck "md5sum support"
 if test "$_md5sum" = yes; then
   _def_md5sum="#define CONFIG_MD5SUM"
-  _vosrc="$_vosrc vo_md5sum.c"
   _vomodules="md5sum $_vomodules"
 else
   _def_md5sum="#undef CONFIG_MD5SUM"
@@ -3891,7 +3882,6 @@
 echocheck "yuv4mpeg support"
 if test "$_yuv4mpeg" = yes; then
   _def_yuv4mpeg="#define CONFIG_YUV4MPEG"
-  _vosrc="$_vosrc vo_yuv4mpeg.c"
   _vomodules="yuv4mpeg $_vomodules"
 else
   _def_yuv4mpeg="#undef CONFIG_YUV4MPEG"
@@ -3903,7 +3893,6 @@
 echocheck "bl"
 if test "$_bl" = yes ; then
   _def_bl='#define CONFIG_BL 1'
-  _vosrc="$_vosrc vo_bl.c"
   _vomodules="bl $_vomodules"
 else
   _def_bl='#undef CONFIG_BL'
@@ -3961,7 +3950,6 @@
 
 if test "$_directfb" = yes ; then
   _def_directfb='#define CONFIG_DIRECTFB 1'
-  _vosrc="$_vosrc vo_directfb2.c"
   _vomodules="directfb $_vomodules"
   _libs_mplayer="$_libs_mplayer -ldirectfb"
 else
@@ -3969,7 +3957,6 @@
   _novomodules="directfb $_novomodules"
 fi
 if test "$_dfbmga" = yes; then
-  _vosrc="$_vosrc vo_dfbmga.c"
   _vomodules="dfbmga $_vomodules"
   _def_dfbmga='#define CONFIG_DFBMGA 1'
 else
@@ -4021,7 +4008,6 @@
 fi
 if test "$_x11" = yes ; then
   _def_x11='#define CONFIG_X11 1'
-  _vosrc="$_vosrc x11_common.c vo_x11.c vo_xover.c"
   _vomodules="x11 xover $_vomodules"
 else
   _x11=no
@@ -4103,7 +4089,6 @@
 if test "$_xv" = yes ; then
   _def_xv='#define CONFIG_XV 1'
   _libs_mplayer="$_libs_mplayer -lXv"
-  _vosrc="$_vosrc vo_xv.c"
   _vomodules="xv $_vomodules"
 else
   _def_xv='#undef CONFIG_XV'
@@ -4131,7 +4116,6 @@
 if test "$_xvmc" = yes ; then
   _def_xvmc='#define HAVE_XVMC 1'
   _libs_mplayer="$_libs_mplayer -lXvMC -l$_xvmclib"
-  _vosrc="$_vosrc vo_xvmc.c"
   _vomodules="xvmc $_vomodules"
   _res_comment="using $_xvmclib"
 else
@@ -4242,7 +4226,6 @@
 if test "$_dga" = yes ; then
   _def_dga='#define CONFIG_DGA 1'
   _libs_mplayer="$_libs_mplayer -lXxf86dga"
-  _vosrc="$_vosrc vo_dga.c"
   _vomodules="dga $_vomodules"
 else
   _novomodules="dga $_novomodules"
@@ -4253,7 +4236,6 @@
 echocheck "3dfx"
 if test "$_3dfx" = yes && test "$_dga" = yes ; then
   _def_3dfx='#define CONFIG_3DFX 1'
-  _vosrc="$_vosrc vo_3dfx.c"
   _vomodules="3dfx $_vomodules"
 else
   _def_3dfx='#undef CONFIG_3DFX'
@@ -4302,10 +4284,8 @@
 fi
 if test "$_gl" = yes ; then
   _def_gl='#define CONFIG_GL 1'
-  _vosrc="$_vosrc vo_gl.c vo_gl2.c gl_common.c"
   if test "$_gl_win32" = yes ; then
     _def_gl_win32='#define GL_WIN32 1'
-    _vosrc="$_vosrc w32_common.c"
     _res_comment="win32 version"
   fi
   _vomodules="opengl $_vomodules"
@@ -4359,7 +4339,6 @@
 
 if test "$_vidix" = yes ; then
   _def_vidix='#define CONFIG_VIDIX 1'
-  _vosrc="$_vosrc vo_cvidix.c"
   _vomodules="cvidix $_vomodules"
   test "$_vidix_drivers" || _vidix_drivers="cyberblade ivtv mach64 mga mga_crtc2 nvidia pm2 pm3 radeon rage128 s3 sh_veu sis unichrome"
   test $_ivtv = "yes" || _vidix_drivers=`echo $_vidix_drivers | sed s/ivtv//`
@@ -4395,14 +4374,14 @@
 fi
 
 if test "$_vidix" = yes && win32; then
-  _vosrc="$_vosrc vo_winvidix.c"
+  winvidix=yes
   _vomodules="winvidix $_vomodules"
   _libs_mplayer="$_libs_mplayer -lgdi32"
 else
   _novomodules="winvidix $_novomodules"
 fi
 if test "$_vidix" = yes && test "$_x11" = yes; then
-  _vosrc="$_vosrc vo_xvidix.c"
+  xvidix=yes
   _vomodules="xvidix $_vomodules"
 else
   _novomodules="xvidix $_novomodules"
@@ -4415,7 +4394,6 @@
 fi
 if test "$_mga" = yes ; then
   _def_mga='#define CONFIG_MGA 1'
-  _vosrc="$_vosrc vo_mga.c"
   _vomodules="mga $_vomodules"
 else
   _def_mga='#undef CONFIG_MGA'
@@ -4431,7 +4409,6 @@
 fi
 if test "$_xmga" = yes ; then
   _def_xmga='#define CONFIG_XMGA 1'
-  _vosrc="$_vosrc vo_xmga.c"
   _vomodules="xmga $_vomodules"
 else
   _def_xmga='#undef CONFIG_XMGA'
@@ -4452,7 +4429,6 @@
 if test "$_ggi" = yes ; then
   _def_ggi='#define CONFIG_GGI 1'
   _libs_mplayer="$_libs_mplayer -lggi"
-  _vosrc="$_vosrc vo_ggi.c"
   _vomodules="ggi $_vomodules"
 else
   _def_ggi='#undef CONFIG_GGI'
@@ -4507,7 +4483,6 @@
   if cygwin ; then
     _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`"
   fi
-  _vosrc="$_vosrc vo_aa.c"
   _vomodules="aa $_vomodules"
 else
   _def_aa='#undef CONFIG_AA'
@@ -4534,7 +4509,6 @@
   _def_caca='#define CONFIG_CACA 1'
   _inc_extra="$_inc_extra `caca-config --cflags`"
   _libs_mplayer="$_libs_mplayer `caca-config --libs`"
-  _vosrc="$_vosrc vo_caca.c"
   _vomodules="caca $_vomodules"
 else
   _def_caca='#undef CONFIG_CACA'
@@ -4555,7 +4529,6 @@
 if test "$_svga" = yes ; then
   _def_svga='#define CONFIG_SVGALIB 1'
   _libs_mplayer="$_libs_mplayer -lvga"
-  _vosrc="$_vosrc vo_svga.c"
   _vomodules="svga $_vomodules"
 else
   _def_svga='#undef CONFIG_SVGALIB'
@@ -4571,7 +4544,6 @@
 fi
 if test "$_fbdev" = yes ; then
   _def_fbdev='#define CONFIG_FBDEV 1'
-  _vosrc="$_vosrc vo_fbdev.c vo_fbdev2.c"
   _vomodules="fbdev $_vomodules"
 else
   _def_fbdev='#undef CONFIG_FBDEV'
@@ -4689,7 +4661,6 @@
 if test "$_png" = yes ; then
   _def_png='#define CONFIG_PNG 1'
   _ld_extra="$_ld_extra -lpng -lz"
-  _vosrc="$_vosrc vo_png.c"
   _vomodules="png $_vomodules"
 else
   _def_png='#undef CONFIG_PNG'
@@ -4739,7 +4710,6 @@
 
 if test "$_jpeg" = yes ; then
   _def_jpeg='#define CONFIG_JPEG 1'
-  _vosrc="$_vosrc vo_jpeg.c"
   _vomodules="jpeg $_vomodules"
   _ld_extra="$_ld_extra -ljpeg"
 else
@@ -4752,7 +4722,6 @@
 echocheck "PNM support"
 if test "$_pnm" = yes; then
   _def_pnm="#define CONFIG_PNM 1"
-  _vosrc="$_vosrc vo_pnm.c"
   _vomodules="pnm $_vomodules"
 else
   _def_pnm="#undef CONFIG_PNM"
@@ -4798,7 +4767,6 @@
 
 if test "$_gif" = yes ; then
   _def_gif='#define CONFIG_GIF 1'
-  _vosrc="$_vosrc vo_gif89a.c"
   _codecmodules="gif $_codecmodules"
   _vomodules="gif89a $_vomodules"
   _res_comment="old version, some encoding functions disabled"
@@ -4863,7 +4831,6 @@
 if test "$_vesa" = yes ; then
   _def_vesa='#define CONFIG_VESA 1'
   _libs_mplayer="$_libs_mplayer -lvbe -llrmi"
-  _vosrc="$_vosrc vo_vesa.c vesa_lvo.c gtf.c"
   _vomodules="vesa $_vomodules"
 else
   _def_vesa='#undef CONFIG_VESA'
@@ -4921,7 +4888,6 @@
     _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs`"
     _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//`"
   fi
-  _vosrc="$_vosrc vo_sdl.c"
   _vomodules="sdl $_vomodules"
   _aomodules="sdl $_aomodules"
   _res_comment="using $_sdlconfig"
@@ -4968,7 +4934,6 @@
 if test "$_direct3d" = yes ; then
   _def_direct3d='#define CONFIG_DIRECT3D 1'
   _libs_mplayer="$_libs_mplayer -ld3d9"
-  _vosrc="$_vosrc vo_direct3d.c w32_common.c"
   _vomodules="direct3d $_vomodules"
 else
   _def_direct3d='#undef CONFIG_DIRECT3D'
@@ -4990,7 +4955,6 @@
 if test "$_directx" = yes ; then
   _def_directx='#define CONFIG_DIRECTX 1'
   _libs_mplayer="$_libs_mplayer -lgdi32"
-  _vosrc="$_vosrc vo_directx.c"
   _vomodules="directx $_vomodules"
   _aomodules="dsound $_aomodules"
 else
@@ -5036,7 +5000,6 @@
 fi
 if test "$_dxr2" = yes; then
   _def_dxr2='#define CONFIG_DXR2 1'
-  _vosrc="$_vosrc vo_dxr2.c"
   _aomodules="dxr2 $_aomodules"
   _vomodules="dxr2 $_vomodules"
 else
@@ -5057,7 +5020,6 @@
 fi
 if test "$_dxr3" = yes ; then
   _def_dxr3='#define CONFIG_DXR3 1'
-  _vosrc="$_vosrc vo_dxr3.c"
   _vomodules="dxr3 $_vomodules"
 else
   _def_dxr3='#undef CONFIG_DXR3'
@@ -5087,7 +5049,6 @@
 fi
 if test "$_ivtv" = yes ; then
   _def_ivtv='#define CONFIG_IVTV 1'
-  _vosrc="$_vosrc vo_ivtv.c"
   _vomodules="ivtv $_vomodules"
   _aomodules="ivtv $_aomodules"
 else
@@ -5121,7 +5082,6 @@
 fi
 if test "$_v4l2" = yes ; then
   _def_v4l2='#define CONFIG_V4L2_DECODER 1'
-  _vosrc="$_vosrc vo_v4l2.c"
   _vomodules="v4l2 $_vomodules"
   _aomodules="v4l2 $_aomodules"
 else
@@ -6971,7 +6931,6 @@
 if test "$_zr" = yes ; then
   if test "$_libavcodec_a" = yes ; then
     _def_zr='#define CONFIG_ZR 1'
-    _vosrc="$_vosrc vo_zr2.c vo_zr.c jpeg_enc.c"
     _vomodules="zr zr2 $_vomodules"
   else
     _res_comment="libavcodec (static) is required by zr, sorry"
@@ -7945,8 +7904,6 @@
 HELP_FILE = $_mp_help
 TIMER = $_timer
 
-VO_SRCS = $_vosrc
-
 EXESUF = $_exesuf
 
 $_target_arch
@@ -7966,6 +7923,8 @@
 NEED_VSSCANF = $_need_vsscanf
 
 # features
+3DFX = $_3dfx
+AA = $_aa
 ALSA1X = $_alsa1x
 ALSA9 = $_alsa9
 ALSA5 = $_alsa5
@@ -7974,23 +7933,34 @@
 ARTS = $_arts
 AUDIO_INPUT = $_audio_input
 BITMAP_FONT = $_bitmap_font
+BL = $_bl
+CACA = $_caca
 CDDA = $_cdda
 CDDB = $_cddb
 COREAUDIO = $_coreaudio
 COREVIDEO = $_corevideo
+DFBMGA = $_dfbmga
+DGA = $_dga
+DIRECT3D = $_direct3d
+DIRECTFB = $_directfb
 DIRECTX = $_directx
 DVBIN = $_dvbin
 DVDNAV = $_dvdnav
 DVDREAD = $_dvdread
 DVDREAD_INTERNAL = $_dvdread_internal
 DXR2 = $_dxr2
+DXR3 = $_dxr3
 ESD = $_esd
 FAAC=$_faac
 FAAD = $_faad
 FAAD_INTERNAL = $_faad_internal
+FBDEV = $_fbdev
 FREETYPE = $_freetype
 FTP = $_ftp
 GIF = $_gif
+GGI = $_ggi
+GL = $_gl
+GL_WIN32 = $_gl_win32
 GUI = $_gui
 GUI_GTK = $_gui_gtk
 GUI_WIN32 = $_gui_win32
@@ -8022,6 +7992,8 @@
 LIVE555 = $_live
 MACOSX_BUNDLE = $_macosx_bundle
 MACOSX_FINDER = $_macosx_finder
+MD5SUM = $_md5sum
+MGA = $_mga
 MNG = $_mng
 MP3LAME = $_mp3lame
 MP3LIB = $_mp3lib
@@ -8033,6 +8005,7 @@
 OSS = $_ossaudio
 PE_EXECUTABLE = $_pe_executable
 PNG = $_png
+PNM = $_pnm
 PULSE = $_pulse
 PVR = $_pvr
 QTX_CODECS = $_qtx
@@ -8042,11 +8015,16 @@
 RADIO=$_radio
 RADIO_CAPTURE=$_radio_capture
 REAL_CODECS = $_real
+S3FB = $_s3fb
 SDL = $_sdl
 SPEEX = $_speex
 STREAM_CACHE = $_stream_cache
 SGIAUDIO = $_sgiaudio
 SUNAUDIO = $_sunaudio
+SVGA = $_svga
+TDFXFB = $_tdfxfb
+TDFXVID = $_tdfxvid
+TGA = $_tga
 TOOLAME=$_toolame
 TREMOR_INTERNAL = $_tremor_internal
 TV = $_tv
@@ -8060,6 +8038,7 @@
 UNRAR_EXEC = $_unrar_exec
 V4L2 = $_v4l2
 VCD = $_vcd
+VESA = $_vesa
 VIDIX = $_vidix
 VIDIX_PCIDB = $_vidix_pcidb_val
 VIDIX_CYBERBLADE=$_vidix_drv_cyberblade
@@ -8077,13 +8056,21 @@
 VIDIX_SIS=$_vidix_drv_sis
 VIDIX_UNICHROME=$_vidix_drv_unichrome
 VSTREAM = $_vstream
+WII = $_wii
 WIN32DLL = $_win32dll
 WIN32WAVEOUT = $_win32waveout
 WIN32_EMULATION = $_win32_emulation
+WINVIDIX = $winvidix
+X11 = $_x11
 X264 = $_x264
 XANIM_CODECS = $_xanim
+XMGA = $_xmga
 XMMS_PLUGINS = $_xmms
+XV = $_xv
 XVID4 = $_xvid
+XVIDIX = $xvidix
+XVMC = $_xvmc
+YUV4MPEG = $_yuv4mpeg
 ZR = $_zr
 
 # FFmpeg