diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-05-06 01:30:57 -0700 |
|---|---|---|
| committer | Robert Yang <liezhi.yang@windriver.com> | 2015-09-15 19:21:04 -0700 |
| commit | 90e4a1064ea7dfa9be458d306bba765136b50306 (patch) | |
| tree | 6360a26fb9f3b1f67619de98bb6af01301425b61 | |
| parent | f0189829498e30231d826c9f55aad73e622d076e (diff) | |
| download | openembedded-core-contrib-90e4a1064ea7dfa9be458d306bba765136b50306.tar.gz | |
gtk+/cairo: enable x11 or directfb
The gtk+2 requires whether x11 or directfb to build, so we need enable
either of them. The cairo can be built without x11 or directfb, but gtk+
requires cairo, so enable x11 or directfb for cairo, too.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-graphics/cairo/cairo.inc | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index be5273d620..9d697cdb0d 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -17,9 +17,8 @@ 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 ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ -" +# Requires x11 or directfb +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '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 diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 1e45318dde..f6474bce08 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -17,8 +17,12 @@ LICENSE_${PN}-perf-utils = "GPLv3+" X11DEPENDS = "virtual/libx11 libsm libxrender libxext" DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" +# Build cairo-xlib or cairo-directfb for gtk+ +PACKAGECONFIG ??= " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', 'directfb', d)} \ + " + +# No directfb-native, so set PACKAGECONFIG to null when no x11 +PACKAGECONFIG_class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" |