mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-01 22:41:43 -09:00
package/ffmpeg: remove optional dependency to opencv3
OpenCV3 is unmaintained and will be removed from buildroot. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
b7143b2e22
commit
51718796be
@@ -297,12 +297,9 @@ else
|
|||||||
FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
|
FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC),y)
|
|
||||||
FFMPEG_CONF_OPTS += --enable-libopencv
|
|
||||||
FFMPEG_DEPENDENCIES += opencv3
|
|
||||||
# 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.
|
||||||
else 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)
|
||||||
FFMPEG_CONF_OPTS += --enable-libopencv \
|
FFMPEG_CONF_OPTS += --enable-libopencv \
|
||||||
--extra-cflags=-I$(STAGING_DIR)/usr/include/opencv4
|
--extra-cflags=-I$(STAGING_DIR)/usr/include/opencv4
|
||||||
FFMPEG_DEPENDENCIES += opencv4
|
FFMPEG_DEPENDENCIES += opencv4
|
||||||
|
|||||||
Reference in New Issue
Block a user