From c68fe0b365714fd843f31786fae773325d600328 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 22 Jan 2019 12:52:25 +0000 Subject: [PATCH] meson: 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. --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 6aa6659..4cb1b20 100644 --- a/meson.build +++ b/meson.build @@ -307,8 +307,12 @@ if gstgl_dep.found() 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 -- 2.7.4