From patchwork Mon May 20 11:55:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markos Chandras X-Patchwork-Id: 245006 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 739F12C00A0 for ; Mon, 20 May 2013 21:57:22 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5932CFFC0A; Mon, 20 May 2013 11:57:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ExYOchQJTU0O; Mon, 20 May 2013 11:56:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 917581016D5; Mon, 20 May 2013 11:56: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 2B8AC8F76F for ; Mon, 20 May 2013 11:57:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EF3AC8A911 for ; Mon, 20 May 2013 11:57:17 +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 Dn-PqAzFf1Br for ; Mon, 20 May 2013 11:57:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from multi.imgtec.com (multi.imgtec.com [194.200.65.239]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5C95C88F7B for ; Mon, 20 May 2013 11:57:16 +0000 (UTC) From: Markos Chandras To: Date: Mon, 20 May 2013 12:55:51 +0100 Message-ID: <1369050951-26751-1-git-send-email-markos.chandras@gmail.com> X-Mailer: git-send-email 1.8.2.1 MIME-Version: 1.0 X-SEF-Processed: 7_3_0_01181__2013_05_20_12_57_14 Subject: [Buildroot] [PATCH] directfb: Fix imlib2-config detection and dependencies 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Markos Chandras The configure script will detect the host /usr/bin/imlib2-config if there is one instead of the one in the staging directory. Moreover, directfb uses --enable-imlib2 by default so it needs to depend on the BR2_PACKAGE_IMLIB2. Signed-off-by: Markos Chandras --- Another option would be to make the imlib2 support optional (similar to png support) --- package/directfb/Config.in | 1 + package/directfb/directfb.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/directfb/Config.in b/package/directfb/Config.in index b9ff5f9..dc7ba21 100644 --- a/package/directfb/Config.in +++ b/package/directfb/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DIRECTFB depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_IMLIB2 select BR2_PACKAGE_ZLIB help http://www.directfb.org/ diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 5ead084..034d388 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -10,6 +10,8 @@ DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPLv2.1+ DIRECTFB_LICENSE_FILES = COPYING DIRECTFB_INSTALL_STAGING = YES + +DIRECTFB_CONF_ENV = ac_cv_path_IMLIB2_CONFIG=$(STAGING_DIR)/usr/bin/imlib2-config DIRECTFB_CONF_OPT = \ --localstatedir=/var \ --disable-explicit-deps \ @@ -25,7 +27,7 @@ DIRECTFB_CONF_OPT = \ --without-tools DIRECTFB_CONFIG_SCRIPTS = directfb-config -DIRECTFB_DEPENDENCIES = freetype zlib +DIRECTFB_DEPENDENCIES = freetype imlib2 zlib ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y) DIRECTFB_CONF_OPT += --enable-multi --enable-fusion