diff options
| author | Matthew Waters <matthew@centricular.com> | 2015-09-10 00:07:18 +1000 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2015-09-10 13:11:06 +1000 |
| commit | 38d360675c450ca8f89af6c42d1d0a2e85434437 (patch) | |
| tree | 89a34502e7bd074b82b7738602ea8608812c0f3d /ext/gtk | |
| parent | 85745d2f639009f4e4519f09c1fd564891cd9173 (diff) | |
| download | gstreamer-plugins-bad-38d360675c450ca8f89af6c42d1d0a2e85434437.tar.gz | |
gtk, qt: more specifically define the compile time requirements
Otherwise we could include headers/configurations that will
never been installed.
https://bugzilla.gnome.org/show_bug.cgi?id=754732
Diffstat (limited to 'ext/gtk')
| -rw-r--r-- | ext/gtk/gtkgstglwidget.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/gtk/gtkgstglwidget.c b/ext/gtk/gtkgstglwidget.c index 79599b46f..164fca336 100644 --- a/ext/gtk/gtkgstglwidget.c +++ b/ext/gtk/gtkgstglwidget.c @@ -27,13 +27,13 @@ #include "gtkgstglwidget.h" #include <gst/video/video.h> -#if GST_GL_HAVE_WINDOW_X11 && defined (GDK_WINDOWING_X11) +#if GST_GL_HAVE_WINDOW_X11 && GST_GL_HAVE_PLATFORM_GLX && defined (GDK_WINDOWING_X11) #include <gdk/gdkx.h> #include <gst/gl/x11/gstgldisplay_x11.h> #include <gst/gl/x11/gstglcontext_glx.h> #endif -#if GST_GL_HAVE_WINDOW_WAYLAND && defined (GDK_WINDOWING_WAYLAND) +#if GST_GL_HAVE_WINDOW_WAYLAND && GST_GL_HAVE_PLATFORM_EGL && defined (GDK_WINDOWING_WAYLAND) #include <gdk/gdkwayland.h> #include <gst/gl/wayland/gstgldisplay_wayland.h> #endif @@ -418,13 +418,13 @@ gtk_gst_gl_widget_init (GtkGstGLWidget * gst_widget) display = gdk_display_get_default (); -#if GST_GL_HAVE_WINDOW_X11 && defined (GDK_WINDOWING_X11) +#if GST_GL_HAVE_WINDOW_X11 && GST_GL_HAVE_PLATFORM_GLX && defined (GDK_WINDOWING_X11) if (GDK_IS_X11_DISPLAY (display)) priv->display = (GstGLDisplay *) gst_gl_display_x11_new_with_display (gdk_x11_display_get_xdisplay (display)); #endif -#if GST_GL_HAVE_WINDOW_WAYLAND && defined (GDK_WINDOWING_WAYLAND) +#if GST_GL_HAVE_WINDOW_WAYLAND && GST_GL_HAVE_PLATFORM_EGL && defined (GDK_WINDOWING_WAYLAND) if (GDK_IS_WAYLAND_DISPLAY (display)) { struct wl_display *wayland_display = gdk_wayland_display_get_wl_display (display); @@ -468,7 +468,7 @@ _get_gl_context (GtkGstGLWidget * gst_widget) gdk_gl_context_make_current (priv->gdk_context); -#if GST_GL_HAVE_WINDOW_X11 && defined (GDK_WINDOWING_X11) +#if GST_GL_HAVE_WINDOW_X11 && GST_GL_HAVE_PLATFORM_GLX && defined (GDK_WINDOWING_X11) if (GST_IS_GL_DISPLAY_X11 (priv->display)) { platform = GST_GL_PLATFORM_GLX; gl_api = gst_gl_context_get_current_gl_api (platform, NULL, NULL); @@ -479,7 +479,7 @@ _get_gl_context (GtkGstGLWidget * gst_widget) platform, gl_api); } #endif -#if GST_GL_HAVE_WINDOW_WAYLAND && defined (GDK_WINDOWING_WAYLAND) +#if GST_GL_HAVE_WINDOW_WAYLAND && GST_GL_HAVE_PLATFORM_EGL && defined (GDK_WINDOWING_WAYLAND) if (GST_IS_GL_DISPLAY_WAYLAND (priv->display)) { platform = GST_GL_PLATFORM_EGL; gl_api = gst_gl_context_get_current_gl_api (platform, NULL, NULL); |