[gtk/backports-for-4-4: 18/19] media: Check for gstreamer verion instead of using cc.links()
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/backports-for-4-4: 18/19] media: Check for gstreamer verion instead of using cc.links()
- Date: Thu, 2 Sep 2021 23:11:44 +0000 (UTC)
commit f0e29090ffae911271133e56d8a6ae0e2d058578
Author: Xavier Claessens <xavier claessens collabora com>
Date: Wed Sep 1 08:08:43 2021 -0400
media: Check for gstreamer verion instead of using cc.links()
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 | 14 +++-----------
1 file 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'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]