Accepting request 111028 from GNOME:Apps

Enable use of farstream on Factory (forwarded request 110811 from dimstar) OBS-URL: https://build.opensuse.org/request/show/111028 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=86
2012-03-26 10:18:01 +00:00 · 2012-03-26 10:18:01 +00:00 · 8438ddb5b7
commit 8438ddb5b7
parent c0213d79cc
3 changed files with 67 additions and 59 deletions
--- a/pidgin-port-to-farstream.patch
+++ b/pidgin-port-to-farstream.patch
@ -1,26 +1,7 @@
-#
-# old_revision [555badc59f0096515a4de142b15d414bafe2235b]
-#
-# patch "configure.ac"
-#  from [146e991fb67000dc69168ef834a34418d93738d8]
-#    to [1d890de2e4a9cf32a1ba109ff4071cf987b54450]
-# 
-# patch "libpurple/Makefile.am"
-#  from [bf23a245fd958fb16800f6b1abcc1c93aed1c270]
-#    to [57f43833f6848d04c9644ed83d959f91aa2dbc3c]
-# 
-# patch "libpurple/media/backend-fs2.c"
-#  from [14baabde9d85c5db0c5b002a41707439a1afd834]
-#    to [52850ade346ba967fe205fe56a341a5e7f11138c]
-# 
-# patch "libpurple/media.c"
-#  from [b6d7130f18c1bd96f12516b0eb35344457c5b447]
-#    to [1934c80d30a14fa9f719fc5f71caea49fb54d69d]
-#
-============================================================
--- configure.ac	146e991fb67000dc69168ef834a34418d93738d8
-+++ configure.ac	1d890de2e4a9cf32a1ba109ff4071cf987b54450
-@@ -821,18 +821,18 @@ dnl ####################################
+diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac
+--- pidgin-2.10.1.orig/configure.ac	2011-12-06 10:44:32.000000000 +0200
+++ pidgin-2.10.1/configure.ac	2012-03-10 18:21:12.000000000 +0200
+@@ -780,18 +780,18 @@ else
 fi
 
 dnl #######################################################################
@ -49,7 +30,7 @@
 	])
 fi
 
-@@ -843,20 +843,20 @@ if test "x$enable_vv" != "xno"; then
+@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv,
 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
 	enable_vv="$enableval", enable_vv="yes")
 if test "x$enable_vv" != "xno"; then
@ -73,10 +54,10 @@
 
 dnl #######################################################################
 dnl # Check for Internationalized Domain Name support
-============================================================
--- libpurple/Makefile.am	bf23a245fd958fb16800f6b1abcc1c93aed1c270
-+++ libpurple/Makefile.am	57f43833f6848d04c9644ed83d959f91aa2dbc3c
-@@ -305,7 +305,7 @@ libpurple_la_LIBADD = \
+diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am
+--- pidgin-2.10.1.orig/libpurple/Makefile.am	2011-12-06 10:44:33.000000000 +0200
+++ pidgin-2.10.1/libpurple/Makefile.am	2012-03-10 18:21:19.000000000 +0200
+@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \
 	$(LIBXML_LIBS) \
 	$(NETWORKMANAGER_LIBS) \
 	$(INTLLIBS) \
@ -85,7 +66,7 @@
 	$(GSTREAMER_LIBS) \
 	$(GSTINTERFACES_LIBS) \
 	$(IDN_LIBS) \
