소스 검색

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 <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Thomas Petazzoni 7 달 전
부모
커밋
1b9fde0c2b
2개의 변경된 파일4개의 추가작업 그리고 13개의 파일을 삭제
  1. 3 3
      package/links/Config.in
  2. 1 10
      package/links/links.mk

+ 3 - 3
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

+ 1 - 10
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