mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-16 21:36:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Take into account viv-fb vs. viv_fb naming in meson scripts

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5020>
This commit is contained in:
Carlos Rafael Giani 2023-07-11 21:41:46 +02:00 committed by Matthew Waters
parent a2d9584b27
commit da3b51c0c4
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subprojects/gst-plugins-bad/meson.build
View file

@ -352,9 +352,12 @@ if gstgl_dep.found()
message('GStreamer OpenGL platforms: @0@'.format(' '.join(gst_gl_platforms))) message('GStreamer OpenGL platforms: @0@'.format(' '.join(gst_gl_platforms)))
message('GStreamer OpenGL apis: @0@'.format(' '.join(gst_gl_apis))) 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)) set_variable('gst_gl_have_window_@0@'.format(ws), gst_gl_winsys.contains(ws))
endforeach 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'] foreach p : ['glx', 'egl', 'cgl', 'eagl', 'wgl']
set_variable('gst_gl_have_platform_@0@'.format(p), gst_gl_platforms.contains(p)) set_variable('gst_gl_have_platform_@0@'.format(p), gst_gl_platforms.contains(p))

5
subprojects/gst-plugins-good/meson.build
View file

@ -341,9 +341,12 @@ if have_gstgl
message('GStreamer OpenGL platforms: @0@'.format(' '.join(gst_gl_platforms))) message('GStreamer OpenGL platforms: @0@'.format(' '.join(gst_gl_platforms)))
message('GStreamer OpenGL apis: @0@'.format(' '.join(gst_gl_apis))) 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)) set_variable('gst_gl_have_window_@0@'.format(ws), gst_gl_winsys.contains(ws))
endforeach 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'] foreach p : ['glx', 'egl', 'cgl', 'eagl', 'wgl']
set_variable('gst_gl_have_platform_@0@'.format(p), gst_gl_platforms.contains(p)) set_variable('gst_gl_have_platform_@0@'.format(p), gst_gl_platforms.contains(p))