diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-10-21 16:25:31 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-27 07:24:26 +0000 |
commit | 48443ccd93d0406ebfe627b98ac9283f6767c1dd (patch) | |
tree | 0326914f0aa85ad9367c08be270accd3c4756315 /meta/recipes-gnome/gtk+/gtk+3.inc | |
parent | 59fdbaed99c9807ee943c4679d9115fe43fc7e2a (diff) | |
download | poky-48443ccd93d0406ebfe627b98ac9283f6767c1dd.tar.gz |
gtk+3: Do not try to initialize GL without libgl
Gdk initialization ends up calling epoxy GLX api, which calls exit()
if libGL.so.1 is not present. In practice this prevents all GTK+
applications from starting if GLX is not present.
If opengl and x11 distro features are set, make gtk+3 RDEPEND on libgl.
If opengl and x11 distro features are not set, use #ifdef to prevent
the GL initialization.
Remove libgl dependency from gtk3-demo: it can now run without
libgl (although trying to run the glarea demo will exit in that case).
[YOCTO #8529]
(From OE-Core rev: f9540f50ea661e260ec2b82436238cfb989e23c5)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3.inc')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 54f84fcbd2..22a40d8f05 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -32,9 +32,11 @@ EXTRA_OECONF += " \ | |||
32 | " | 32 | " |
33 | 33 | ||
34 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ | 34 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ |
35 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ | ||
35 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" | 36 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" |
36 | 37 | ||
37 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" | 38 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" |
39 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" | ||
38 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon virtual/mesa" | 40 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon virtual/mesa" |
39 | 41 | ||
40 | do_install_append() { | 42 | do_install_append() { |
@@ -57,7 +59,7 @@ FILES_${PN}-demo = "${bindir}/gtk3-demo \ | |||
57 | 59 | ||
58 | # The demo uses PNG files and mime type sniffing, so ensure that these | 60 | # The demo uses PNG files and mime type sniffing, so ensure that these |
59 | # dependencies are present. | 61 | # dependencies are present. |
60 | RDEPENDS_${PN}-demo += "gdk-pixbuf-loader-png shared-mime-info libgl" | 62 | RDEPENDS_${PN}-demo += "gdk-pixbuf-loader-png shared-mime-info" |
61 | 63 | ||
62 | FILES_${PN} = "${bindir}/gtk-update-icon-cache-3.0 \ | 64 | FILES_${PN} = "${bindir}/gtk-update-icon-cache-3.0 \ |
63 | ${bindir}/gtk-query-immodules-3.0 \ | 65 | ${bindir}/gtk-query-immodules-3.0 \ |