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 | |
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')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch b/meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch new file mode 100644 index 0000000000..c8c480c5eb --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/Do-not-try-to-initialize-GL-without-libGL.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From fc22058a10db913534f11348f86681fe9e1838e5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Fri, 16 Oct 2015 16:35:16 +0300 | ||
4 | Subject: [PATCH] Do not try to initialize GL without libGL | ||
5 | |||
6 | _gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys | ||
7 | GLX api which will exit() if libGL.so.1 is not present. We do not | ||
8 | want that to happen and we don't want every app to have to set | ||
9 | "GDK_GL=disabled" environment variable: so use #ifdef set based on | ||
10 | opengl distro feature. | ||
11 | |||
12 | Upstream is not interested in the fix as it is: Either epoxy should be | ||
13 | fixed (to not exit) or GTK+ possibly could do some additional probing | ||
14 | before calling epoxy APIs. | ||
15 | |||
16 | Upstream-Status: Denied | ||
17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
18 | --- | ||
19 | configure.ac | 7 +++++++ | ||
20 | gdk/x11/gdkvisual-x11.c | 5 +++++ | ||
21 | 2 files changed, 12 insertions(+) | ||
22 | |||
23 | diff --git a/configure.ac b/configure.ac | ||
24 | index 729a62e..58cc1ac 100644 | ||
25 | --- a/configure.ac | ||
26 | +++ b/configure.ac | ||
27 | @@ -328,6 +328,13 @@ AC_ARG_ENABLE(mir-backend, | ||
28 | [enable the Mir gdk backend])], | ||
29 | [backend_set=yes]) | ||
30 | |||
31 | +AC_ARG_ENABLE(glx, | ||
32 | + [AS_HELP_STRING([--enable-glx], | ||
33 | + [When enabled Gdk will try to initialize GLX])]) | ||
34 | +AS_IF([test "x$enable_glx" != "xno"], [ | ||
35 | + AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime]) | ||
36 | +]) | ||
37 | + | ||
38 | if test -z "$backend_set"; then | ||
39 | if test "$platform_win32" = yes; then | ||
40 | enable_win32_backend=yes | ||
41 | diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c | ||
42 | index f3b062d..c8243f4 100644 | ||
43 | --- a/gdk/x11/gdkvisual-x11.c | ||
44 | +++ b/gdk/x11/gdkvisual-x11.c | ||
45 | @@ -345,7 +345,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) | ||
46 | /* If GL is available we want to pick better default/rgba visuals, | ||
47 | as we care about glx details such as alpha/depth/stencil depth, | ||
48 | stereo and double buffering */ | ||
49 | + /* update_visuals_for_gl() will end up calling epoxy GLX api which | ||
50 | + will exit if libgl is not there: so only do this if we know GL | ||
51 | + is available */ | ||
52 | +#ifdef HAVE_GLX | ||
53 | _gdk_x11_screen_update_visuals_for_gl (screen); | ||
54 | +#endif | ||
55 | } | ||
56 | |||
57 | gint | ||
58 | -- | ||
59 | 2.1.4 | ||
60 | |||