[Spice-commits] src/spice-widget.c src/spice-widget-priv.h

Pavel Grunt pgrunt at kemper.freedesktop.org
Tue Jul 25 10:00:43 UTC 2017


 src/spice-widget-priv.h |    2 ++
 src/spice-widget.c      |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit feb810fa1152c83a7f06b6e3c45db1f039c396f6
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Tue Jul 25 11:29:55 2017 +0200

    Fix build without egl
    
    spice_display_widget_gl_scanout is defined only when building with egl
     ./.libs/libspice-client-gtk-3.0.so: undefined reference to `spice_display_widget_gl_scanout'
    
    Fixes 977db3bb3da94def4c0e1d4087037303d250e158

diff --git a/src/spice-widget-priv.h b/src/spice-widget-priv.h
index ea7ed8e..1189cbb 100644
--- a/src/spice-widget-priv.h
+++ b/src/spice-widget-priv.h
@@ -169,7 +169,9 @@ gboolean spice_egl_update_scanout            (SpiceDisplay *display,
                                               GError **err);
 void     spice_egl_cursor_set                (SpiceDisplay *display);
 
+#ifdef HAVE_EGL
 void     spice_display_widget_gl_scanout     (SpiceDisplay *display);
+#endif
 void     spice_display_widget_update_monitor_area(SpiceDisplay *display);
 
 G_END_DECLS
diff --git a/src/spice-widget.c b/src/spice-widget.c
index 6f4abc0..d5ebd9d 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -616,7 +616,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 static void
 drawing_area_realize(GtkWidget *area, gpointer user_data)
 {
-#ifdef GDK_WINDOWING_X11
+#if defined(GDK_WINDOWING_X11) && defined(HAVE_EGL)
     SpiceDisplay *display = SPICE_DISPLAY(user_data);
 
     if (GDK_IS_X11_DISPLAY(gdk_display_get_default()) &&


More information about the Spice-commits mailing list