Neither the currently by ptxdist built 1.0.0rc2 nor the newer 1.0.0rc4 have a --enable-pxa switch, so remove this completely. For testing on iwmmxt we now have a explicit switch and do not need to depend on pxa anymore. This leaves a menu with only one entry left, so remove the menu and put the iwmmxt extension switch along with the other options.
Signed-off-by: Sascha Hauer <[email protected]> --- rules/mplayer.in | 18 ++---------------- rules/mplayer.make | 11 +---------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/rules/mplayer.in b/rules/mplayer.in index 64d0423..7956ddf 100644 --- a/rules/mplayer.in +++ b/rules/mplayer.in @@ -78,23 +78,9 @@ config MPLAYER_CODEC_MPEG2 endif -# ----- -# FIXME: This menu should only be visible when -# the current architecture is PXA or ARM -# -menuconfig MPLAYER_ADVANCED - bool - prompt "Advanced Options " - -if MPLAYER_ADVANCED -config MPLAYER_ADVANCED_PXA - bool - prompt "pxa support" - -config MPLAYER_ADVANCED_IWMMXT +config MPLAYER_IWMMXT bool + depends on ARCH_ARM_IWMMXT prompt "iwmmxt extensions" endif - -endif diff --git a/rules/mplayer.make b/rules/mplayer.make index 3c97db4..3dfc727 100644 --- a/rules/mplayer.make +++ b/rules/mplayer.make @@ -328,20 +328,11 @@ endif # # Advanced Options # -ifdef PTXCONF_ARCH_ARM_PXA -ifdef PTXCONF_MPLAYER_ADVANCED_PXA -MPLAYER_AUTOCONF += --enable-pxa -else -MPLAYER_AUTOCONF += --disable-pxa -endif -ifdef PTXCONF_MPLAYER_ADVANCED_IWMMXT +ifdef PTXCONF_MPLAYER_IWMMXT MPLAYER_AUTOCONF += --enable-iwmmxt else MPLAYER_AUTOCONF += --disable-iwmmxt endif -else -MPLAYER_AUTOCONF += --disable-pxa --disable-iwmmxt -endif ifdef PTXCONF_ARCH_ARM_V6 MPLAYER_AUTOCONF += --enable-armv6 -- 1.7.2.3 -- ptxdist mailing list [email protected]
