From 1b9fde0c2badf0b0c7fe597ad134bac9c465a6a8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 29 Dec 2024 15:55:27 +0100 Subject: [PATCH] package/links: drop directfb support As we're about to remove the DirectFB package, let's drop DirectFB support in links. Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain --- package/links/Config.in | 6 +++--- package/links/links.mk | 11 +---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/package/links/Config.in b/package/links/Config.in index cc2389c9f1..e7fffaf130 100644 --- a/package/links/Config.in +++ b/package/links/Config.in @@ -10,7 +10,7 @@ if BR2_PACKAGE_LINKS config BR2_PACKAGE_LINKS_GRAPHICS bool "use graphics" - depends on BR2_PACKAGE_GPM || BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_GPM || BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBPNG help @@ -18,7 +18,7 @@ config BR2_PACKAGE_LINKS_GRAPHICS Framebuffer output requires GPM (console mouse). Otherwise links will be text-mode only. -comment "links graphics needs GPM, DirectFB or X11" - depends on !BR2_PACKAGE_GPM && !BR2_PACKAGE_DIRECTFB && !BR2_PACKAGE_XORG7 +comment "links graphics needs GPM or X11" + depends on !BR2_PACKAGE_GPM && !BR2_PACKAGE_XORG7 endif diff --git a/package/links/links.mk b/package/links/links.mk index 7ebe3af474..a2833c9514 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -11,6 +11,7 @@ LINKS_DEPENDENCIES = host-pkgconf LINKS_LICENSE = GPL-2.0+ LINKS_LICENSE_FILES = COPYING LINKS_CPE_ID_VENDOR = twibright +LINKS_CONF_OPTS = --without-directfb ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y) LINKS_CONF_OPTS += --enable-graphics @@ -24,16 +25,6 @@ LINKS_DEPENDENCIES += xlib_libXt else LINKS_CONF_OPTS += --without-x endif -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -LINKS_CONF_ENV = ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config -ifeq ($(BR2_STATIC_LIBS),y) -LINKS_CONF_ENV += LIBS=-lstdc++ -endif -LINKS_CONF_OPTS += --with-directfb -LINKS_DEPENDENCIES += directfb -else -LINKS_CONF_OPTS += --without-directfb -endif ifeq ($(BR2_PACKAGE_JPEG),y) LINKS_CONF_OPTS += --with-libjpeg LINKS_DEPENDENCIES += jpeg