mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 17:50:36 +00:00
soup: Re-add soup-lookup-dep option
It's still useful on Linux since it ensures that the tests are going to be built, since they use the same dep lookup as the plugin now. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6197>
This commit is contained in:
parent
eb641af450
commit
4fc56a08ee
3 changed files with 7 additions and 1 deletions
|
@ -45,6 +45,7 @@ variables:
|
|||
-Dlibnice:examples=disabled
|
||||
-Dlibnice:gupnp=disabled
|
||||
-Dopenh264:tests=disabled
|
||||
-Dgst-plugins-good:soup-lookup-dep=true
|
||||
-Dpygobject:tests=false
|
||||
-Dpython=enabled
|
||||
-Dlibav=enabled
|
||||
|
|
|
@ -20,7 +20,8 @@ soup_link_deps = []
|
|||
libsoup2_dep = disabler()
|
||||
libsoup3_dep = disabler()
|
||||
default_library = get_option('default_library')
|
||||
if host_system != 'linux' or default_library in ['static', 'both']
|
||||
soup_lookup_dep = get_option('soup-lookup-dep') and host_system == 'linux'
|
||||
if host_system != 'linux' or default_library in ['static', 'both'] or soup_lookup_dep
|
||||
if soup_ver_opt in ['auto', '3']
|
||||
libsoup3_dep = dependency('libsoup-3.0', allow_fallback: true,
|
||||
required: soup_ver_opt == '3' and soup_opt.enabled())
|
||||
|
@ -30,7 +31,9 @@ if host_system != 'linux' or default_library in ['static', 'both']
|
|||
default_options: ['sysprof=disabled'],
|
||||
required: soup_ver_opt == '2' and soup_opt.enabled())
|
||||
endif
|
||||
endif
|
||||
|
||||
if host_system != 'linux' or default_library in ['static', 'both']
|
||||
if libsoup3_dep.found()
|
||||
soup_link_deps += libsoup3_dep
|
||||
soup_link_args += '-DLINK_SOUP=3'
|
||||
|
|
|
@ -87,6 +87,8 @@ option('rpi-lib-dir', type : 'string', value : '/opt/vc/lib', description : 'Dir
|
|||
|
||||
# soup plugin options
|
||||
option('soup', type : 'feature', value : 'auto', description : 'libsoup HTTP client source/sink plugin')
|
||||
option('soup-lookup-dep', type : 'boolean', value : false,
|
||||
description : 'Lookup libsoup dep at build time even when building a shared plugin')
|
||||
option('soup-version', type : 'combo', value : 'auto', choices : ['auto', '2', '3'],
|
||||
description: 'Force a specific libsoup version if linking to it (N/A for shared builds on Linux)')
|
||||
|
||||
|
|
Loading…
Reference in a new issue