diff options
| author | wm4 <wm4@mplayer2.org> | 2012-07-28 20:20:17 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-07-28 20:44:59 +0200 |
| commit | 16145ff43fd92947cb8fe301ebce46e7be52a9fb (patch) | |
| tree | 5a5ade633d922f416d3b1c7c68e8aff878da9a8f | |
| parent | f03eed6469e34a5bff975ed43292016a621296ea (diff) | |
| download | mpv-16145ff43fd92947cb8fe301ebce46e7be52a9fb.tar.bz2 mpv-16145ff43fd92947cb8fe301ebce46e7be52a9fb.tar.xz | |
libvo, libao: remove useless video and audio output drivers
Some of these have only limited use, and some of these have no use at
all. Remove them. They make maintainance harder and nobody needs them.
It's possible that many of the removed drivers were very useful a dozen
of years ago, but now it's 2012.
Note that some of these could be added back, in case they were more
useful than I thought. But right now, they are just a burden.
Reason for removal for each module:
vo_3dfx, vo_dfbmga, vo_dxr3, vo_ivtv, vo_mga, vo_s3fb,
vo_tdfxfb, vo_xmga, vo_tdfx_vid:
All of these are for very specific and outdated hardware. Some
of them require non-standard kernel drivers or do direct HW
access.
vo_dga: the most crappy and ancient way to get fast output on X.
vo_aa: there's vo_caca for the same purpose.
vo_ggi: this never lived, and is entirely useless.
vo_mpegpes: for DVB cards, I can't test this and it's crappy.
vo_fbdev, vo_fbdev2: there's vo_directfb2
vo_bl: what is this even? But it's neither important, nor alive.
vo_svga, vo_vesa: you want to use this? You can't be serious.
vo_wii: I can't test this, and who the hell uses this?
vo_xvr100: some Sun thing.
vo_xover: only useful in connection with xvr100.
ao_nas: still alive, but I doubt it has any meaning today.
ao_sun: Sun.
ao_win32: use ao_dsound or ao_portaudio instead.
ao_ivtv: removed along vo_ivtv.
Also get rid of anything SDL related. SDL 1.x is total crap for video
output, and will be replaced with SDL 2.x soon (perhaps), so if you
want to use SDL, write output drivers for SDL 2.x.
Additionally, I accidentally damaged Sun support, which made me
completely remove Sun/Solaris support. Nobody cares about this anyway.
Some left overs from previous commits removing modules were cleaned up.
51 files changed, 14 insertions, 20674 deletions
@@ -433,63 +433,40 @@ SRCS_COMMON = asxparser.c \ $(SRCS_COMMON-yes) -SRCS_MPLAYER-$(3DFX) += libvo/vo_3dfx.c -SRCS_MPLAYER-$(AA) += libvo/vo_aa.c SRCS_MPLAYER-$(ALSA) += libao2/ao_alsa.c SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c -SRCS_MPLAYER-$(BL) += libvo/vo_bl.c SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m SRCS_MPLAYER-$(SHAREDBUFFER) += libvo/vo_sharedbuffer.m -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 libvo/vo_dfbmga.c +SRCS_MPLAYER-$(DIRECTFB) += libvo/vo_directfb2.c SRCS_MPLAYER-$(DIRECTX) += libao2/ao_dsound.c libvo/vo_directx.c -SRCS_MPLAYER-$(DXR3) += libvo/vo_dxr3.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_gl3.c \ pnm_loader.c -SRCS_MPLAYER-$(GL_SDL) += libvo/sdl_common.c SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c SRCS_MPLAYER-$(GL_X11) += libvo/x11_common.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-$(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-$(PNM) += libvo/vo_pnm.c SRCS_MPLAYER-$(PULSE) += libao2/ao_pulse.c SRCS_MPLAYER-$(PORTAUDIO) += libao2/ao_portaudio.c SRCS_MPLAYER-$(RSOUND) += libao2/ao_rsound.c -SRCS_MPLAYER-$(S3FB) += libvo/vo_s3fb.c -SRCS_MPLAYER-$(SDL) += libao2/ao_sdl.c libvo/vo_sdl.c libvo/sdl_common.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-$(VDPAU) += libvo/vo_vdpau.c -SRCS_MPLAYER-$(VESA) += libvo/gtf.c libvo/vo_vesa.c libvo/vesa_lvo.c -SRCS_MPLAYER-$(WII) += libvo/vo_wii.c -SRCS_MPLAYER-$(WIN32WAVEOUT) += libao2/ao_win32.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-$(X11) += libvo/vo_x11.c libvo/x11_common.c SRCS_MPLAYER-$(XV) += libvo/vo_xv.c -SRCS_MPLAYER-$(XVR100) += libvo/vo_xvr100.c SRCS_MPLAYER-$(YUV4MPEG) += libvo/vo_yuv4mpeg.c SRCS_MPLAYER = command.c \ @@ -500,7 +477,6 @@ SRCS_MPLAYER = command.c \ parser-mpcmd.c \ screenshot.c \ input/input.c \ - libao2/ao_mpegpes.c \ libao2/ao_null.c \ libao2/ao_pcm.c \ libao2/audio_out.c \ @@ -509,9 +485,7 @@ SRCS_MPLAYER = command.c \ libvo/filter_kernels.c \ libvo/geometry.c \ libvo/old_vo_wrapper.c \ - libvo/spuenc.c \ libvo/video_out.c \ - libvo/vo_mpegpes.c \ libvo/vo_null.c \ libvo/vo_png.c \ $(SRCS_MPLAYER-yes) @@ -215,7 +215,6 @@ morphos() { issystem "MorphOS"; } netbsd() { issystem "NetBSD"; } openbsd() { issystem "OpenBSD"; } qnx() { issystem "QNX"; } -sunos() { issystem "SunOS"; } win32() { cygwin || mingw32; } # arch test boolean functions @@ -395,23 +394,10 @@ Codecs: Video output: --enable-gl enable OpenGL video output [autodetect] - --enable-dga2 enable DGA 2 support [autodetect] - --enable-dga1 enable DGA 1 support [autodetect] - --enable-vesa enable VESA video output [autodetect] - --enable-svga enable SVGAlib video output [autodetect] - --enable-sdl enable SDL video output [autodetect] - --enable-aa enable AAlib video output [autodetect] --enable-caca enable CACA video output [autodetect] - --enable-ggi enable GGI video output [autodetect] - --enable-ggiwmh enable GGI libggiwmh extension [autodetect] --enable-direct3d enable Direct3D video output [autodetect] --enable-directx enable DirectX video output [autodetect] - --enable-dxr3 enable DXR3/H+ video output [autodetect] - --enable-ivtv enable IVTV TV-Out video output [autodetect] --enable-v4l2 enable V4L2 Decoder audio/video output [autodetect] - --enable-dvb enable DVB video output [autodetect] - --enable-mga enable mga_vid video output [autodetect] - --enable-xmga enable mga_vid X11 video output [autodetect] --enable-xv enable Xv video output [autodetect] --enable-vdpau enable VDPAU acceleration [autodetect] --enable-vm enable XF86VidMode support [autodetect] @@ -419,15 +405,7 @@ Video output: --enable-x11 enable X11 video output [autodetect] --enable-xshape enable XShape support [autodetect] --disable-xss disable screensaver support via xss [autodetect] - --enable-fbdev enable FBDev video output [autodetect] - --enable-3dfx enable obsolete /dev/3dfx video output [disable] - --enable-tdfxfb enable tdfxfb video output [disable] - --enable-s3fb enable s3fb (S3 ViRGE) video output [disable] - --enable-wii enable Nintendo Wii/GameCube video output [disable] --enable-directfb enable DirectFB video output [autodetect] - --enable-bl enable Blinkenlights video output [disable] - --enable-tdfxvid enable tdfx_vid video output [disable] - --enable-xvr100 enable SUN XVR-100 video output [autodetect] --disable-tga disable Targa video output [enable] --disable-pnm disable PNM video output [enable] --disable-md5sum disable md5sum video output [enable] @@ -444,9 +422,6 @@ Audio output: --disable-portaudio disable PortAudio audio output [autodetect] --disable-jack disable JACK audio output [autodetect] --enable-openal enable OpenAL audio output [disable] - --disable-nas disable NAS audio output [autodetect] - --disable-sunaudio disable Sun audio output [autodetect] - --disable-win32waveout disable Windows waveout audio output [autodetect] --disable-coreaudio disable CoreAudio audio output [autodetect] --disable-select disable using select() on the audio device [enable] @@ -512,7 +487,6 @@ Use these options if autodetection fails: --extra-libs=FLAGS extra linker flags --extra-libs-mplayer=FLAGS extra linker flags for MPlayer - --with-sdl-config=PATH path to sdl*-config --with-dvdnav-config=PATH path to dvdnav-config --with-dvdread-config=PATH path to dvdread-config @@ -563,14 +537,10 @@ _mplayer=yes _x11=auto _xshape=auto _xss=auto -_dga1=auto -_dga2=auto _xv=auto _vdpau=auto -_sdl=auto _direct3d=auto _directx=auto -_win32waveout=auto _nas=auto _png=auto _mng=auto @@ -580,16 +550,9 @@ _md5sum=yes _yuv4mpeg=yes _gif=auto _gl=auto -_ggi=auto -_ggiwmh=auto _aa=auto _caca=auto -_svga=auto -_vesa=auto -_fbdev=auto _dvb=auto -_dxr3=auto -_ivtv=auto _v4l2=auto _iconv=auto _langinfo=auto @@ -628,11 +591,8 @@ _nemesi=auto _lcms2=auto _native_rtsp=yes _xinerama=auto -_mga=auto -_xmga=auto _vm=auto _xf86keysym=auto -_sunaudio=auto _alsa=auto _fastmemcpy=yes _unrar_exec=auto @@ -661,15 +621,8 @@ _apple_remote=auto _apple_ir=auto _termcap=auto _termios=auto -_3dfx=no -_s3fb=no -_wii=no -_tdfxfb=no -_tdfxvid=no -_xvr100=auto _tga=yes _directfb=auto -_bl=no #language=en _shm=auto _translation=no @@ -746,9 +699,6 @@ for ac_option do _install=$(echo $ac_option | cut -d '=' -f 2 ) ;; - --with-sdl-config=*) - _sdlconfig=$(echo $ac_option | cut -d '=' -f 2) - ;; --with-dvdnav-config=*) _dvdnavconfig=$(echo $ac_option | cut -d '=' -f 2) ;; @@ -851,16 +801,10 @@ for ac_option do --disable-xv) _xv=no ;; --enable-vdpau) _vdpau=yes ;; --disable-vdpau) _vdpau=no ;; - --enable-sdl) _sdl=yes ;; - --disable-sdl) _sdl=no ;; --enable-direct3d) _direct3d=yes ;; --disable-direct3d) _direct3d=no ;; --enable-directx) _directx=yes ;; --disable-directx) _directx=no ;; - --enable-win32waveout) _win32waveout=yes ;; - --disable-win32waveout) _win32waveout=no ;; - --enable-nas) _nas=yes ;; - --disable-nas) _nas=no ;; --enable-png) _png=yes ;; --disable-png) _png=no ;; --enable-mng) _mng=yes ;; @@ -877,26 +821,10 @@ for ac_option do --disable-gif) _gif=no ;; --enable-gl) _gl=yes ;; --disable-gl) _gl=no ;; - --enable-ggi) _ggi=yes ;; - --disable-ggi) _ggi=no ;; - --enable-ggiwmh) _ggiwmh=yes ;; - --disable-ggiwmh) _ggiwmh=no ;; - --enable-aa) _aa=yes ;; - --disable-aa) _aa=no ;; --enable-caca) _caca=yes ;; --disable-caca) _caca=no ;; - --enable-svga) _svga=yes ;; - --disable-svga) _svga=no ;; - --enable-vesa) _vesa=yes ;; - --disable-vesa) _vesa=no ;; - --enable-fbdev) _fbdev=yes ;; - --disable-fbdev) _fbdev=no ;; --enable-dvb) _dvb=yes ;; --disable-dvb) _dvb=no ;; - --enable-dxr3) _dxr3=yes ;; - --disable-dxr3) _dxr3=no ;; - --enable-ivtv) _ivtv=yes ;; - --disable-ivtv) _ivtv=no ;; --enable-v4l2) _v4l2=yes ;; --disable-v4l2) _v4l2=no ;; --enable-iconv) _iconv=yes ;; @@ -971,16 +899,10 @@ for ac_option do --disable-lcms2) _lcms2=no ;; --enable-xinerama) _xinerama=yes ;; --disable-xinerama) _xinerama=no ;; - --enable-mga) _mga=yes ;; - --disable-mga) _mga=no ;; - --enable-xmga) _xmga=yes ;; - --disable-xmga) _xmga=no ;; --enable-vm) _vm=yes ;; --disable-vm) _vm=no ;; --enable-xf86keysym) _xf86keysym=yes ;; --disable-xf86keysym) _xf86keysym=no ;; - --enable-sunaudio) _sunaudio=yes ;; - --disable-sunaudio) _sunaudio=no ;; --enable-alsa) _alsa=yes ;; --disable-alsa) _alsa=no ;; --enable-tv) _tv=yes ;; @@ -1035,24 +957,10 @@ for ac_option do --disable-termcap) _termcap=no ;; --enable-termios) _termios=yes ;; --disable-termios) _termios=no ;; - --enable-3dfx) _3dfx=yes ;; - --disable-3dfx) _3dfx=no ;; - --enable-s3fb) _s3fb=yes ;; - --disable-s3fb) _s3fb=no ;; - --enable-wii) _wii=yes ;; - --disable-wii) _wii=no ;; - --enable-tdfxfb) _tdfxfb=yes ;; - --disable-tdfxfb) _tdfxfb=no ;; - --disable-tdfxvid) _tdfxvid=no ;; - --enable-tdfxvid) _tdfxvid=yes ;; - --disable-xvr100) _xvr100=no ;; - --enable-xvr100) _xvr100=yes ;; --disable-tga) _tga=no ;; --enable-tga) _tga=yes ;; --enable-directfb) _directfb=yes ;; --disable-directfb) _directfb=no ;; - --enable-bl) _bl=yes ;; - --disable-bl) _bl=no ;; --enable-shm) _shm=yes ;; --disable-shm) _shm=no ;; --enable-select) _select=yes ;; @@ -1096,11 +1004,6 @@ for ac_option do --enable-gethostbyname2) _gethostbyname2=yes ;; --disable-gethostbyname2) _gethostbyname2=no ;; - --enable-dga1) _dga1=yes ;; - --disable-dga1) _dga1=no ;; - --enable-dga2) _dga2=yes ;; - --disable-dga2) _dga2=no ;; - --enable-qtx) _qtx=yes ;; --disable-qtx) _qtx=no ;; @@ -1235,7 +1138,7 @@ if test -z "$_target" ; then # OS name system_name=$(uname -s 2>&1) case "$system_name" in - Linux|FreeBSD|NetBSD|OpenBSD|DragonFly|BSD/OS|Darwin|SunOS|QNX|GNU|BeOS|MorphOS|AIX|AmigaOS) + Linux|FreeBSD|NetBSD|OpenBSD|DragonFly|BSD/OS|Darwin|QNX|GNU|BeOS|MorphOS|AIX|AmigaOS) ;; Haiku) system_name=BeOS @@ -1307,7 +1210,6 @@ else # if test -z "$_target" bsd/os) system_name=BSD/OS ;; openbsd) system_name=OpenBSD ;; dragonfly) system_name=DragonFly ;; - sunos) system_name=SunOS ;; qnx) system_name=QNX ;; morphos) system_name=MorphOS ;; amigaos) system_name=AmigaOS ;; @@ -1444,14 +1346,6 @@ else break fi cc_name_tmp=$($_cc -V 2>&1 | head -n 1 | cut -d ' ' -f 2,3) - if test "$cc_name_tmp" = "Sun C"; then - echocheck "$_cc version" - cc_vendor=sun - cc_version=$($_cc -V 2>&1 | head -n 1 | cut -d ' ' -f 4) - res_comment="experimental support only" - echores "Sun C $cc_version" - break - fi done fi # icc test "$cc_fail" = yes && die "unsupported compiler version" @@ -1945,19 +1839,6 @@ case "$host_arch" in _vis='yes' proc='ultrasparc' def_fast_64bit='#define HAVE_FAST_64BIT 1' - elif sunos ; then - echocheck "CPU type" - karch=$(uname -m) - case "$(echo $karch)" in - sun4) proc=v7 ;; - sun4c) proc=v7 ;; - sun4d) proc=v8 ;; - sun4m) proc=v8 ;; - sun4u) proc=ultrasparc _vis='yes' ;; - sun4v) proc=v9 ;; - *) proc=v8 ;; - esac - echores "$proc" else proc=v8 fi @@ -2277,8 +2158,6 @@ if test -z "$CFLAGS" ; then if test "$cc_vendor" = "intel" ; then CFLAGS="-O2 $_debug $_profile $_march $_mcpu $_pipe -fomit-frame-pointer" WARNFLAGS="-wd167 -wd556 -wd144" - elif test "$cc_vendor" = "sun" ; then - CFLAGS="-O2 $_debug $_profile $_march $_mcpu $_pipe -xc99 -xregs=frameptr" elif test "$cc_vendor" = "clang"; then CFLAGS="-O2 $_debug $_profile $_march $_pipe" WARNFLAGS="-Wall -Wno-switch-enum -Wno-logical-op-parentheses -Wpointer-arith -Wundef -Wno-pointer-sign -Wmissing-prototypes" @@ -3296,21 +3175,6 @@ echores "$_hpux_scsi_h" fi #if hpux -if sunos; then -echocheck "userspace SCSI headers (Solaris)" -_sol_scsi_h=no -header_check sys/scsi/scsi_types.h && - header_check_broken sys/types.h sys/scsi/impl/uscsi.h && - _sol_scsi_h=yes -if test "$_sol_scsi_h" = yes ; then - def_sol_scsi_h='#define SOLARIS_USCSI 1' -else - def_sol_scsi_h='#undef SOLARIS_USCSI' -fi -echores "$_sol_scsi_h" -fi #if sunos - - echocheck "termcap" if test "$_termcap" = auto ; then _termcap=no @@ -3484,20 +3348,6 @@ statement_check io.h 'setmode(0, 0)' && _setmode=yes && def_setmode='#define HAV echores "$_setmode" -if sunos; then -echocheck "sysi86()" -_sysi86=no -statement_check sys/sysi86.h 'sysi86(0)' && _sysi86=yes -if test "$_sysi86" = yes ; then - def_sysi86='#define HAVE_SYSI86 1' - statement_check sys/sysi86.h 'int sysi86(int, void*); sysi86(0)' && def_sysi86_iv='#define HAVE_SYSI86_iv 1' -else - def_sysi86='#undef HAVE_SYSI86' -fi -echores "$_sysi86" -fi #if sunos - - echocheck "sys/sysinfo.h" _sys_sysinfo=no statement_check sys/sysinfo.h 'struct sysinfo s_info; s_info.mem_unit=0; sysinfo(&s_info)' && _sys_sysinfo=yes @@ -3620,72 +3470,6 @@ echores "$_smb" ######### -echocheck "tdfxfb" -if test "$_tdfxfb" = yes ; then - def_tdfxfb='#define CONFIG_TDFXFB 1' - vomodules="tdfxfb $vomodules" -else - def_tdfxfb='#undef CONFIG_TDFXFB' - novomodules="tdfxfb $novomodules" -fi -echores "$_tdfxfb" - -echocheck "s3fb" -if test "$_s3fb" = yes ; then - def_s3fb='#define CONFIG_S3FB 1' - vomodules="s3fb $vomodules" -else - def_s3fb='#undef CONFIG_S3FB' - novomodules="s3fb $novomodules" -fi -echores "$_s3fb" - -echocheck "wii" -if test "$_wii" = yes ; then - def_wii='#define CONFIG_WII 1' - vomodules="wii $vomodules" -else - def_wii='#undef CONFIG_WII' - novomodules="wii $novomodules" -fi -echores "$_wii" - -echocheck "tdfxvid" -if test "$_tdfxvid" = yes ; then - def_tdfxvid='#define CONFIG_TDFX_VID 1' - vomodules="tdfx_vid $vomodules" -else - def_tdfxvid='#undef CONFIG_TDFX_VID' - novomodules="tdfx_vid $novomodules" -fi -echores "$_tdfxvid" - -echocheck "xvr100" -if test "$_xvr100" = auto ; then -cat > $TMPC << EOF -#include <unistd.h> -#include <sys/fbio.h> -#include <sys/visual_io.h> -int main(void) { -struct vis_identifier ident; -struct fbgattr attr; -ioctl(0, VIS_GETIDENTIFIER, &ident); -ioctl(0, FBIOGATTR, &attr); -return 0; -} -EOF - _xvr100=no - cc_check && _xvr100=yes -fi -if test "$_xvr100" = yes ; then - def_xvr100='#define CONFIG_XVR100 1' - vomodules="xvr100 $vomodules" -else - def_tdfxvid='#undef CONFIG_XVR100' - novomodules="xvr100 $novomodules" -fi -echores "$_xvr100" - echocheck "tga" if test "$_tga" = yes ; then def_tga='#define CONFIG_TGA 1' @@ -3719,17 +3503,6 @@ fi echores "$_yuv4mpeg" -echocheck "bl" -if test "$_bl" = yes ; then - def_bl='#define CONFIG_BL 1' - vomodules="bl $vomodules" -else - def_bl='#undef CONFIG_BL' - novomodules="bl $novomodules" -fi -echores "$_bl" - - echocheck "DirectFB" if test "$_directfb" = auto ; then _directfb=no @@ -3748,11 +3521,11 @@ EOF fi if test "$_directfb" = yes ; then def_directfb='#define CONFIG_DIRECTFB 1' - vomodules="directfb dfbmga $vomodules" + vomodules="directfb $vomodules" libs_mplayer="$libs_mplayer -ldirectfb" else def_directfb='#undef CONFIG_DIRECTFB' - novomodules="directfb dfbmga $novomodules" + novomodules="directfb $novomodules" fi echores "$_directfb" @@ -4026,113 +3799,6 @@ else fi echores "$_xf86keysym" -echocheck "DGA" -if test "$_dga2" = auto && test "$_x11" = yes ; then - _dga2=no - statement_check_broken X11/Xlib.h X11/extensions/Xxf86dga.h 'XDGASetViewport(0, 0, 0, 0, 0)' -lXxf86dga && _dga2=yes -fi -if test "$_dga1" = auto && test "$_dga2" = no && test "$_vm" = yes ; then - _dga1=no - statement_check_broken X11/Xlib.h X11/extensions/Xxf86dga.h 'XF86DGASetViewPort(0, 0, 0, 0)' -lXxf86dga -lXxf86vm && _dga1=yes -fi - -_dga=no -def_dga='#undef CONFIG_DGA' -def_dga1='#undef CONFIG_DGA1' -def_dga2='#undef CONFIG_DGA2' -if test "$_dga1" = yes ; then - _dga=yes - def_dga1='#define CONFIG_DGA1 1' - res_comment="using DGA 1.0" -elif test "$_dga2" = yes ; then - _dga=yes - def_dga2='#define CONFIG_DGA2 1' - res_comment="using DGA 2.0" -fi -if test "$_dga" = yes ; then - def_dga='#define CONFIG_DGA 1' - libs_mplayer="$libs_mplayer -lXxf86dga" - vomodules="dga $vomodules" -else - novomodules="dga $novomodules" -fi -echores "$_dga" - - -echocheck "3dfx" -if test "$_3dfx" = yes && test "$_dga" = yes ; then - def_3dfx='#define CONFIG_3DFX 1' - vomodules="3dfx $vomodules" -else - _3dfx=no - def_3dfx='#undef CONFIG_3DFX' - novomodules="3dfx $novomodules" -fi -echores "$_3dfx" - - -echocheck "GGI" -if test "$_ggi" = auto ; then - _ggi=no - statement_check ggi/ggi.h 'ggiInit()' -lggi && _ggi=yes -fi -if test "$_ggi" = yes ; then - def_ggi='#define CONFIG_GGI 1' - libs_mplayer="$libs_mplayer -lggi" - vomodules="ggi $vomodules" -else - def_ggi='#undef CONFIG_GGI' - novomodules="ggi $novomodules" -fi -echores "$_ggi" - -echocheck "GGI extension: libggiwmh" -if test "$_ggiwmh" = auto ; then - _ggiwmh=no - statement_check ggi/wmh.h 'ggiWmhInit()' -lggi -lggiwmh && _ggiwmh=yes -fi -# needed to get right output on obscure combination -# like --disable-ggi --enable-ggiwmh -if test "$_ggi" = yes && test "$_ggiwmh" = yes ; then - def_ggiwmh='#define CONFIG_GGIWMH 1' - libs_mplayer="$libs_mplayer -lggiwmh" -else - _ggiwmh=no - def_ggiwmh='#undef CONFIG_GGIWMH' -fi -echores "$_ggiwmh" - - -echocheck "AA" -if test "$_aa" = auto ; then - cat > $TMPC << EOF -#include <aalib.h> -int main(void) { -aa_context *c; -aa_renderparams *p; -aa_init(0, 0, 0); -c = aa_autoinit(&aa_defparams); -p = aa_getrenderparams(); -aa_autoinitkbd(c, 0); -return 0; } -EOF - _aa=no - for _ld_tmp in "-laa" ; do - cc_check $_ld_tmp && libs_mplayer="$libs_mplayer $_ld_tmp" && _aa=yes && break - done -fi -if test "$_aa" = yes ; then - def_aa='#define CONFIG_AA 1' - if cygwin ; then - libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)" - fi - vomodules="aa $vomodules" -else - def_aa='#undef CONFIG_AA' - novomodules="aa $novomodules" -fi -echores "$_aa" - echocheck "CACA" if test "$_caca" = auto ; then @@ -4160,38 +3826,6 @@ fi |