diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2021-09-06 12:00:10 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2021-10-04 18:16:08 +0800 |
| commit | d58758ec779eea1b6af3fedbf7ed98b4a7e4844b (patch) | |
| tree | a1eeeeaf99fdac56dfc3d8a29056795a2e071948 | |
| parent | 6912445a26c80ceb1ea84cb81073f75354dc0065 (diff) | |
| download | gtk+-win32.fixes.4-4.tar.gz | |
Revert "media: Check for gstreamer verion instead of using cc.links()"win32.fixes.4-4
Revert temporarily until gstreamer 1.20 is released.
This reverts commit 2c060663cf0821de8b75b7a48ea46e66d4243777.
| -rw-r--r-- | modules/media/meson.build | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/modules/media/meson.build b/modules/media/meson.build index d24f84dd86..1bd91821d8 100644 --- a/modules/media/meson.build +++ b/modules/media/meson.build @@ -49,9 +49,17 @@ 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' 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' + 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 endif media_backends += 'gstreamer' |