summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-21 22:26:55 +0200
committerPeter Korsgaard <peter@korsgaard.com>2014-11-06 23:29:26 +0100
commit6cf975c2fa068d9dbf35f4edb54fd225cf9912d3 (patch)
tree15bf8a69eca9a9e7a59f693316262c4af6722115
parentf284e4b8b58462f5c03a8b732d13586ad1d5dc8f (diff)
downloadbuildroot-6cf975c2fa068d9dbf35f4edb54fd225cf9912d3.tar.gz
buildroot-6cf975c2fa068d9dbf35f4edb54fd225cf9912d3.zip
mplayer: use BR2_ARM_CPU_ARM* options
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/mplayer/Config.in3
-rw-r--r--package/mplayer/mplayer.mk4
2 files changed, 3 insertions, 4 deletions
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index 978eefe9bb..4cfa0bb14a 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -4,8 +4,7 @@ config BR2_PACKAGE_MPLAYER
depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
|| BR2_microblaze || BR2_aarch64 || BR2_nios2)
# Broken support for <ARMv5
- depends on !(BR2_arm920t || BR2_arm920t || BR2_arm922t || BR2_fa526 \
- || BR2_strongarm)
+ depends on !BR2_ARM_CPU_ARMV4
depends on BR2_LARGEFILE
help
MPlayer is a movie player which runs on many systems and supports
diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index 0c216d799c..ee023b4ca3 100644
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -105,11 +105,11 @@ MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBX11),xlib_libX11)
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXV),xlib_libXv)
# ARM optimizations
-ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv5te)
+ifeq ($(BR2_ARM_CPU_ARMV5),y)
MPLAYER_CONF_OPTS += --enable-armv5te
endif
-ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv6j)
+ifeq ($(BR2_ARM_CPU_ARMV6),y)
MPLAYER_CONF_OPTS += --enable-armv6
endif
OpenPOWER on IntegriCloud