3fd4477809
* gnu/packages/messaging.scm (pidgin) [patches]<search-patches> [pidgin-vv-gst.patch]: New patch. [arguments]<#:configure-flags>[--diable-vv]: Remove flag. [--disable-gstreamer]: Remove flag. [CFLAGS]: New flag. [inputs]: Add farstream and gstreamer. Move gtk+-2 to ... [propagated-inputs]: ... here. * gnu/packages/patches/pidgin-vv-gst.patch: New file. * gnu/local.mk (dist_patch_DATA): Add entry. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
49 lines
1 KiB
Diff
49 lines
1 KiB
Diff
Name: Gary Kramlich
|
|
Date: 2020-07-12
|
|
Source: https://keep.imfreedom.org/pidgin/pidgin/rev/39ac50435cfb
|
|
|
|
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
|
|
--- a/libpurple/mediamanager.c
|
|
+++ b/libpurple/mediamanager.c
|
|
@@ -2231,6 +2231,7 @@
|
|
purple_media_manager_unregister_gst_device(PurpleMediaManager *manager,
|
|
GstDevice *device)
|
|
{
|
|
+#ifdef USE_VV
|
|
GList *i;
|
|
gchar *name;
|
|
gchar *device_class;
|
|
@@ -2277,6 +2278,7 @@
|
|
|
|
g_free(name);
|
|
g_free(device_class);
|
|
+#endif /* USE_VV */
|
|
}
|
|
|
|
static gboolean
|
|
@@ -2304,7 +2306,7 @@
|
|
static void
|
|
purple_media_manager_init_device_monitor(PurpleMediaManager *manager)
|
|
{
|
|
-#if GST_CHECK_VERSION(1, 4, 0)
|
|
+#if GST_CHECK_VERSION(1, 4, 0) && defined(USE_VV)
|
|
GstBus *bus;
|
|
GList *i;
|
|
|
|
@@ -2334,6 +2336,7 @@
|
|
PurpleMediaElementType type)
|
|
{
|
|
GList *result = NULL;
|
|
+#ifdef USE_VV
|
|
GList *i;
|
|
|
|
for (i = manager->priv->elements; i; i = i->next) {
|
|
@@ -2347,6 +2350,7 @@
|
|
result = g_list_prepend(result, info);
|
|
}
|
|
}
|
|
+#endif /* USE_VV */
|
|
|
|
return result;
|
|
}
|