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

meson: Fix several warnings in the build

Browse source 
Deprecations, incorrect options, etc.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6058>
This commit is contained in:
Nirbheek Chauhan 2024-02-05 23:04:45 +05:30 committed by GStreamer Marge Bot
parent 63322705c8
commit f6f448bb80
3 changed files with 53 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-bad/ext/openjpeg/meson.build
View file

@ -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',

3
subprojects/gst-plugins-good/ext/qt6/meson.build
View file

@ -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,

99
tests/virtme/meson.build
View file

@ -1,51 +1,52 @@
kernel_image_path = get_option('virtme_kernel_image')
if kernel_image_path != ''
if not fs.is_absolute(kernel_image_path)
error('Kernel image path @0@ must be absolute'.format(kernel_image_path))
endif
if not fs.is_file(kernel_image_path)
error('Kernel image @0@ does not exist'.format(kernel_image_path))
endif
virtme_run = find_program('virtme-run.sh')
supported_decoders = {
'vp8': [],
'vp9': [],
'h.264': [
'FM2_SVA_C'
],
'h.265': [
'PICSIZE_A_Bossen_1',
'PICSIZE_B_Bossen_1',
'PICSIZE_C_Bossen_1',
'PICSIZE_D_Bossen_1',
'EXTPREC_HIGHTHROUGHPUT_444_16_INTRA_16BIT_RExt_Sony_1',
'EXTPREC_MAIN_444_16_INTRA_16BIT_RExt_Sony_1',
'GENERAL_12b_400_RExt_Sony_1',
'GENERAL_16b_400_RExt_Sony_1',
'GENERAL_16b_444_highThroughput_RExt_Sony_2',
'GENERAL_16b_444_RExt_Sony_2',
'GENERAL_8b_400_RExt_Sony_1',
'WAVETILES_RExt_Sony_2'
],
}
foreach decoder, skipped : supported_decoders
test('v4l2-stateless-decoders-' + decoder, virtme_run,
workdir: meson.current_source_dir(),
suite: 'v4l2-stateless-decoders',
args: [
kernel_image_path,
meson.project_build_root(),
meson.source_root(),
decoder,
skipped,
],
is_parallel: true,
timeout: 180,
)
endforeach
else
warning('No kernel image path specified, skipping virtme tests')
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
if not fs.is_file(kernel_image_path)
error('Kernel image @0@ does not exist'.format(kernel_image_path))
endif
virtme_run = find_program('virtme-run.sh')
supported_decoders = {
'vp8': [],
'vp9': [],
'h.264': [
'FM2_SVA_C'
],
'h.265': [
'PICSIZE_A_Bossen_1',
'PICSIZE_B_Bossen_1',
'PICSIZE_C_Bossen_1',
'PICSIZE_D_Bossen_1',
'EXTPREC_HIGHTHROUGHPUT_444_16_INTRA_16BIT_RExt_Sony_1',
'EXTPREC_MAIN_444_16_INTRA_16BIT_RExt_Sony_1',
'GENERAL_12b_400_RExt_Sony_1',
'GENERAL_16b_400_RExt_Sony_1',
'GENERAL_16b_444_highThroughput_RExt_Sony_2',
'GENERAL_16b_444_RExt_Sony_2',
'GENERAL_8b_400_RExt_Sony_1',
'WAVETILES_RExt_Sony_2'
],
}
foreach decoder, skipped : supported_decoders
test('v4l2-stateless-decoders-' + decoder, virtme_run,
workdir: meson.current_source_dir(),
suite: 'v4l2-stateless-decoders',
args: [
kernel_image_path,
meson.project_build_root(),
meson.source_root(),
decoder,
skipped,
],
is_parallel: true,
timeout: 180,
)
endforeach