From patchwork Sun Jan 6 21:29:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 209826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id C966C2C0084 for ; Mon, 7 Jan 2013 08:33:24 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 86F1F30E91; Sun, 6 Jan 2013 21:33:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Sca5e4-rGe8n; Sun, 6 Jan 2013 21:33:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E507F30F2A; Sun, 6 Jan 2013 21:32:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2F2478F753 for ; Sun, 6 Jan 2013 21:30:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1C72930E5C for ; Sun, 6 Jan 2013 21:30:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v2Lx5ofMjxvp for ; Sun, 6 Jan 2013 21:30:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.32.191]) by silver.osuosl.org (Postfix) with ESMTP id 82FB52D435 for ; Sun, 6 Jan 2013 21:30:31 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id C0BA710F; Sun, 6 Jan 2013 22:30:31 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 744C810F for ; Sun, 6 Jan 2013 22:30:30 +0100 (CET) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sun, 6 Jan 2013 22:29:33 +0100 Message-Id: <649024b2795de3d8ecd6d513362266ca6d879582.1357507764.git.thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 21/28] pango: fix X.org 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net pango is a X client library, so it does not need to depend on the X.org server. So, we replace the server dependency by dependencies on the appropriate libraries. Signed-off-by: Thomas Petazzoni --- package/pango/Config.in | 3 +++ package/pango/pango.mk | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package/pango/Config.in b/package/pango/Config.in index 60e9931..6c8a160 100644 --- a/package/pango/Config.in +++ b/package/pango/Config.in @@ -5,7 +5,10 @@ config BR2_PACKAGE_PANGO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 help Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 7ba53ee..8e0444e 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -41,17 +41,26 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug -PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf libglib2 cairo +PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ + host-pkgconf \ + libglib2 \ + cairo \ + fontconfig \ + freetype ifeq ($(BR2_PACKAGE_XORG7),y) PANGO_CONF_OPT += --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest - PANGO_DEPENDENCIES += xserver_xorg-server + PANGO_DEPENDENCIES += xlib_libX11 else PANGO_CONF_OPT += --without-x endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy) + PANGO_DEPENDENCIES += xlib_libXft xlib_libXrender +endif + define PANGO_INSTALL_INITSCRIPT $(INSTALL) -m 755 -D package/pango/S25pango \ $(TARGET_DIR)/etc/init.d/S25pango