ffmpeg: RaspberryPi support does not need rpi-firmware
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mon, 1 Jan 2018 12:44:28 +0000 (13:44 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mon, 1 Jan 2018 12:45:07 +0000 (13:45 +0100)
rpi-userland provides the user-space blobs needed for OpenGL and al.,
rpi-firmware is not needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/ffmpeg/ffmpeg.mk

index daa6daba1bae31f14728ebd06511439fba209bde..76c31f5f5235bf36b329a23e38dcf557078fa969 100644 (file)
@@ -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