diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-12-16 14:14:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-03 17:41:16 +0100 |
commit | 5f1f863866a9591604ed782074ee99ef14f08446 (patch) | |
tree | 9801cee899b2edca3859109dbd2a3c2a95250f65 /meta/recipes-gnome/gtk+ | |
parent | aa76de9473f9e63e7bdc5b4c8beaa37e9604acc0 (diff) | |
download | poky-5f1f863866a9591604ed782074ee99ef14f08446.tar.gz |
gtk+: Add PACKAGECONFIG for directfb
* 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
(From OE-Core rev: a9f36bee8ef79ce7c9e3545ab5c854a45c232661)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index dd1fa1b3f8..1c0558c409 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 | |||
14 | DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ | 14 | DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ |
15 | cairo gdk-pixbuf" | 15 | cairo gdk-pixbuf" |
16 | 16 | ||
17 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 17 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
18 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | ||
19 | " | ||
18 | 20 | ||
19 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" | 21 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" |
22 | # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE | ||
23 | PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb" | ||
20 | 24 | ||
21 | inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache | 25 | inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache |
22 | 26 | ||