mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-28 22:41:43 +00:00
Merge branch 'fix-gst-subproject' into 'master'
media: Check for gstreamer verion instead of using cc.links() See merge request GNOME/gtk!3910
This commit is contained in:
commit
c002678085
@ -49,18 +49,10 @@ 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)
|
||||
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
|
||||
endif
|
||||
|
||||
media_backends += 'gstreamer'
|
||||
cdata.set('HAVE_GSTREAMER', 1)
|
||||
|
Loading…
Reference in New Issue
Block a user