Re: [PATCH] gtk+: Add PACKAGECONFIG for directfb

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1747 bytes --]

On Mon, Dec 16, 2013 at 02:15:25PM +0100, Martin Jansa wrote:
> * building without x11 doesn't work, because it sets default
>   gdkbackend to x11 and then requires cairo-xlib to be available
> * checking for CAIRO_BACKEND... no
>   configure: error: Package requirements (cairo-xlib >= 1.6) were not met:
> 
>   No package 'cairo-xlib' found

I've just noticed that this was merged into daisy branch, can we please
get it in master as well?

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-gnome/gtk+/gtk+.inc | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
> index 73d624c..5bf0bfe 100644
> --- a/meta/recipes-gnome/gtk+/gtk+.inc
> +++ b/meta/recipes-gnome/gtk+/gtk+.inc
> @@ -14,9 +14,13 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender
>  DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
>   cairo gdk-pixbuf"
>  
> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
> +           ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
> +"
>  
>  PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
> +# without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE
> +PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
>  
>  inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache
>  
> -- 
> 1.8.4.3
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]