diff options
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch b/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch index cc7edf7607..80dc2d7a05 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 23a563155406980dfc8cf6f7c2da6cce0ac310f0 Mon Sep 17 00:00:00 2001 | 1 | From 6575ab0f0e8c1bba033ad1616511e37a2ec995ff Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Fri, 16 Oct 2015 16:35:16 +0300 | 3 | Date: Fri, 16 Oct 2015 16:35:16 +0300 |
4 | Subject: [PATCH 2/4] Do not try to initialize GL without libGL | 4 | Subject: [PATCH] Do not try to initialize GL without libGL |
5 | 5 | ||
6 | _gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys | 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 | 7 | GLX api which will exit() if libGL.so.1 is not present. We do not |
@@ -22,10 +22,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
22 | 2 files changed, 11 insertions(+) | 22 | 2 files changed, 11 insertions(+) |
23 | 23 | ||
24 | diff --git a/configure.ac b/configure.ac | 24 | diff --git a/configure.ac b/configure.ac |
25 | index 757fd7c..0a48875 100644 | 25 | index e9f5583..bd651bb 100644 |
26 | --- a/configure.ac | 26 | --- a/configure.ac |
27 | +++ b/configure.ac | 27 | +++ b/configure.ac |
28 | @@ -351,6 +351,12 @@ AC_ARG_ENABLE(cloudproviders, | 28 | @@ -346,6 +346,12 @@ AC_ARG_ENABLE(cloudproviders, |
29 | [AS_HELP_STRING([--enable-cloudproviders], | 29 | [AS_HELP_STRING([--enable-cloudproviders], |
30 | [enable libcloudproviders integration])], | 30 | [enable libcloudproviders integration])], |
31 | [cloudproviders_set=yes]) | 31 | [cloudproviders_set=yes]) |
@@ -36,8 +36,8 @@ index 757fd7c..0a48875 100644 | |||
36 | + AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime]) | 36 | + AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime]) |
37 | +]) | 37 | +]) |
38 | 38 | ||
39 | if test -z "$backend_set"; then | 39 | AC_ARG_ENABLE(profiler, |
40 | if test "$platform_win32" = yes; then | 40 | [AS_HELP_STRING([--enable-profiler], |
41 | diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c | 41 | diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c |
42 | index 81479d8..3c8c5c0 100644 | 42 | index 81479d8..3c8c5c0 100644 |
43 | --- a/gdk/x11/gdkvisual-x11.c | 43 | --- a/gdk/x11/gdkvisual-x11.c |
@@ -55,6 +55,3 @@ index 81479d8..3c8c5c0 100644 | |||
55 | } | 55 | } |
56 | 56 | ||
57 | gint | 57 | gint |
58 | -- | ||
59 | 2.14.1 | ||
60 | |||