From ba2b4118fa847dfdbaeb4846590d3a9f51948676 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 1 Jan 2018 13:44:28 +0100 Subject: [PATCH] ffmpeg: RaspberryPi support does not need rpi-firmware rpi-userland provides the user-space blobs needed for OpenGL and al., rpi-firmware is not needed. Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index daa6daba1b..76c31f5f52 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -254,10 +254,10 @@ else FFMPEG_CONF_OPTS += --disable-vdpau endif -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE)$(BR2_PACKAGE_RPI_USERLAND),yy) +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \ --extra-cflags=-I$(STAGING_DIR)/usr/include/IL -FFMPEG_DEPENDENCIES += rpi-firmware rpi-userland +FFMPEG_DEPENDENCIES += rpi-userland else FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi endif -- 2.30.2