projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Back to development
[platform/upstream/gstreamer.git]
/
subprojects
/
gst-omx
/
meson.build
diff --git
a/subprojects/gst-omx/meson.build
b/subprojects/gst-omx/meson.build
index
37cdecb
..
e67d7b2
100644
(file)
--- a/
subprojects/gst-omx/meson.build
+++ b/
subprojects/gst-omx/meson.build
@@
-1,6
+1,6
@@
project('gst-omx', 'c',
project('gst-omx', 'c',
- version : '1.19.
2
',
- meson_version : '>= 0.5
4
',
+ version : '1.19.
3.1
',
+ meson_version : '>= 0.5
9
',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
@@
-188,8
+188,8
@@
elif omx_target == 'rpi'
if gstgl_dep.found()
if gstgl_dep.type_name() == 'pkgconfig'
if gstgl_dep.found()
if gstgl_dep.type_name() == 'pkgconfig'
- gl_winsys = gstgl_dep.get_
pkgconfig_
variable('gl_winsys').split(' ')
- gl_platforms = gstgl_dep.get_
pkgconfig_
variable('gl_platforms').split(' ')
+ gl_winsys = gstgl_dep.get_variable('gl_winsys').split(' ')
+ gl_platforms = gstgl_dep.get_variable('gl_platforms').split(' ')
elif gstgl_dep.type_name() == 'internal'
# XXX assume gst-plugins-base was built with dispmanx and egl support
gl_winsys = ['dispmanx']
elif gstgl_dep.type_name() == 'internal'
# XXX assume gst-plugins-base was built with dispmanx and egl support
gl_winsys = ['dispmanx']
@@
-219,8
+219,8
@@
elif omx_target == 'tizonia'
endif
cdata.set('USE_OMX_TARGET_TIZONIA', 1)
tizil_dep = dependency('tizilheaders', version : tizil_req)
endif
cdata.set('USE_OMX_TARGET_TIZONIA', 1)
tizil_dep = dependency('tizilheaders', version : tizil_req)
- cdata.set('TIZONIA_LIBDIR', tizil_dep.get_
pkgconfig_
variable('libdir'))
- tizil_includedir = tizil_dep.get_
pkgconfig_
variable('includedir')
+ cdata.set('TIZONIA_LIBDIR', tizil_dep.get_variable('libdir'))
+ tizil_includedir = tizil_dep.get_variable('includedir')
gst_omx_args += ['-I' + tizil_includedir + '/tizonia']
omx_inc = []
else
gst_omx_args += ['-I' + tizil_includedir + '/tizonia']
omx_inc = []
else