From ca868332f1903598de8fbca5873961d1d4868e58 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Tue, 11 Jul 2023 21:41:46 +0200 Subject: [PATCH] gl: Take into account viv-fb vs. viv_fb naming in meson scripts Part-of: --- subprojects/gst-plugins-bad/meson.build | 5 ++++- subprojects/gst-plugins-good/meson.build | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index 758da48758..f4fc89d6c4 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -352,9 +352,12 @@ if gstgl_dep.found() message('GStreamer OpenGL platforms: @0@'.format(' '.join(gst_gl_platforms))) message('GStreamer OpenGL apis: @0@'.format(' '.join(gst_gl_apis))) - foreach ws : ['x11', 'wayland', 'android', 'cocoa', 'eagl', 'win32', 'dispmanx', 'viv_fb'] + foreach ws : ['x11', 'wayland', 'android', 'cocoa', 'eagl', 'win32', 'dispmanx'] set_variable('gst_gl_have_window_@0@'.format(ws), gst_gl_winsys.contains(ws)) endforeach + # Handling viv-fb separately, because the winsys is called "viv-fb", but the + # variable suffix must be "viv_fb" (dashes are not allowed in variable names). + set_variable('gst_gl_have_window_viv_fb', gst_gl_winsys.contains('viv-fb')) foreach p : ['glx', 'egl', 'cgl', 'eagl', 'wgl'] set_variable('gst_gl_have_platform_@0@'.format(p), gst_gl_platforms.contains(p)) diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 493f42ec4c..0c0f5a9856 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -341,9 +341,12 @@ if have_gstgl message('GStreamer OpenGL platforms: @0@'.format(' '.join(gst_gl_platforms))) message('GStreamer OpenGL apis: @0@'.format(' '.join(gst_gl_apis))) - foreach ws : ['x11', 'wayland', 'android', 'cocoa', 'eagl', 'win32', 'dispmanx', 'viv_fb'] + foreach ws : ['x11', 'wayland', 'android', 'cocoa', 'eagl', 'win32', 'dispmanx'] set_variable('gst_gl_have_window_@0@'.format(ws), gst_gl_winsys.contains(ws)) endforeach + # Handling viv-fb separately, because the winsys is called "viv-fb", but the + # variable suffix must be "viv_fb" (dashes are not allowed in variable names). + set_variable('gst_gl_have_window_viv_fb', gst_gl_winsys.contains('viv-fb')) foreach p : ['glx', 'egl', 'cgl', 'eagl', 'wgl'] set_variable('gst_gl_have_platform_@0@'.format(p), gst_gl_platforms.contains(p))