From 16145ff43fd92947cb8fe301ebce46e7be52a9fb Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 28 Jul 2012 20:20:17 +0200 Subject: 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. --- Makefile | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index aa5e1d515c..246265c663 100644 --- a/Makefile +++ b/Makefile @@ -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) -- cgit v1.2.3