From: Thomas Petazzoni Date: Tue, 21 Oct 2014 20:26:51 +0000 (+0200) Subject: gst-ffmpeg: use the new BR2_ARM_CPU_ARM* options X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e33058e51fc74fa5548f18bd630c368ca2a24ccf;p=buildroot.git gst-ffmpeg: 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 Reviewed-by: "Yann E. MORIN" --- diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk index b94fb0f210..5e553638ea 100644 --- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk @@ -51,10 +51,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) GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te endif -ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y) +ifeq ($(BR2_ARM_CPU_ARMV6),y) GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6 else GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2