summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-12-16 14:14:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:23 +0100
commitb20ba9c4e57b90a0843a4b3ed3670efb6e43023b (patch)
tree6a3f9fdbeed8606bfde02673d81951c6d5ad6b3b /meta/recipes-gnome
parent7f4ff1a5c5403dc2ea15b23c97c90ee6e2b8f79a (diff)
downloadpoky-b20ba9c4e57b90a0843a4b3ed3670efb6e43023b.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: 345b27ac4f7439f8676b4506540b0c1ced75c0db) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 73d624c3d8..5bf0bfe838 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
14DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ 14DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
15 cairo gdk-pixbuf" 15 cairo gdk-pixbuf"
16 16
17PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 17PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
18 ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
19"
18 20
19PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" 21PACKAGECONFIG[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
23PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
20 24
21inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache 25inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache
22 26