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 | 22 |
1 files changed, 11 insertions, 11 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 ab7b659414..cc7edf7607 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,4 +1,4 @@ -From 2d2361f24be1e51201063dbbda570debe8702b6f Mon Sep 17 00:00:00 2001 +From 23a563155406980dfc8cf6f7c2da6cce0ac310f0 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Fri, 16 Oct 2015 16:35:16 +0300 Subject: [PATCH 2/4] Do not try to initialize GL without libGL @@ -15,29 +15,29 @@ before calling epoxy APIs. Upstream-Status: Denied Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + --- - configure.ac | 7 +++++++ + configure.ac | 6 ++++++ gdk/x11/gdkvisual-x11.c | 5 +++++ - 2 files changed, 12 insertions(+) + 2 files changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac -index f43ac09..965eec9 100644 +index 757fd7c..0a48875 100644 --- a/configure.ac +++ b/configure.ac -@@ -346,6 +346,13 @@ AC_ARG_ENABLE(mir-backend, - [enable the Mir gdk backend])], - [backend_set=yes]) - +@@ -351,6 +351,12 @@ AC_ARG_ENABLE(cloudproviders, + [AS_HELP_STRING([--enable-cloudproviders], + [enable libcloudproviders integration])], + [cloudproviders_set=yes]) +AC_ARG_ENABLE(glx, + [AS_HELP_STRING([--enable-glx], + [When enabled Gdk will try to initialize GLX])]) +AS_IF([test "x$enable_glx" != "xno"], [ + AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime]) +]) -+ + if test -z "$backend_set"; then if test "$platform_win32" = yes; then - enable_win32_backend=yes diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index 81479d8..3c8c5c0 100644 --- a/gdk/x11/gdkvisual-x11.c @@ -56,5 +56,5 @@ index 81479d8..3c8c5c0 100644 gint -- -2.12.0 +2.14.1 |