From patchwork Mon Nov 30 03:46:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 25458 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB36627BBF9; Mon, 30 Nov 2020 03:47:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AA9F227BBF8 for ; Mon, 30 Nov 2020 03:47:29 +0000 (GMT) Received: from localhost ([::1]:45908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kja9w-0002Gn-Si for patchwork@mira.cbaines.net; Sun, 29 Nov 2020 22:47:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kja9W-0002GU-PN for guix-patches@gnu.org; Sun, 29 Nov 2020 22:47:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kja9W-0003dQ-He for guix-patches@gnu.org; Sun, 29 Nov 2020 22:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kja9W-0001Td-Dc for guix-patches@gnu.org; Sun, 29 Nov 2020 22:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44957] [PIDGIN]: v2 References: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> In-Reply-To: <46fa0202-4476-ed79-19e0-39aafe7aaca0@raghavgururajan.name> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 03:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44957 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44957@debbugs.gnu.org Received: via spool by 44957-submit@debbugs.gnu.org id=B44957.16067080005650 (code B ref 44957); Mon, 30 Nov 2020 03:47:02 +0000 Received: (at 44957) by debbugs.gnu.org; 30 Nov 2020 03:46:40 +0000 Received: from localhost ([127.0.0.1]:53116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kja90-0001St-MG for submit@debbugs.gnu.org; Sun, 29 Nov 2020 22:46:40 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:52085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kja8v-0001SP-2L for 44957@debbugs.gnu.org; Sun, 29 Nov 2020 22:46:29 -0500 X-Originating-IP: 198.252.153.226 Received: from [172.27.0.33] (kite.riseup.net [198.252.153.226]) (Authenticated sender: rg@raghavgururajan.name) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id A2A0120005 for <44957@debbugs.gnu.org>; Mon, 30 Nov 2020 03:46:15 +0000 (UTC) From: Raghav Gururajan Message-ID: Date: Sun, 29 Nov 2020 22:46:12 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.5.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Revised patch-set. From 6e3a0f648f4ce427187d20cc7e52c4723056df1d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 29 Nov 2020 17:45:19 -0500 Subject: [PATCH 9/9] gnu: pidgin: Enable MultiMedia and A/V support. * gnu/packages/messaging.scm (pidgin) [patches] [pidgin-vv-gst.patch]: New patch. [arguments]<#:configure-flags>[--diable-vv]: Remove flag. [--disable-gstreamer]: Remove flag. [CFLAGS]: New flag. [inputs]: Add farstream, gstreamer and gst-plugins-base. * gnu/packages/patches/pidgin-vv-gst.patch: New file. * gnu/local.mk (dist_patch_DATA): Add entry. --- gnu/local.mk | 1 + gnu/packages/messaging.scm | 16 +++++---- gnu/packages/patches/pidgin-vv-gst.patch | 44 ++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/pidgin-vv-gst.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5f118874f1..45a396368f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1461,6 +1461,7 @@ dist_patch_DATA = \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ + %D%/packages/patches/pidgin-vv-gst.patch \ %D%/packages/patches/pinball-const-fix.patch \ %D%/packages/patches/pinball-cstddef.patch \ %D%/packages/patches/pinball-missing-separators.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0d5ab911d4..f1a44eb596 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -728,7 +728,8 @@ authentication.") (base32 "1c4dzxg9c3d9zfqqa7jwijj9rv9fm6w95igmpljwy88lxq7v5w11")) (patches (search-patches - "pidgin-add-search-path.patch")) + "pidgin-add-search-path.patch" + "pidgin-vv-gst.patch")) (modules '((guix build utils))) (snippet '(begin @@ -739,12 +740,13 @@ authentication.") (arguments `(#:configure-flags (list + (string-append "CFLAGS=-I" + (assoc-ref %build-inputs "gst-plugins-base") + "/include/gstreamer-1.0") "--disable-gtkspell" ;; "--enable-gevolution" "--enable-cap" "--enable-mono" - "--disable-vv" ; XXX remove when we have farstream and gstreamer - "--disable-gstreamer" ; XXX patches needed to support gstreamer-1.0 "--enable-cyrus-sasl" (string-append "--with-ncurses-headers=" (assoc-ref %build-inputs "ncurses") @@ -771,10 +773,9 @@ authentication.") ("dbus" ,dbus) ("dbus-glib" ,dbus-glib) ;; ("evolution-data-server" ,evolution-data-server) - ;; ("farstream" ,farstream) + ("farstream" ,farstream) ("gnutls" ,gnutls) - ;; ("gstreamer" ,gstreamer) - ("gtk+" ,gtk+-2) + ("gstreamer" ,gstreamer) ;; gtkspell ("libgadu" ,libgadu) ("libgcrypt" ,libgcrypt) @@ -805,7 +806,8 @@ authentication.") ("tcl" ,tcl) ("tk" ,tk))) (propagated-inputs - `(("glib" ,glib))) + `(("glib" ,glib) + ("gtk+" ,gtk+-2))) (native-search-paths (list (search-path-specification diff --git a/gnu/packages/patches/pidgin-vv-gst.patch b/gnu/packages/patches/pidgin-vv-gst.patch new file mode 100644 index 0000000000..c30f1f9b6c --- /dev/null +++ b/gnu/packages/patches/pidgin-vv-gst.patch @@ -0,0 +1,44 @@ +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; + } -- 2.29.2