From patchwork Sun Jan 6 21:29:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 209816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 9080F2C007E for ; Mon, 7 Jan 2013 08:32:03 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8A4258C2AB; Sun, 6 Jan 2013 21:32:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eGzH7CQjSw7w; Sun, 6 Jan 2013 21:31:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 76EFF8C2D7; Sun, 6 Jan 2013 21:31:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 48ECD8F753 for ; Sun, 6 Jan 2013 21:30:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3D5B3A0121 for ; Sun, 6 Jan 2013 21:30:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PM61w-vUVE4m for ; Sun, 6 Jan 2013 21:30:17 +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 hemlock.osuosl.org (Postfix) with ESMTP id 600F5A00BF for ; Sun, 6 Jan 2013 21:30:17 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 8DEE7161; Sun, 6 Jan 2013 22:30:16 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 5601A10F for ; Sun, 6 Jan 2013 22:30:15 +0100 (CET) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sun, 6 Jan 2013 22:29:25 +0100 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 13/28] cairo: do not depend on xserver-xorg_server, but on the right library 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 cairo is a X client library, so there is no reason for it to build depend on the X.org server. What Cairo needs is the xlib_libX11 library. Signed-off-by: Thomas Petazzoni --- package/cairo/Config.in | 1 + package/cairo/cairo.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 398e47f..4a2078e 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_CAIRO bool "cairo" select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 help Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 59a032a..41e876a 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -49,7 +49,7 @@ endif ifeq ($(BR2_PACKAGE_XORG7),y) CAIRO_CONF_OPT += --enable-xlib --with-x - CAIRO_DEPENDENCIES += xserver_xorg-server + CAIRO_DEPENDENCIES += xlib_libX11 else CAIRO_CONF_OPT += --disable-xlib --without-x endif