diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2019-01-22 12:52:25 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2019-01-22 13:09:22 +0000 |
| commit | e87fb02c151aaf6da0a3a97928c531240e8800a5 (patch) | |
| tree | 6f43db8414222ac57385bd62a010f04f756e72db | |
| parent | 982f839486fba2536cd21fc45d0f65b6fcfcc3ea (diff) | |
| download | gstreamer-plugins-bad-e87fb02c151aaf6da0a3a97928c531240e8800a5.tar.gz | |
meson: fix opengl build against -base built with autotools
Detect opengl api from -base .pc files correctly.
There was a mismatch between the .pc files generated by
autotools and by meson that would lead to meson not detecting
that opengl api is available even though it is. This could
lead to build failures when building -bad with meson against
a -base that was built with autotools. The mismatch has now
been rectified but we will still check the old one for backwards
compatibility.
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/871
| -rw-r--r-- | ext/gl/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ext/gl/meson.build b/ext/gl/meson.build index 90a4bdbcb..7f474e938 100644 --- a/ext/gl/meson.build +++ b/ext/gl/meson.build @@ -12,7 +12,7 @@ if build_gstgl and gstgl_dep.found() optional_deps = [] opengl_defines = ['-DGST_USE_UNSTABLE_API'] # for videoaggregator - if gst_gl_have_api_opengl # have desktop GL + if gst_gl_have_api_gl # have desktop GL opengl_sources += [ 'gstglmosaic.c', ] diff --git a/meson.build b/meson.build index 3a7f59d2e..3846531ec 100644 --- a/meson.build +++ b/meson.build @@ -410,8 +410,12 @@ if build_gstgl set_variable('gst_gl_have_platform_@0@'.format(p), gst_gl_platforms.contains(p)) endforeach - foreach api : ['opengl', 'gles2'] + foreach api : ['gl', 'gles2'] set_variable('gst_gl_have_api_@0@'.format(api), gst_gl_apis.contains(api)) + # temporary backwards compat for older meson-generated .pc file with 'opengl' instead of 'gl' + if gst_gl_apis.contains('opengl') + gst_gl_have_api_gl = true + endif endforeach endif |