From 565344aba2114ab7ae84c705342577760f039b5a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 10 Sep 2025 23:32:25 +0200 Subject: [PATCH] package/opencv4: drop optional dependency on libgtk2 As we're about to remove libgtk2, we need to drop libgtk2 support from opencv4. gtk3 support remains in place. Signed-off-by: Thomas Petazzoni Reviewed-by: Woodrow Douglass [Arnout: add legacy handling] Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 7 +++++++ package/opencv4/Config.in | 9 --------- package/opencv4/opencv4.mk | 14 ++++---------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 691e36ccd0..93fca81436 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.11" +config BR2_PACKAGE_OPENCV4_WITH_GTK + bool "opencv4 gtk support has been removed" + select BR2_LEGACY + help + Due to the removal of libgtk2, the gtk support of opencv4 + has been removed. gtk3 support is still available. + config BR2_PACKAGE_OPENCV3_WITH_GTK bool "opencv3 gtk support has been removed" select BR2_LEGACY diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in index f71ceba2c5..a553411e1a 100644 --- a/package/opencv4/Config.in +++ b/package/opencv4/Config.in @@ -81,15 +81,6 @@ choice config BR2_PACKAGE_OPENCV4_GUI_NONE bool "none" -config BR2_PACKAGE_OPENCV4_WITH_GTK - bool "gtk2" - depends on BR2_PACKAGE_LIBGTK2 - -comment "gtk2 support needs libgtk2" - depends on BR2_USE_MMU # libgtk2 -> glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_LIBGTK2 - config BR2_PACKAGE_OPENCV4_WITH_GTK3 bool "gtk3" depends on BR2_PACKAGE_LIBGTK3 diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index 01f70dfe49..d3df1a39f7 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -211,6 +211,7 @@ OPENCV4_CONF_OPTS += \ -DWITH_GDAL=OFF \ -DWITH_GPHOTO2=OFF \ -DWITH_GSTREAMER_0_10=OFF \ + -DWITH_GTK_2_X=OFF \ -DWITH_LAPACK=OFF \ -DWITH_MATLAB=OFF \ -DWITH_OPENCL=OFF \ @@ -316,18 +317,11 @@ else OPENCV4_CONF_OPTS += -DWITH_GSTREAMER=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK)$(BR2_PACKAGE_OPENCV4_WITH_GTK3),) -OPENCV4_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK),y) -OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON -OPENCV4_DEPENDENCIES += libgtk2 -endif - ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK3),y) -OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF +OPENCV4_CONF_OPTS += -DWITH_GTK=ON OPENCV4_DEPENDENCIES += libgtk3 +else +OPENCV4_CONF_OPTS += -DWITH_GTK=OFF endif ifeq ($(BR2_PACKAGE_OPENCV4_WITH_JPEG),y)