Patchwork cairo: only use x11 if selected in DISTRO_FEATURES

login
register
mail settings
Submitter Phil Blundell
Date Aug. 12, 2011, 3:58 p.m.
Message ID <1313164713.6733.164.camel@phil-desktop>
Download mbox | patch
Permalink /patch/9781/
State New, archived
Headers show

Comments

Phil Blundell - Aug. 12, 2011, 3:58 p.m.
This makes it possible to build cairo-using apps without X11.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-graphics/cairo/cairo.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Saul Wold - Aug. 15, 2011, 5:07 p.m.
On 08/12/2011 08:58 AM, Phil Blundell wrote:
> This makes it possible to build cairo-using apps without X11.
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
>   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

Merged into OE Core

Thanks
	Sau!

Patch

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