[Buildroot] [PATCH 0/2] Slightly amend mplayer options

[Buildroot] [PATCH 0/2] Slightly amend mplayer options

[Valentine Barshak]

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

[Buildroot] [PATCH 1/2] mplayer: Amend libmad selection

[Valentine Barshak]

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(-)

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 \
-- 
1.7.11.4

[Buildroot] [PATCH 2/2] mplayer: Only enable IPv6 if BR2_INET_IPV6 is set

[Valentine Barshak]

This fixes false positive IPv6 detection.

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

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 788beeb..1a6b14f 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -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

[Buildroot] [PATCH 0/2] Slightly amend mplayer options

[Peter Korsgaard]

>>>>> "Valentine" == Valentine Barshak <gvaxon@gmail.com> writes:

 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