[Spice-devel] [PATCH spice-gtk] Fix build without egl

[Marc-André Lureau]

----- Original Message -----
> 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'
> ---
>  src/spice-widget-priv.h | 2 ++
>  src/spice-widget.c      | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> 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()) &&
> --

ack (fixes for 977db3bb)

> 2.13.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
>