projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 63fbc18)
mplayer: Amend libmad selection
authorValentine Barshak <gvaxon@gmail.com>
Fri, 28 Sep 2012 09:19:25 +0000 (09:19 +0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Thu, 4 Oct 2012 21:29:41 +0000 (23:29 +0200)
Do not set both --enable-mad and --disable-mad.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/multimedia/mplayer/mplayer.mk patch | blob | history

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 9ff4b8a62bd0f27b1b578b6368c336076e17bf5d..9967dd92ecc4781f3eaf1f5d7b46bc930fc7e15d 100644 (file)
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -81,6 +81,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBMAD),y)
 MPLAYER_DEPENDENCIES += libmad
+MPLAYER_CONF_OPTS += --enable-mad
 else
 MPLAYER_CONF_OPTS += --disable-mad
 endif
@@ -136,7 +137,6 @@ define MPLAYER_CONFIGURE_CMDS
                --extra-cflags="$(MPLAYER_CFLAGS)" \
                --extra-ldflags="$(MPLAYER_LDFLAGS)" \
                --yasm='' \
-               --enable-mad \
                --enable-fbdev \
                $(MPLAYER_CONF_OPTS) \
                --enable-cross-compile \