diff options
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 4 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index b9b4721780..558bc485ad 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc | |||
@@ -21,9 +21,7 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender | |||
21 | DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native \ | 21 | DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native \ |
22 | cairo gdk-pixbuf" | 22 | cairo gdk-pixbuf" |
23 | 23 | ||
24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 24 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb x11', d)}" |
25 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | ||
26 | " | ||
27 | 25 | ||
28 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" | 26 | PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" |
29 | # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE | 27 | # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE |
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 9c104e28c0..27da844fea 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -40,10 +40,8 @@ do_compile_prepend() { | |||
40 | export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" | 40 | export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" |
41 | } | 41 | } |
42 | 42 | ||
43 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ | 43 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \ |
44 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl", "", d)} \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}" |
45 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ | ||
46 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" | ||
47 | 45 | ||
48 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" | 46 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" |
49 | # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build | 47 | # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build |