From 9ab501443c37888ee0d286897ebb985b2056ba49 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 27 Feb 2012 16:29:21 +0200 Subject: configure, ao_alsa: drop support for obsolete ALSA versions Drop compatibility code for ALSA versions prior to 1.0.9. Change the configure check to use pkg-config only. --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 55d69f9fa1..1b2d144091 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,7 @@ include config.mak ###### variable declarations ####### -SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c -SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c +SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa1x.c SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes) SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c @@ -431,9 +430,7 @@ SRCS_COMMON = asxparser.c \ 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-$(ALSA) += 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 -- cgit v1.2.3 From a43a4aafd08650254a4b91fe73f82ec96bf2a6ef Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 27 Feb 2012 18:18:49 +0200 Subject: configure, build: support compiling without libpostproc libpostproc has been removed from Libav and the library now exists as a separate project. Because it's not essential, separate it from the Libav library check and allow compiling without it. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1b2d144091..80708c29bc 100644 --- a/Makefile +++ b/Makefile @@ -92,6 +92,7 @@ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ stream/stream_nemesi.c SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c +SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c @@ -330,7 +331,6 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/vf_palette.c \ libmpcodecs/vf_perspective.c \ libmpcodecs/vf_phase.c \ - libmpcodecs/vf_pp.c \ libmpcodecs/vf_pp7.c \ libmpcodecs/vf_pullup.c \ libmpcodecs/vf_qp.c \ -- cgit v1.2.3