media: Check for gstreamer verion instead of using cc.links()
authorXavier Claessens <xavier.claessens@collabora.com>
Wed, 1 Sep 2021 12:08:43 +0000 (08:08 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 2 Sep 2021 23:59:41 +0000 (19:59 -0400)
This fix error when gstgl_dep comes from a subproject because in that
case it cannot be used in compiler checks.

modules/media/meson.build

index 1bd91821d8e86d759af35859126c78c74baf2467..d24f84dd869e16aa8820b523aeb62f5c57bdf9f4 100644 (file)
@@ -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'