From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.pbcl.net ([88.198.119.4] helo=hetzner.pbcl.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QruCN-0007bY-Fk for openembedded-core@lists.openembedded.org; Fri, 12 Aug 2011 18:03:03 +0200 Received: from elite.brightsigndigital.co.uk ([81.142.160.137] helo=[172.30.1.145]) by hetzner.pbcl.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Qru81-0000fo-04 for openembedded-core@lists.openembedded.org; Fri, 12 Aug 2011 17:58:33 +0200 From: Phil Blundell To: oe-core Date: Fri, 12 Aug 2011 16:58:32 +0100 X-Mailer: Evolution 3.0.2- Message-ID: <1313164713.6733.164.camel@phil-desktop> Mime-Version: 1.0 Subject: [PATCH] cairo: only use x11 if selected in DISTRO_FEATURES X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Aug 2011 16:03:03 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit This makes it possible to build cairo-using apps without X11. Signed-off-by: Phil Blundell --- meta/recipes-graphics/cairo/cairo.inc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 72aaa03..c983a89 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -10,10 +10,11 @@ HOMEPAGE = "http://cairographics.org" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" LICENSE = "MPL-1 & LGPLv2.1" -DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman glib-2.0" +X11DEPENDS = "virtual/libx11 libsm libxrender" +DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require cairo-fpu.inc -EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" +EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" inherit autotools pkgconfig -- 1.7.4.1