diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-09-02 01:33:06 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-09-02 01:33:06 +0000 |
| commit | c002678085ee2f155b585b7b797a823a991a4b4c (patch) | |
| tree | d83e99aa73aee7e7e52d9c2ae03c0d068143c758 | |
| parent | 486cffc36125a5497139b05a3ef5d340ca46c139 (diff) | |
| parent | 2c060663cf0821de8b75b7a48ea46e66d4243777 (diff) | |
| download | gtk+-c002678085ee2f155b585b7b797a823a991a4b4c.tar.gz | |
Merge branch 'fix-gst-subproject' into 'master'
media: Check for gstreamer verion instead of using cc.links()
See merge request GNOME/gtk!3910
| -rw-r--r-- | modules/media/meson.build | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/modules/media/meson.build b/modules/media/meson.build index 1bd91821d8..d24f84dd86 100644 --- a/modules/media/meson.build +++ b/modules/media/meson.build @@ -49,17 +49,9 @@ gstgl_dep = dependency('gstreamer-gl-1.0', version: '>= 1.12.3', if gstplayer_dep.found() and gstgl_dep.found() extra_win_cflags = [] - if host_machine.system() == 'windows' - new_gst_gl_display_code = \ - '''#include <gst/gl/gstgldisplay.h> - int main (int a, char ** g) { - GstGLDisplay *d = gst_gl_display_new_with_type (GST_GL_DISPLAY_TYPE_WIN32); - return 0; - }''' - if cc.links(new_gst_gl_display_code, dependencies : gstgl_dep) - message('libgstgl has gst_gl_display_new_with_type()') - extra_win_cflags += '-DHAVE_GST_GL_DISPLAY_NEW_WITH_TYPE' - endif + if host_machine.system() == 'windows' and gstgl_dep.version().version_compare('>=1.19.1') + message('libgstgl has gst_gl_display_new_with_type()') + extra_win_cflags += '-DHAVE_GST_GL_DISPLAY_NEW_WITH_TYPE' endif media_backends += 'gstreamer' |