<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On 17 June 2016 at 22:37, Jussi Kukkonen <span dir="ltr"><<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Always run the Makefile rule that modifies gdkx.h (for opengl<br>
disabling), but only do the modification if the file is not<br>
correct already.<br></blockquote><div><br></div><div>Please don't take this patch: I'll include it in a bigger update.</div><div><br></div><div>The qemu patch (2/2) is still good.</div><div><br></div><div>Thanks,<br></div><div> Jussi</div><div> </div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>><br>
---<br>
.../0001-Add-disable-opengl-configure-option.patch | 19 ++++++++++---------<br>
1 file changed, 10 insertions(+), 9 deletions(-)<br>
<br>
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch<br>
index a963334..2306614 100644<br>
--- a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch<br>
+++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch<br>
@@ -1,4 +1,4 @@<br>
-From c77afa19881d955d759879aeae8bbd88613dd4fe Mon Sep 17 00:00:00 2001<br>
+From 91814d22387370e47384206e67729a26a5729192 Mon Sep 17 00:00:00 2001<br>
From: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>><br>
Date: Thu, 16 Jun 2016 15:11:34 +0300<br>
Subject: [PATCH] Add --disable-opengl configure option<br>
@@ -28,7 +28,7 @@ Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>><br>
gdk/gdkgl.c | 10 +++++++<br>
gdk/gdkglcontext.c | 6 ++++<br>
gdk/gdkwindow.c | 14 +++++++++-<br>
- gdk/x11/Makefile.am | 28 ++++++++++++++++---<br>
+ gdk/x11/Makefile.am | 29 ++++++++++++++++---<br>
gdk/x11/gdkdisplay-x11.c | 6 ++--<br>
gdk/x11/gdkscreen-x11.c | 5 ++++<br>
gdk/x11/gdkwindow-x11.c | 4 +++<br>
@@ -41,7 +41,7 @@ Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>><br>
gtk/inspector/general.c | 6 ++++<br>
tests/Makefile.am | 10 +++++--<br>
testsuite/gtk/objects-finalize.c | 2 ++<br>
- 21 files changed, 257 insertions(+), 78 deletions(-)<br>
+ 21 files changed, 258 insertions(+), 78 deletions(-)<br>
create mode 100644 gdk/x11/gdkx-with-gl-context.h<br>
create mode 100644 gdk/x11/gdkx-without-gl-context.h<br>
delete mode 100644 gdk/x11/gdkx.h<br>
@@ -412,7 +412,7 @@ index c34c113..3025e96 100644<br>
cairo_region_destroy (opaque_region);<br>
<br>
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am<br>
-index c488a31..d0aa7ce 100644<br>
+index c488a31..576f8e1 100644<br>
--- a/gdk/x11/Makefile.am<br>
+++ b/gdk/x11/Makefile.am<br>
@@ -39,8 +39,6 @@ libgdk_x11_la_SOURCES = \<br>
@@ -424,7 +424,7 @@ index c488a31..d0aa7ce 100644<br>
gdkkeys-x11.c \<br>
gdkmain-x11.c \<br>
gdkproperty-x11.c \<br>
-@@ -53,14 +51,30 @@ libgdk_x11_la_SOURCES = \<br>
+@@ -53,14 +51,31 @@ libgdk_x11_la_SOURCES = \<br>
gdkwindow-x11.h \<br>
gdkxftdefaults.c \<br>
gdkxid.c \<br>
@@ -449,14 +449,15 @@ index c488a31..d0aa7ce 100644<br>
+endif<br>
+<br>
+BUILT_SOURCES = gdkx.h<br>
-+<br>
++.PHONY: gdkx.h<br>
+gdkx.h:<br>
-+ $(AM_V_GEN) cd $(srcdir) && cp $(GDKX_HEADER) gdkx.h<br>
++ $(AM_V_GEN) cd $(srcdir) \<br>
++ && (cmp -s $(GDKX_HEADER) gdkx.h || cp $(GDKX_HEADER) gdkx.h )<br>
+<br>
libgdkx11include_HEADERS = \<br>
gdkx-autocleanups.h \<br>
gdkx11applaunchcontext.h \<br>
-@@ -74,7 +88,6 @@ libgdkx11include_HEADERS = \<br>
+@@ -74,7 +89,6 @@ libgdkx11include_HEADERS = \<br>
gdkx11display.h \<br>
gdkx11displaymanager.h \<br>
gdkx11dnd.h \<br>
@@ -464,7 +465,7 @@ index c488a31..d0aa7ce 100644<br>
gdkx11keys.h \<br>
gdkx11property.h \<br>
gdkx11screen.h \<br>
-@@ -83,9 +96,16 @@ libgdkx11include_HEADERS = \<br>
+@@ -83,9 +97,16 @@ libgdkx11include_HEADERS = \<br>
gdkx11visual.h \<br>
gdkx11window.h<br>
<span><font color="#888888"><br>
--<br>
2.1.4<br>
<br>
</font></span></blockquote></div><br></div></div>