Patchwork [1/2] mplayer: Amend libmad selection

login
register
mail settings
Submitter Valentine Barshak
Date Sept. 28, 2012, 7:19 p.m.
Message ID <20120928191925.GA9852@gmail.com>
Download mbox | patch
Permalink /patch/187888/
State Accepted
Commit 79f77bf92587878145049a0d6d771dd92ddc1fe4
Headers show

Comments

Valentine Barshak - Sept. 28, 2012, 7:19 p.m.
Do not set both --enable-mad and --disable-mad.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
---
 package/multimedia/mplayer/mplayer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 05120bf..788beeb 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -66,6 +66,7 @@  endif
 
 ifeq ($(BR2_PACKAGE_LIBMAD),y)
 MPLAYER_DEPENDENCIES += libmad
+MPLAYER_CONF_OPTS += --enable-mad
 else
 MPLAYER_CONF_OPTS += --disable-mad
 endif
@@ -121,7 +122,6 @@  define MPLAYER_CONFIGURE_CMDS
 		--extra-cflags="$(MPLAYER_CFLAGS)" \
 		--extra-ldflags="$(MPLAYER_LDFLAGS)" \
 		--yasm='' \
-		--enable-mad \
 		--enable-fbdev \
 		$(MPLAYER_CONF_OPTS) \
 		--enable-cross-compile \