meson: Add include_type: 'system' everywhere to squelch wrap warnings

Wrap dependencies add a ton of warnings with the latest GCC in Fedora
42. Squelch them by specifying that these dependencies are not
a part of the gstreamer project, and should be treated as system deps.

libsoup needs some porting work for the bump, and vorbis/lame are
already at their latest releases.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8753>
This commit is contained in:
Nirbheek Chauhan 2025-04-01 17:58:14 +05:30 committed by GStreamer Marge Bot
parent 10ae8136be
commit 1fdfab27a3
5 changed files with 14 additions and 11 deletions

View File

@ -1,11 +1,11 @@
gst_req = '>= 1.14.0'
gstsdp_dep = dependency('gstreamer-sdp-1.0', version : gst_req,
fallback : ['gst-plugins-base', 'sdp_dep'])
allow_fallback: true)
libsoup_dep = dependency('libsoup-2.4', version : '>=2.48',
fallback : ['libsoup', 'libsoup_dep'], required: false)
include_type: 'system', allow_fallback: true, required: false)
json_glib_dep = dependency('json-glib-1.0',
fallback : ['json-glib', 'json_glib_dep'], required: false)
include_type: 'system', allow_fallback: true, required: false)
if not libsoup_dep.found() or not json_glib_dep.found()
message('WebRTC examples are disabled because some dependencies are missing.')

View File

@ -21,7 +21,7 @@ exif_dep = dependency('libexif', version : '>= 0.6.16', required : false)
nalutils_dep = gstcodecparsers_dep.partial_dependency (compile_args: true, includes: true)
enable_gst_play_tests = get_option('gst_play_tests')
libsoup_dep = dependency('libsoup-3.0', required : enable_gst_play_tests)
libsoup_dep = dependency('libsoup-3.0', include_type: 'system', required: enable_gst_play_tests)
# name, condition when to skip the test and extra dependencies
base_tests = [

View File

@ -52,9 +52,12 @@ plugin_sources += {
'ivorbisdec': pathsep.join(doc_sources)
}
vorbis_dep = dependency('vorbis', version : '>= 1.3.1', allow_fallback: true, required : get_option('vorbis'))
vorbisenc_dep = dependency('vorbisenc', version : '>= 1.3.1', allow_fallback: true, required : get_option('vorbis'))
vorbisidec_dep = dependency('vorbisidec', allow_fallback: true, required : get_option('tremor'))
vorbis_dep = dependency('vorbis', version : '>= 1.3.1', allow_fallback: true,
include_type: 'system', required : get_option('vorbis'))
vorbisenc_dep = dependency('vorbisenc', version : '>= 1.3.1', allow_fallback: true,
include_type: 'system', required : get_option('vorbis'))
vorbisidec_dep = dependency('vorbisidec', allow_fallback: true,
include_type: 'system', required : get_option('tremor'))
if vorbis_dep.found()
vorbis_deps = [vorbis_dep]

View File

@ -35,7 +35,7 @@ if have_lame
endif
else
lame_dep = dependency('mp3lame', allow_fallback: true, required: lame_option,
default_options: ['tools=disabled'])
include_type: 'system', default_options: ['tools=disabled'])
have_lame = lame_dep.found()
lame_extra_c_args += ['-DHAVE_LAME_SET_VBR_QUALITY', '-DGSTLAME_PRESET', '-DLAME_SUBPROJECT']
endif

View File

@ -23,12 +23,12 @@ soup_dlopen_target_kwargs = {}
if get_option('soup').allowed() or get_option('adaptivedemux2').allowed()
if soup_ver_opt in ['auto', '3']
libsoup3_dep = dependency('libsoup-3.0', allow_fallback: true,
libsoup3_dep = dependency('libsoup-3.0', allow_fallback: true, include_type: 'system',
required: soup_ver_opt == '3' and soup_lookup_dep)
endif
if soup_ver_opt in ['auto', '2']
libsoup2_dep = dependency('libsoup-2.4', version : '>=2.48', allow_fallback: true,
default_options: ['sysprof=disabled'],
libsoup2_dep = dependency('libsoup-2.4', version: '>=2.48', allow_fallback: true,
include_type: 'system', default_options: ['sysprof=disabled'],
required: soup_ver_opt == '2' and soup_lookup_dep)
endif