Commit ae2850b7 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

ffmpeg: use arch and cpu instead of tune 



ffmpeg currently uses BR2_GCC_TARGET_TUNE as the --cpu option
value. However, there are multiple architectures for which
BR2_GCC_TARGET_TUNE is not used. After inspecting the ffmpeg configure
script, we concluded that using the BR2_GCC_TARGET_CPU value if
available, or the BR2_GCC_TARGET_ARCH value as a fallback was the
appropriate behavior.

This allows to remove the reference to BR2_GCC_TARGET_TUNE, which is
one step towards the removal of this option.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent fd828fd9

package/ffmpeg/ffmpeg.mk

+6 −1
Original line number Diff line number Diff line
@@ -340,6 +340,12 @@ endif 


FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))



ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)

FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_CPU)

else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH),)

FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH)

endif



# Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others

define FFMPEG_CONFIGURE_CMDS

	(cd $(FFMPEG_SRCDIR) && rm -rf config.cache && \
@@ -355,7 +361,6 @@ define FFMPEG_CONFIGURE_CMDS 
		--target-os="linux" \

		--disable-stripping \

		--pkg-config="$(PKG_CONFIG_HOST_BINARY)" \

		$(if $(BR2_GCC_TARGET_TUNE),--cpu=$(BR2_GCC_TARGET_TUNE)) \

		$(SHARED_STATIC_LIBS_OPTS) \

		$(FFMPEG_CONF_OPTS) \

	)