mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-06-10 18:19:28 +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/6198>
This commit is contained in:
parent
0db7773d5b
commit
6a18121fdc
|
@ -40,6 +40,7 @@ variables:
|
||||||
-Dlibnice:tests=disabled
|
-Dlibnice:tests=disabled
|
||||||
-Dlibnice:examples=disabled
|
-Dlibnice:examples=disabled
|
||||||
-Dopenh264:tests=disabled
|
-Dopenh264:tests=disabled
|
||||||
|
-Dgst-plugins-good:soup-lookup-dep=true
|
||||||
-Dpygobject:tests=false
|
-Dpygobject:tests=false
|
||||||
-Dpython=enabled
|
-Dpython=enabled
|
||||||
-Dlibav=enabled
|
-Dlibav=enabled
|
||||||
|
@ -414,6 +415,7 @@ build vs2019 arm64 uwp:
|
||||||
MESON_CROSS_ARGS: >
|
MESON_CROSS_ARGS: >
|
||||||
-Dgst-plugins-base:pango=disabled
|
-Dgst-plugins-base:pango=disabled
|
||||||
-Dgst-plugins-good:cairo=disabled
|
-Dgst-plugins-good:cairo=disabled
|
||||||
|
-Dgst-plugins-good:soup=disabled
|
||||||
-Dgst-devtools:cairo=disabled
|
-Dgst-devtools:cairo=disabled
|
||||||
--cross-file ci/meson/vs2019-arm64-cross-file.txt
|
--cross-file ci/meson/vs2019-arm64-cross-file.txt
|
||||||
--native-file ci/meson/vs2019-x64-native-file.txt
|
--native-file ci/meson/vs2019-x64-native-file.txt
|
||||||
|
|
|
@ -20,7 +20,8 @@ soup_link_deps = []
|
||||||
libsoup2_dep = disabler()
|
libsoup2_dep = disabler()
|
||||||
libsoup3_dep = disabler()
|
libsoup3_dep = disabler()
|
||||||
default_library = get_option('default_library')
|
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']
|
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,
|
||||||
required: soup_ver_opt == '3' and soup_opt.enabled())
|
required: soup_ver_opt == '3' and soup_opt.enabled())
|
||||||
|
|
|
@ -85,6 +85,8 @@ option('rpi-lib-dir', type : 'string', value : '/opt/vc/lib', description : 'Dir
|
||||||
|
|
||||||
# soup plugin options
|
# soup plugin options
|
||||||
option('soup', type : 'feature', value : 'auto', description : 'libsoup HTTP client source/sink plugin')
|
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'],
|
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)')
|
description: 'Force a specific libsoup version if linking to it (N/A for shared builds on Linux)')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue