mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 11:41:09 +00:00
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.
This commit is contained in:
parent
33701d7899
commit
c68fe0b365
1 changed files with 5 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue