From patchwork Mon Oct 15 16:44:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 191597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 48B102C00B9 for ; Tue, 16 Oct 2012 03:44:02 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 23DC2A0374; Mon, 15 Oct 2012 16:44:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9xq8yp8l1cr3; Mon, 15 Oct 2012 16:43:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BCFF4A0363; Mon, 15 Oct 2012 16:43:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3A7DF8F74A for ; Mon, 15 Oct 2012 16:44:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4C6C882499 for ; Mon, 15 Oct 2012 16:43:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BOEPU-TBnH8H for ; Mon, 15 Oct 2012 16:43:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id D13068209D for ; Mon, 15 Oct 2012 16:43:55 +0000 (UTC) Received: by mail-la0-f43.google.com with SMTP id i5so4407957lah.16 for ; Mon, 15 Oct 2012 09:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=A2YAc2JgmCdiCWrRkeyRBzTUAAyU4C/3/kGviVr8CNQ=; b=F4foBBrWrmG+p+yQINOXW5tl7LSjuf87QauBXLubMIKaxJaa4RpFV5yBT+X8nmkrwK 7j+AS3XT2K19J9YCJIw+tzAMMgKpLB5YCaVQmPXp767VPQo6Rp+nMRGJT9FbRISZIVgx veKlL8KE0qso7KcNTwAtDpPXTXcXwKm+sXDPOo4M2MtoLTgFv8mWpRjLbHh04kbFLHw7 J1NUdf3WDsRx6s1ddqTT7CRQauHCcJXYBCaqv60JeFeYYCEHp7Y/NxAlSOOWgIY07gyJ gAtqOC2UgWoCHEoWbkDuAkwmI/LkQSAFvaP/RZty2k6T9a6Dv/q5rYA+zRLp9BP82Or9 WmRQ== Received: by 10.152.148.195 with SMTP id tu3mr10241825lab.16.1350319433777; Mon, 15 Oct 2012 09:43:53 -0700 (PDT) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPS id hu6sm4714345lab.13.2012.10.15.09.43.52 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 09:43:53 -0700 (PDT) From: Valentine Barshak To: buildroot@busybox.net Date: Mon, 15 Oct 2012 20:44:58 +0400 Message-Id: <1350319498-28551-1-git-send-email-gvaxon@gmail.com> X-Mailer: git-send-email 1.7.11.7 Subject: [Buildroot] [PATCH] links: Enable graphics for X11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Graphics can be enabled for X11 as well. Do not select DirectFB for graphics, set DirectFB or X11 dependencies instead. Signed-off-by: Valentine Barshak --- package/links/Config.in | 8 ++++---- package/links/links.mk | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/package/links/Config.in b/package/links/Config.in index fddf3d2..474aa6a 100644 --- a/package/links/Config.in +++ b/package/links/Config.in @@ -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. diff --git a/package/links/links.mk b/package/links/links.mk index 9dbf0ad..857343b 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -6,13 +6,24 @@ LINKS_VERSION = 2.5 LINKS_SITE = http://links.twibright.com/download -LINKS_CONF_OPT = --without-x LINKS_DEPENDENCIES = host-pkg-config 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