From 4fc56a08ee84c6acdedc3796b4cf7046ba7b2202 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 23 Feb 2024 11:45:50 +0530 Subject: [PATCH] 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: --- .gitlab-ci.yml | 1 + subprojects/gst-plugins-good/ext/soup/meson.build | 5 ++++- subprojects/gst-plugins-good/meson_options.txt | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa5a750963..d3c1db1b3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/subprojects/gst-plugins-good/ext/soup/meson.build b/subprojects/gst-plugins-good/ext/soup/meson.build index 075fe91d7b..aaa01dbcf6 100644 --- a/subprojects/gst-plugins-good/ext/soup/meson.build +++ b/subprojects/gst-plugins-good/ext/soup/meson.build @@ -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' diff --git a/subprojects/gst-plugins-good/meson_options.txt b/subprojects/gst-plugins-good/meson_options.txt index a4e15ed805..a03a9b0a45 100644 --- a/subprojects/gst-plugins-good/meson_options.txt +++ b/subprojects/gst-plugins-good/meson_options.txt @@ -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)')