-@@ -321,7 +321,7 @@ AM_CPPFLAGS = \
+@@ -322,7 +322,7 @@ AM_CPPFLAGS = \
 	$(DEBUG_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(LIBXML_CFLAGS) \
@ -94,9 +75,9 @@
 	$(GSTREAMER_CFLAGS) \
 	$(GSTINTERFACES_CFLAGS) \
 	$(IDN_CFLAGS) \
-============================================================
--- libpurple/media/backend-fs2.c	14baabde9d85c5db0c5b002a41707439a1afd834
-+++ libpurple/media/backend-fs2.c	52850ade346ba967fe205fe56a341a5e7f11138c
+diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c
+--- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c	2011-12-06 10:44:33.000000000 +0200
+++ pidgin-2.10.1/libpurple/media/backend-fs2.c	2012-03-10 18:21:19.000000000 +0200
@@ -1,5 +1,5 @@
 /**
 - * @file backend-fs2.c Farsight 2 backend for media API
@ -146,7 +127,7 @@
 	if (priv->confbin) {
 		GstElement *pipeline;
 
-@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus, 
+@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus,
 			priv->conference != FS_CONFERENCE(src))
 		return;
 
@ -155,7 +136,7 @@
 		FsError error_no;
 		gst_structure_get_enum(msg->structure, "error-no",
 				FS_TYPE_ERROR, (gint*)&error_no);
-@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus, 
+@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus,
 						" strict."));
 				purple_media_end(priv->media, NULL, NULL);
 				break;
@ -173,7 +154,7 @@
 						error_no,
 					  	gst_structure_get_string(
 						msg->structure, "error-msg"));
-@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus, 
+@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus,
 
 		if (FS_ERROR_IS_FATAL(error_no)) {
 			purple_media_error(priv->media, _("A non-recoverable "
@ -187,7 +168,7 @@
 		const GValue *value;
 		FsStream *stream;
 		FsCandidate *local_candidate;
-@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus, 
+@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus,
 				session->id, name, candidate);
 		g_object_unref(candidate);
 	} else if (gst_structure_has_name(msg->structure,
@ -196,7 +177,7 @@
 		const GValue *value;
 		FsStream *stream;
 		FsParticipant *participant;
-@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus, 
+@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus,
 		g_signal_emit_by_name(self, "candidates-prepared",
 				session->id, name);
 	} else if (gst_structure_has_name(msg->structure,
@ -205,7 +186,7 @@
 		const GValue *value;
 		FsStream *stream;
 		FsCandidate *local_candidate;
-@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus, 
+@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus,
 		g_object_unref(lcandidate);
 		g_object_unref(rcandidate);
 	} else if (gst_structure_has_name(msg->structure,
@ -214,7 +195,7 @@
 		const GValue *value;
 		GList *codecs;
 		FsCodec *codec;
-@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus, 
+@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus,
 		codec = codecs->data;
 
 		purple_debug_info("backend-fs2",
@ -227,7 +208,7 @@
 		const GValue *value;
 		FsStreamState fsstate;
 		guint component;
-@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus, 
+@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus,
 		}
 
 		purple_debug_info("backend-fs2",
@ -241,7 +222,7 @@
 		const GValue *value;
 		FsCodec *codec;
 		gchar *codec_str;
-@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus, 
+@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus,
 		codec_str = fs_codec_to_string(codec);
 
 		purple_debug_info("backend-fs2",
@ -318,7 +299,7 @@
 
 +	if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant),
 +					 "cname")) {
-+	  g_object_set(participant, "cname", &name, NULL);
+	  g_object_set(participant, "cname", name, NULL);
 +	}
 +
 +
@ -376,13 +357,7 @@
 -		purple_debug_error("backend-fs2",
 -				"Couldn't find session to create stream.\n");
 -		return FALSE;
-+	if(!fs_stream_set_transmitter(fsstream, transmitter,
-+				      _params, _num_params, &err)) {
-+	     purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message);
-+	     g_clear_error(&err);
-+	     g_free(_params);
-+	     return FALSE;
- 	}
+-	}
 -
 -	participant = get_participant(self, who);
 -
@ -390,7 +365,13 @@
 -		purple_debug_error("backend-fs2", "Couldn't find "
 -				"participant to create stream.\n");
 -		return FALSE;
-	}
+	if(!fs_stream_set_transmitter(fsstream, transmitter,
+				      _params, _num_params, &err)) {
+	     purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message);
+	     g_clear_error(&err);
+	     g_free(_params);
+	     return FALSE;
+ 	}
 -
 -	fsstream = fs_session_new_stream(session->session, participant,
 -			initiator == TRUE ? type_direction :
@ -419,23 +400,22 @@
 
 	priv->streams =	g_list_append(priv->streams, stream);
 
-@@ -1991,8 +2024,12 @@ purple_media_backend_fs2_add_remote_cand
+@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand
 	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
 			purple_media_accepted(
 			priv->media, sess_id, participant)) {
 -		fs_stream_set_remote_candidates(stream->stream,
 +  	        if (stream->supports_add)
 +		     fs_stream_add_remote_candidates(stream->stream,
- 				stream->remote_candidates, &err);
+				stream->remote_candidates, &err);
 +		else
 +		     fs_stream_force_remote_candidates(stream->stream,
-+				stream->remote_candidates, &err);
+ 				stream->remote_candidates, &err);
 
 		if (err) {
- 			purple_debug_error("backend-fs2", "Error adding remote"
-============================================================
--- libpurple/media.c	b6d7130f18c1bd96f12516b0eb35344457c5b447
-+++ libpurple/media.c	1934c80d30a14fa9f719fc5f71caea49fb54d69d
+diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c
+--- pidgin-2.10.1.orig/libpurple/media.c	2011-12-06 10:44:33.000000000 +0200
+++ pidgin-2.10.1/libpurple/media.c	2012-03-10 18:21:19.000000000 +0200
@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med
 {
 #ifdef USE_VV
@ -453,3 +433,15 @@
 
 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
 				0, PURPLE_MEDIA_STATE_NEW,
+diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c
+--- pidgin-2.10.1.orig/libpurple/mediamanager.c	2011-12-06 10:44:33.000000000 +0200
+++ pidgin-2.10.1/libpurple/mediamanager.c	2012-03-10 18:27:05.000000000 +0200
+@@ -39,7 +39,7 @@
+ #ifdef USE_VV
+ #include <media/backend-fs2.h>
+ 
+-#include <gst/farsight/fs-element-added-notifier.h>
+#include <farstream/fs-element-added-notifier.h>
+ #include <gst/interfaces/xoverlay.h>
+ 
+ /** @copydoc _PurpleMediaManagerPrivate */
--- a/pidgin.changes
+++ b/pidgin.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Mar 23 11:29:23 UTC 2012 - vuntz@opensuse.org
+
+- Finish transition from farsight2 to farstream in 12.2:
+  + Update pidgin-port-to-farstream.patch to latest version of the
+    patch.
+  + Add farstream-devel BuildRequires on openSUSE > 12.1, now that
+    farstream is in Factory.
+  + Stop passing --disable-vv to configure on > 12.1.
+- Pass --disable-schemas-install to configure: this should be used
+  when packaging applications with gconf schemas.
+
 -------------------------------------------------------------------
 Wed Mar 14 11:12:34 UTC 2012 - vuntz@opensuse.org

--- a/pidgin.spec
+++ b/pidgin.spec
@ -53,6 +53,9 @@ BuildRequires:  libtool
 %if %suse_version > 1110 && %suse_version <= 1210
 BuildRequires:  farsight2-devel
 %endif
+%if %suse_version > 1210
+BuildRequires:  farstream-devel
+%endif
 BuildRequires:  gconf2-devel
 %if %suse_version < 1020
 BuildRequires:  gnome-icon-theme
@ -376,7 +379,7 @@ translation-update-upstream
 %patch14 -p1
 %patch15 -p1
 %if %suse_version > 1210
-%patch18 -p0
+%patch18 -p1
 %endif
 # Change Myanmar/Myanmar to Myanmar:
 rename my_MM my po/my_MM.*
@ -390,7 +393,8 @@ export LDFLAGS="-pie"
 autoreconf -fi
 %configure\
 	--disable-static\
-%if %suse_version < 1120 || %suse_version > 1210
+	--disable-schemas-install\
+%if %suse_version < 1120
 	--disable-vv\
 %endif
 	--enable-plugins\