From 40efef1fac1fa177387af4aedbc078040bb8f44a Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 9 Mar 2022 12:17:11 +0530 Subject: [PATCH] soup: Load the runtime library, not the development library libsoup-2.4.so / libsoup-3.0.so are symlinks installed by development packages, they are not available at runtime. Also eliminate G_MODULE_SUFFIX since it's not useful for us, and is actually incorrect on macOS anyway. Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1071 Part-of: --- subprojects/gst-plugins-good/ext/soup/gstsouploader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/subprojects/gst-plugins-good/ext/soup/gstsouploader.c b/subprojects/gst-plugins-good/ext/soup/gstsouploader.c index 6ea660f761..ef550cd462 100644 --- a/subprojects/gst-plugins-good/ext/soup/gstsouploader.c +++ b/subprojects/gst-plugins-good/ext/soup/gstsouploader.c @@ -33,14 +33,15 @@ GST_DEBUG_CATEGORY_EXTERN (gst_soup_debug); #define GST_CAT_DEFAULT gst_soup_debug +/* G_OS_WIN32 is handled separately below */ #ifdef __APPLE__ -#define MODULE_SUFFIX ".dylib" +#define LIBSOUP_3_SONAME "libsoup-3.0.0.dylib" +#define LIBSOUP_2_SONAME "libsoup-2.4.1.dylib" #else -#define MODULE_SUFFIX "." G_MODULE_SUFFIX +#define LIBSOUP_3_SONAME "libsoup-3.0.so.0" +#define LIBSOUP_2_SONAME "libsoup-2.4.so.1" #endif -#define LIBSOUP_3_SONAME "libsoup-3.0" MODULE_SUFFIX -#define LIBSOUP_2_SONAME "libsoup-2.4" MODULE_SUFFIX #define LOAD_SYMBOL(name) G_STMT_START { \ if (!g_module_symbol (module, G_STRINGIFY (name), (gpointer *) &G_PASTE (vtable->_, name))) { \