From 7f04ee970b314f77cee162fb645b5fae0a676ad1 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 3 Mar 2022 00:37:57 +0530 Subject: [PATCH] soup: Fix pkgconfig generation and documentation Part-of: --- subprojects/gst-plugins-good/ext/soup/meson.build | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/subprojects/gst-plugins-good/ext/soup/meson.build b/subprojects/gst-plugins-good/ext/soup/meson.build index 897fcb0..793ef4d 100644 --- a/subprojects/gst-plugins-good/ext/soup/meson.build +++ b/subprojects/gst-plugins-good/ext/soup/meson.build @@ -67,11 +67,20 @@ if default_library in ['static', 'both'] ) endif -if default_library == 'static' - gstsouphttpsrc = gstsouphttpsrc_static +# Use the static library to generate the .pc file if it's available. The shared +# library .pc file does not have a Requires: on libsoup-2.4, and we use plugin +# .pc files to generate dependencies for linking plugins statically. +if default_library == 'shared' + pkgconfig.generate(gstsouphttpsrc_shared, install_dir : plugins_pkgconfig_install_dir) else - gstsouphttpsrc = gstsouphttpsrc_shared + pkgconfig.generate(gstsouphttpsrc_static, install_dir : plugins_pkgconfig_install_dir) endif -pkgconfig.generate(gstsouphttpsrc, install_dir : plugins_pkgconfig_install_dir) -plugins += [gstsouphttpsrc] +# Add the shared library to the plugins list if available. We pass this list of +# plugins to hotdoc to generate the plugins cache, which introspects the plugin +# by loading it. We need the shared plugin for that. +if default_library == 'static' + plugins += [gstsouphttpsrc_static] +else + plugins += [gstsouphttpsrc_shared] +endif -- 2.7.4