diff options
author | Alistair Francis <alistair@alistair23.me> | 2020-02-23 12:24:53 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-25 10:41:22 +0000 |
commit | 1a5a9d2f03834d0adefdd240b045152a65694c0e (patch) | |
tree | f6fa9cd695e4d15cc604b6c1e8e48a275fe8c594 /meta | |
parent | 5ba5aad01c1aec7010f6d6befaf8c5a855a76c5a (diff) | |
download | poky-1a5a9d2f03834d0adefdd240b045152a65694c0e.tar.gz |
clutter: Build cluter with the GDK backend
ClutterActors can crash with strange segfaults when built without the GDK
backend but run ontop of GDK. To fix this let's add a PACKAGECONFIG to
enable/disable GDK backend support and enable it by default.
(From OE-Core rev: cb03ccec2926eae6d8eaf1606a7d11fcc54f1820)
Signed-off-by: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.0.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 5dc45ebf21..e0ac819e4c 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc | |||
@@ -24,11 +24,11 @@ ERDEPENDS_EVDEV = "xkeyboard-config" | |||
24 | # Disable pretty much everything, override in platform specific set up | 24 | # Disable pretty much everything, override in platform specific set up |
25 | EXTRA_OECONF += "--disable-quartz-backend \ | 25 | EXTRA_OECONF += "--disable-quartz-backend \ |
26 | --disable-win32-backend \ | 26 | --disable-win32-backend \ |
27 | --disable-gdk-backend \ | ||
28 | --disable-cex100-backend \ | 27 | --disable-cex100-backend \ |
29 | --disable-tslib-input \ | 28 | --disable-tslib-input \ |
30 | " | 29 | " |
31 | 30 | ||
31 | PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3" | ||
32 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" | 32 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" |
33 | PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" | 33 | PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" |
34 | PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" | 34 | PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" |
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${E | |||
37 | PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" | 37 | PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" |
38 | 38 | ||
39 | # Default configuration, distros might want to override | 39 | # Default configuration, distros might want to override |
40 | PACKAGECONFIG ??= "egl \ | 40 | PACKAGECONFIG ??= "egl gdk \ |
41 | ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ | 41 | ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ |
42 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" | 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" |
43 | 43 | ||