projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 1.22.6
[platform/upstream/gstreamer.git]
/
subprojects
/
gst-plugins-bad
/
meson.build
diff --git
a/subprojects/gst-plugins-bad/meson.build
b/subprojects/gst-plugins-bad/meson.build
index
b0d028e
..
0ce5fb0
100644
(file)
--- a/
subprojects/gst-plugins-bad/meson.build
+++ b/
subprojects/gst-plugins-bad/meson.build
@@
-1,5
+1,5
@@
project('gst-plugins-bad', 'c', 'cpp',
project('gst-plugins-bad', 'c', 'cpp',
- version : '1.22.
0.1
',
+ version : '1.22.
6
',
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
meson_version : '>= 0.62',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
@@
-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)))
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
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))
foreach p : ['glx', 'egl', 'cgl', 'eagl', 'wgl']
set_variable('gst_gl_have_platform_@0@'.format(p), gst_gl_platforms.contains(p))
@@
-380,6
+383,10
@@
if gstgl_dep.found()
gstglegl_dep = dependency('gstreamer-gl-egl-1.0', version : gst_req,
fallback : ['gst-plugins-base', 'gstglegl_dep'], required: true)
endif
gstglegl_dep = dependency('gstreamer-gl-egl-1.0', version : gst_req,
fallback : ['gst-plugins-base', 'gstglegl_dep'], required: true)
endif
+ if gst_gl_have_window_viv_fb
+ gstglviv_fb_dep = dependency('gstreamer-gl-viv-fb-1.0', version : gst_req,
+ fallback : ['gst-plugins-base', 'gstglviv_fb_dep'], required: true)
+ endif
endif
libm = cc.find_library('m', required : false)
endif
libm = cc.find_library('m', required : false)