From 5d6f3baf0e01be13e0d46475f462b30bd7b002dd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 29 Dec 2024 15:55:29 +0100 Subject: [PATCH] package/qt5/qt5base: drop directfb graphics backend As we're about to remove the DirectFB package, let's drop the DirectFB graphics backend in Qt5. Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain --- Config.in.legacy | 7 +++++++ package/qt5/qt5base/Config.in | 8 -------- package/qt5/qt5base/qt5base.mk | 5 ++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 124bb1ae44..76d656846e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.02" +config BR2_PACKAGE_QT5BASE_DIRECTFB + bool "qt5base directfb support removed" + select BR2_LEGACY + help + The directfb support from qt5base is no longer available, as + directfb is no longer packaged in Buildroot. + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB bool "gstreamer directfb plugin removed" select BR2_LEGACY diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 16a17dfc27..c45b8c1591 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -128,7 +128,6 @@ config BR2_PACKAGE_QT5BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT5BASE_LINUXFB if \ - !BR2_PACKAGE_QT5BASE_DIRECTFB && \ !BR2_PACKAGE_QT5BASE_XCB && \ !BR2_PACKAGE_QT5BASE_EGLFS help @@ -195,13 +194,6 @@ config BR2_PACKAGE_QT5BASE_VULKAN config BR2_PACKAGE_QT5BASE_LINUXFB bool "linuxfb support" -config BR2_PACKAGE_QT5BASE_DIRECTFB - bool "directfb support" - depends on BR2_PACKAGE_DIRECTFB - -comment "directfb backend available if directfb is enabled" - depends on !BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_QT5BASE_XCB bool "X.org XCB support" depends on BR2_PACKAGE_XORG7 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 3fd5d30251..add460c257 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -40,7 +40,8 @@ QT5BASE_CONFIGURE_OPTS += \ -system-pcre \ -no-pch \ -shared \ - -no-feature-relocatable + -no-feature-relocatable \ + -no-directfb # starting from version 5.9.0, -optimize-debug is enabled by default # for debug builds and it overrides -O* with -Og which is not what we @@ -173,8 +174,6 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widge # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb # is to add a link against the "inuxfb" library. QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb) -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) QT5BASE_CONFIGURE_OPTS += -xkbcommon