From patchwork Sat Jan 19 10:40:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 213821 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 EF5FE2C007B for ; Sat, 19 Jan 2013 21:41:09 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 95272A0049; Sat, 19 Jan 2013 10:41:10 +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 LfaqujECHSel; Sat, 19 Jan 2013 10:41:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EC2AFA004A; Sat, 19 Jan 2013 10:41:07 +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 1A6D18F74B for ; Sat, 19 Jan 2013 10:41:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6C8932F5F2 for ; Sat, 19 Jan 2013 10:41:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Zpu1M3tcMQyL for ; Sat, 19 Jan 2013 10:40:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by silver.osuosl.org (Postfix) with ESMTP id D846729D05 for ; Sat, 19 Jan 2013 10:40:58 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id D7ABE6669; Sat, 19 Jan 2013 11:40:56 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 34C12EF8 for ; Sat, 19 Jan 2013 11:40:56 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sat, 19 Jan 2013 11:40:54 +0100 Message-Id: <1358592054-2428-2-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358592054-2428-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1358592054-2428-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH v2 2/2] cairo: add missing dependency on xlib_libXext 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 The X.org backend of Cairo now requires xlib_libXext. See http://permalink.gmane.org/gmane.comp.lib.cairo/23385. Fixes: http://autobuild.buildroot.org/results/795404665ec74a7ac929fdf8caf1397c9c54d80d/build-end.log Signed-off-by: Thomas Petazzoni --- Changes since v1: * Added a select on XLIB_LIBXEXT, as requested by Peter. --- 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 89bd315..9a177a7 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_CAIRO select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT 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 ab0615c..83c82c0 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -51,7 +51,7 @@ endif ifeq ($(BR2_PACKAGE_XORG7),y) CAIRO_CONF_OPT += --enable-xlib --enable-xcb --with-x - CAIRO_DEPENDENCIES += xlib_libX11 + CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext else CAIRO_CONF_OPT += --disable-xlib --disable-xcb --without-x endif