pidgin/pidgin

9bcf96663cb9
Parents 6f735120e998
Children a3b1cde8d2d8
Make gstreamer-1.0 a required dependency

Testing Done:
Compiled, ran, and sent an IM with a bonjour account with no options, `-Dvv=disabled`, `-Dvv=disabled -Dfarstream=disabled`, and with `-Dvv=disabled -Dfarstream=disabled -Dgstreamer-video=disabled`.

Reviewed at https://reviews.imfreedom.org/r/79/
--- a/finch/gntdebug.c Tue Aug 25 21:44:38 2020 -0500
+++ b/finch/gntdebug.c Tue Aug 25 21:53:23 2020 -0500
@@ -391,9 +391,7 @@
REGISTER_G_LOG_HANDLER("GLib-GObject");
REGISTER_G_LOG_HANDLER("GThread");
REGISTER_G_LOG_HANDLER("Gnt");
-#ifdef USE_GSTREAMER
REGISTER_G_LOG_HANDLER("GStreamer");
-#endif
REGISTER_G_LOG_HANDLER("stderr");
g_set_print_handler(print_stderr); /* Redirect the debug messages to stderr */
--- a/libpurple/media.c Tue Aug 25 21:44:38 2020 -0500
+++ b/libpurple/media.c Tue Aug 25 21:53:23 2020 -0500
@@ -27,10 +27,8 @@
#include "debug.h"
-#ifdef USE_GSTREAMER
#include "media/backend-fs2.h"
#include "media-gst.h"
-#endif /* USE_GSTREAMER */
#ifdef USE_VV
/** @copydoc _PurpleMediaSession */
--- a/libpurple/mediamanager.c Tue Aug 25 21:44:38 2020 -0500
+++ b/libpurple/mediamanager.c Tue Aug 25 21:53:23 2020 -0500
@@ -28,10 +28,8 @@
#include "media.h"
#include "mediamanager.h"
-#ifdef USE_GSTREAMER
#include "media-gst.h"
#include <media/backend-fs2.h>
-#endif /* USE_GSTREAMER */
#ifdef USE_VV
#include <farstream/fs-element-added-notifier.h>
@@ -53,16 +51,11 @@
gchar *session_id;
gchar *participant;
gulong window_id;
-#ifdef USE_GSTREAMER
GstElement *sink;
-#else
- gpointer sink;
-#endif
};
typedef struct
{
-#ifdef USE_GSTREAMER
GstElement *pipeline;
PurpleMediaCaps ui_caps;
GList *medias;
@@ -88,7 +81,6 @@
GMutex appdata_mutex;
guint appdata_cb_token; /* last used read/write callback token */
#endif
-#endif
} PurpleMediaManagerPrivate;
/**
--- a/libpurple/meson.build Tue Aug 25 21:44:38 2020 -0500
+++ b/libpurple/meson.build Tue Aug 25 21:53:23 2020 -0500
@@ -26,6 +26,7 @@
'image-store.c',
'keyring.c',
'log.c',
+ 'media/backend-fs2.c',
'media/backend-iface.c',
'media/candidate.c',
'media/codec.c',
@@ -165,9 +166,6 @@
purple_filebase = 'purple-@0@'.format(purple_major_version)
purple_include_base = join_paths(purple_filebase, 'libpurple')
-if gstreamer.found()
- purple_coresources += 'media/backend-fs2.c'
-endif
if enable_vv
purple_coreheaders += 'media-gst.h'
endif
@@ -300,10 +298,7 @@
introspection_sources = (purple_coreheaders + purple_builtheaders +
purple_mediaheaders)
- Purple_gir_includes = ['GObject-2.0', 'Gio-2.0', gplugin_gir]
- if gstreamer.found()
- Purple_gir_includes += ['Gst-1.0']
- endif
+ Purple_gir_includes = ['GObject-2.0', 'Gio-2.0', 'Gst-1.0', gplugin_gir]
libpurple_gir = gnome.generate_gir(libpurple,
sources : introspection_sources,
--- a/libpurple/protocols/gg/message-prpl.c Tue Aug 25 21:44:38 2020 -0500
+++ b/libpurple/protocols/gg/message-prpl.c Tue Aug 25 21:53:23 2020 -0500
@@ -28,6 +28,8 @@
#include <glib/gi18n-lib.h>
+#include <errno.h>
+
#include "message-prpl.h"
#include "gg.h"
--- a/libpurple/protocols/gg/tcpsocket.c Tue Aug 25 21:44:38 2020 -0500
+++ b/libpurple/protocols/gg/tcpsocket.c Tue Aug 25 21:53:23 2020 -0500
@@ -25,11 +25,15 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+
+#include <errno.h>
+
+#include <purple.h>
+
#include "tcpsocket.h"
#include "gg.h"
-#include <purple.h>
typedef struct {
GSocketConnection *conn;
--- a/libpurple/protocols/gg/utils.c Tue Aug 25 21:44:38 2020 -0500
+++ b/libpurple/protocols/gg/utils.c Tue Aug 25 21:53:23 2020 -0500
@@ -27,12 +27,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+#include <errno.h>
+
+#include <purple.h>
+
#include "utils.h"
#include "gg.h"
-#include <purple.h>
-
uin_t ggp_str_to_uin(const char *str)
{
char *endptr;
--- a/libpurple/protocols/gg/xml.c Tue Aug 25 21:44:38 2020 -0500
+++ b/libpurple/protocols/gg/xml.c Tue Aug 25 21:53:23 2020 -0500
@@ -27,6 +27,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+#include <errno.h>
+
#include "xml.h"
gboolean
--- a/meson.build Tue Aug 25 21:44:38 2020 -0500
+++ b/meson.build Tue Aug 25 21:53:23 2020 -0500
@@ -355,19 +355,14 @@
# Check for GStreamer
#######################################################################
-gstreamer = dependency('gstreamer-1.0', required : get_option('gstreamer'))
-conf.set('USE_GSTREAMER', gstreamer.found())
+gstreamer = dependency('gstreamer-1.0')
#######################################################################
# Check for GStreamer Video
#######################################################################
-if gstreamer.found()
- gstreamer_video = dependency('gstreamer-video-1.0',
- required : get_option('gstreamer-video'))
- conf.set('USE_GSTVIDEO', gstreamer_video.found())
-else
- gstreamer_video = []
-endif
+gstreamer_video = dependency('gstreamer-video-1.0',
+ required : get_option('gstreamer-video'))
+conf.set('USE_GSTVIDEO', gstreamer_video.found())
#######################################################################
# Check for Farstream
@@ -379,7 +374,7 @@
# Check for Voice and Video support
#######################################################################
if get_option('vv').enabled() or get_option('vv').auto()
- if gstreamer.found() and gstreamer_video.found() and farstream.found()
+ if gstreamer_video.found() and farstream.found()
conf.set('USE_VV', true)
enable_vv = true
else
@@ -786,7 +781,6 @@
message('')
message('Protocols to build dynamically : @0@'.format(DYNAMIC_PRPLS))
message('')
-message('Build with GStreamer support.. : ' + gstreamer.found().to_string())
message('Build with voice and video.... : ' + enable_vv.to_string())
message('Build with Nettle support..... : ' + nettle.found().to_string())
message('Build with Cyrus SASL support. : ' + sasl.found().to_string())
--- a/meson_options.txt Tue Aug 25 21:44:38 2020 -0500
+++ b/meson_options.txt Tue Aug 25 21:53:23 2020 -0500
@@ -28,9 +28,6 @@
option('farstream', type : 'feature',
description : 'compile with farstream support')
-option('gstreamer', type : 'feature',
- description : 'compile with GStreamer audio support')
-
option('gstreamer-video', type : 'feature',
description : 'compile with GStreamer 1.0 Video Overlay support')
--- a/pidgin/gtkdialogs.c Tue Aug 25 21:44:38 2020 -0500
+++ b/pidgin/gtkdialogs.c Tue Aug 25 21:53:23 2020 -0500
@@ -25,6 +25,8 @@
#include <glib/gi18n-lib.h>
+#include <gst/gst.h>
+
#include <talkatu.h>
#include "package_revision.h"
@@ -41,10 +43,6 @@
#include "pidginlog.h"
#include "pidginstock.h"
-#ifdef USE_GSTREAMER
-#include <gst/gst.h>
-#endif
-
static GList *dialogwindows = NULL;
struct _PidginGroupMergeObject {
--- a/pidgin/pidgindebug.c Tue Aug 25 21:44:38 2020 -0500
+++ b/pidgin/pidgindebug.c Tue Aug 25 21:53:23 2020 -0500
@@ -834,9 +834,7 @@
REGISTER_G_LOG_HANDLER("Json");
REGISTER_G_LOG_HANDLER("libsoup");
REGISTER_G_LOG_HANDLER("Talkatu");
-#ifdef USE_GSTREAMER
REGISTER_G_LOG_HANDLER("GStreamer");
-#endif
#ifdef _WIN32
if (!purple_debug_is_enabled())