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