mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/ffmpeg: drop rpi-userland support

Browse Source 
As we're about to remove the rpi-userland package, drop support for it
from package/ffmpeg.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Thomas Petazzoni
2025-12-15 23:49:35 +01:00
committed by Julien Olivain
parent 1721206b35
commit f591fd3fea
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
package/ffmpeg/ffmpeg.mk
View File

@@ -52,7 +52,10 @@ FFMPEG_CONF_OPTS = \
--disable-libilbc \ --disable-libilbc \
--disable-libvo-amrwbenc \ --disable-libvo-amrwbenc \
--disable-symver \ --disable-symver \
--disable-doc --disable-doc \
--disable-mmal \
--disable-omx \
--disable-omx-rpi
FFMPEG_DEPENDENCIES += host-pkgconf FFMPEG_DEPENDENCIES += host-pkgconf
@@ -284,19 +287,6 @@ else
FFMPEG_CONF_OPTS += --disable-vdpau FFMPEG_CONF_OPTS += --disable-vdpau
endif endif
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
FFMPEG_CONF_OPTS += --enable-omx --enable-omx-rpi \
--extra-cflags=-I$(STAGING_DIR)/usr/include/IL
FFMPEG_DEPENDENCIES += rpi-userland
ifeq ($(BR2_arm),y)
FFMPEG_CONF_OPTS += --enable-mmal
else
FFMPEG_CONF_OPTS += --disable-mmal
endif
else
FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
endif
# To avoid a circular dependency only use opencv if opencv itself does # To avoid a circular dependency only use opencv if opencv itself does
# not depend on ffmpeg. # not depend on ffmpeg.
ifeq ($(BR2_PACKAGE_OPENCV4_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV4_WITH_FFMPEG),yx) ifeq ($(BR2_PACKAGE_OPENCV4_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV4_WITH_FFMPEG),yx)