From 209b3425314a868dca9bb21191881d2252b626e6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 4 Nov 2010 13:09:14 +0100 Subject: mplayer: tighten alsa dependency mplayer needs pcm+mixer support in alsa, but this isn't checked by configure, so do it in mplayer.mk instead. Signed-off-by: Peter Korsgaard --- package/multimedia/mplayer/mplayer.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'package/multimedia/mplayer') diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk index ac3a67e1d..93e38dab8 100644 --- a/package/multimedia/mplayer/mplayer.mk +++ b/package/multimedia/mplayer/mplayer.mk @@ -11,9 +11,15 @@ MPLAYER_CAT:=$(BZCAT) MPLAYER_BINARY:=mplayer MPLAYER_TARGET_BINARY:=usr/bin/$(MPLAYER_BINARY) -MPLAYER_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_LIBMAD),libmad) \ - $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) +MPLAYER_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBMAD),libmad) + +# mplayer needs pcm+mixer support, but configure fails to check for it +ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy) +MPLAYER_DEPENDENCIES += alsa-lib +MPLAYER_ALSA:=--enable-alsa +else +MPLAYER_ALSA:=--disable-alsa +endif ifeq ($(BR2_ENDIAN),"BIG") MPLAYER_ENDIAN:=--enable-big-endian @@ -84,6 +90,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked $(MPLAYER_LARGEFILE) \ $(MPLAYER_SDL) \ $(MPLAYER_FREETYPE) \ + $(MPLAYER_ALSA) \ --enable-cross-compile \ --disable-ivtv \ --disable-tv \ -- cgit v1.2.3