Commit 3c592cb4 authored by Valentine Barshak's avatar Valentine Barshak Committed by Peter Korsgaard
Browse files

links: Enable graphics for X11 



Graphics can be enabled for X11 as well.
Do not select DirectFB for graphics,
set DirectFB or X11 dependencies instead.

Signed-off-by: default avatarValentine Barshak <gvaxon@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 7f483c36

package/links/Config.in

+4 −4
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ config BR2_PACKAGE_LINKS 
	  http://links.twibright.com/



config BR2_PACKAGE_LINKS_GRAPHICS

	bool "use graphics (directfb)"

	depends on BR2_PACKAGE_LINKS

	select BR2_PACKAGE_DIRECTFB

	bool "use graphics"

	depends on BR2_PACKAGE_LINKS && (BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7)

	select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_LIBPNG

	help

	  Enable graphics output.

	  Enable graphics output for DirectFB or X11.

	  Otherwise links will be text-mode only.

package/links/links.mk

+13 −2
Original line number Diff line number Diff line
@@ -6,13 +6,24 @@ 


LINKS_VERSION = 2.5

LINKS_SITE = http://links.twibright.com/download

LINKS_CONF_OPT = --without-x

LINKS_DEPENDENCIES = host-pkgconf



ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)

LINKS_CONF_OPT += --enable-graphics

LINKS_DEPENDENCIES += libpng

ifeq ($(BR2_PACKAGE_XLIB_LIBXT),y)

LINKS_CONF_OPT += --with-x

LINKS_DEPENDENCIES += xlib_libXt

else

LINKS_CONF_OPT += --without-x

endif

ifeq ($(BR2_PACKAGE_DIRECTFB),y)

LINKS_CONF_ENV = ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config

LINKS_DEPENDENCIES += directfb libpng

LINKS_CONF_OPT += --with-directfb

LINKS_DEPENDENCIES += directfb

else

LINKS_CONF_OPT += --without-directfb

endif

ifeq ($(BR2_PACKAGE_JPEG),y)

LINKS_DEPENDENCIES += jpeg

endif