Slightly amend mplayer options

These are a couple of mplayer nitpicks.

Valentine Barshak (2):
mplayer: Amend libmad selection
mplayer: Only enable IPv6 if BR2_INET_IPV6 is set

 package/multimedia/mplayer/mplayer.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Thanks,
Val.

1.7.11.4

Do not set both --enable-mad and --disable-mad.

---
 package/multimedia/mplayer/mplayer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 05120bf..788beeb 100644
@@ -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 \

1.7.11.4

This fixes false positive IPv6 detection.

---
 package/multimedia/mplayer/mplayer.mk | 3 +++
 1 file changed, 3 insertions(+)

index 788beeb..1a6b14f 100644
@@ -138,6 +138,9 @@ define MPLAYER_FIXUP_IPV6_MREQ_DETECTION
 endef
 
 MPLAYER_POST_CONFIGURE_HOOKS += MPLAYER_FIXUP_IPV6_MREQ_DETECTION
+MPLAYER_CONF_OPTS += --disable-inet6
+else
+MPLAYER_CONF_OPTS += --enable-inet6
 endif
 
 define MPLAYER_BUILD_CMDS

1.7.11.4

Valentine> These are a couple of mplayer nitpicks. Valentine> Valentine Barshak (2):
Valentine> mplayer: Amend libmad selection
Valentine> mplayer: Only enable IPv6 if BR2_INET_IPV6 is set

Committed both, thanks.

Bye, Peter Korsgaard