From 28309d0a58ea2c898ee37fa3982c81c3fc380121 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 30 Dec 2025 12:45:36 +0100 Subject: [PATCH] package/vlc: remove optional dependency to opencv3 OpenCV3 is unmaintained and will be removed from buildroot. The package does not support OpenCV4: https://code.videolan.org/videolan/vlc/-/merge_requests/927 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ package/vlc/Config.in | 6 ------ package/vlc/vlc.mk | 8 +------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 16807fa196..1d8ed9698d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2026.02" +config BR2_PACKAGE_VLC_OPENCV3_BACKEND + bool "opencv3 support in vlc has been removed" + select BR2_LEGACY + help + OpenCV3 support in VLC has been reported, as OpenCV has been + removed. + config BR2_PACKAGE_CPPDB bool "cppdb has been removed" select BR2_LEGACY diff --git a/package/vlc/Config.in b/package/vlc/Config.in index 964b7660af..d2c1934f37 100644 --- a/package/vlc/Config.in +++ b/package/vlc/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_VLC depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS - select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3 select BR2_PACKAGE_ZLIB if BR2_PACKAGE_TAGLIB help VLC is a free and open source cross-platform multimedia player @@ -18,11 +17,6 @@ config BR2_PACKAGE_VLC http://www.videolan.org/vlc/ -config BR2_PACKAGE_VLC_OPENCV3_BACKEND - bool - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT - comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, gcc >= 4.9, headers >= 3.7" depends on !BR2_RISCV_32 depends on BR2_USE_MMU diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 2a83b66c92..9091a7e7fa 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -72,6 +72,7 @@ VLC_CONF_OPTS += \ --disable-mtp \ --disable-mpc \ --disable-notify \ + --disable-opencv \ --disable-projectm \ --disable-schroedinger \ --disable-shine \ @@ -211,13 +212,6 @@ else VLC_CONF_OPTS += --disable-gles2 endif -ifeq ($(BR2_PACKAGE_OPENCV3),y) -VLC_CONF_OPTS += --enable-opencv -VLC_DEPENDENCIES += opencv3 -else -VLC_CONF_OPTS += --disable-opencv -endif - ifeq ($(BR2_PACKAGE_OPUS),y) VLC_CONF_OPTS += --enable-opus VLC_DEPENDENCIES += libvorbis opus