From 2cb7b9fe1e258fc2f7fe810dcb69390e4f49e7d0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 21 Oct 2014 22:26:53 +0200 Subject: [PATCH] gst1-libav: use the new BR2_ARM_CPU_ARM* options Instead of using the Config.in options for each individual ARM core, use the newly introduced BR2_ARM_CPU_ARM* options, which exist per ARM architecture. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 6fdf091454..6018504f81 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -49,10 +49,10 @@ endif # Explicitly disable everything that doesn't match for ARM # FFMPEG "autodetects" by compiling an extended instruction via AS # This works on compilers that aren't built for generic by default -ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y) +ifeq ($(BR2_ARM_CPU_ARMV4),y) GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv5te endif -ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y) +ifeq ($(BR2_ARM_CPU_ARMV6),y) GST1_LIBAV_CONF_EXTRA_OPTS += --enable-armv6 else GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2 -- 2.30.2