soup: Load the runtime library, not the development library
authorNirbheek Chauhan <nirbheek@centricular.com>
Wed, 9 Mar 2022 06:47:11 +0000 (12:17 +0530)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Thu, 10 Mar 2022 07:44:54 +0000 (07:44 +0000)
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1899>

subprojects/gst-plugins-good/ext/soup/gstsouploader.c

index 6ea660f..ef550cd 100644 (file)
 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))) { \