mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 08:17:01 +00:00
meson: Fix several warnings in the build
Deprecations, incorrect options, etc. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6058>
This commit is contained in:
parent
63322705c8
commit
f6f448bb80
3 changed files with 53 additions and 51 deletions
|
@ -9,7 +9,7 @@ openjpeg_cargs = []
|
|||
openjpeg_dep = dependency('libopenjp2', version : '>=2.2',
|
||||
fallback : ['libopenjp2', 'libopenjp2_dep'],
|
||||
required : get_option('openjpeg'),
|
||||
default_options: ['build_codec=false'])
|
||||
default_options: ['build_codec_apps=false'])
|
||||
|
||||
if openjpeg_dep.found()
|
||||
gstopenjpeg = library('gstopenjpeg',
|
||||
|
|
|
@ -30,6 +30,7 @@ qt6_egl = get_option('qt-egl')
|
|||
qt6_wayland = get_option('qt-wayland')
|
||||
qt6_x11 = get_option('qt-x11')
|
||||
qt6_method = get_option('qt-method')
|
||||
fs = import('fs')
|
||||
|
||||
if qt6_option.disabled()
|
||||
subdir_done()
|
||||
|
@ -176,7 +177,7 @@ if qt6_option.require(have_qt_windowing, error_message: 'No windowing, enable on
|
|||
)
|
||||
shaders += [compiled_shader]
|
||||
endforeach
|
||||
resource_file = configure_file(input: 'resources.qrc', output: 'resources.qrc', copy: true)
|
||||
resource_file = fs.copyfile('resources.qrc')
|
||||
qresources = qt6_mod.compile_resources(sources: resource_file, method: qt6_method)
|
||||
|
||||
gstqml6gl = library('gstqml6', sources, moc_files, qresources,
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
kernel_image_path = get_option('virtme_kernel_image')
|
||||
if kernel_image_path != ''
|
||||
if kernel_image_path == ''
|
||||
message('No kernel image path specified, skipping virtme tests')
|
||||
subdir_done()
|
||||
endif
|
||||
|
||||
if not fs.is_absolute(kernel_image_path)
|
||||
error('Kernel image path @0@ must be absolute'.format(kernel_image_path))
|
||||
endif
|
||||
|
@ -46,6 +50,3 @@ if kernel_image_path != ''
|
|||
timeout: 180,
|
||||
)
|
||||
endforeach
|
||||
else
|
||||
warning('No kernel image path specified, skipping virtme tests')
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue