[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (747c9b524337006f030bdd3308c9f604ba239576)

Pol Vinogradov scm at sourcemage.org
Fri May 28 17:34:39 EDT 2010


GIT changes to master grimoire by Pol Vinogradov <vin.public at gmail.com>:

 chat-im/pidgin/HISTORY                                  |    4 +++
 chat-im/pidgin/PRE_BUILD                                |    1 
 chat-im/pidgin/pidgin-2.7.0-without-gstreamer-fix.patch |   18 ++++++++++++++++
 3 files changed, 23 insertions(+)

New commits:
commit 747c9b524337006f030bdd3308c9f604ba239576
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    chat-im/pidgin: added patch for compiling without gstreamer

diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 6586c87..750641b 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,7 @@
+2010-05-28 Pol Vinogradov <vin.public at gmail.com>
+	* PRE_BUILD, pidgin-2.7.0-without-gstreamer-fix.patch: added patch for
+	  compiling without gstreamer
+
 2010-05-13 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.7.0, SECURITY_PATCH=4
 	  http://pidgin.im/news/security/?id=46
diff --git a/chat-im/pidgin/PRE_BUILD b/chat-im/pidgin/PRE_BUILD
index fa78ec4..cd1f50a 100755
--- a/chat-im/pidgin/PRE_BUILD
+++ b/chat-im/pidgin/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/pidgin-2.7.0-without-gstreamer-fix.patch &&
 if  [  "$PIDGIN_CVS"  ==  "y"  ]
 then
   NOCONFIGURE=Y ./autogen.sh
diff --git a/chat-im/pidgin/pidgin-2.7.0-without-gstreamer-fix.patch b/chat-im/pidgin/pidgin-2.7.0-without-gstreamer-fix.patch
new file mode 100644
index 0000000..aed00ea
--- /dev/null
+++ b/chat-im/pidgin/pidgin-2.7.0-without-gstreamer-fix.patch
@@ -0,0 +1,18 @@
+--- libpurple/media/backend-fs2.h.orig	2010-05-27 19:40:13.553090711 -0400
++++ libpurple/media/backend-fs2.h	2010-05-27 19:49:28.983040815 -0400
+@@ -59,6 +59,7 @@
+  * Temporary function in order to be able to test while
+  * integrating with PurpleMedia
+  */
++#ifdef USE_GSTREAMER
+ #include <gst/gst.h>
+ GstElement *purple_media_backend_fs2_get_src(
+ 		PurpleMediaBackendFs2 *self,
+@@ -70,6 +71,7 @@
+ 		const gchar *sess_id, double level);
+ void purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
+ 		const gchar *sess_id, const gchar *who, double level);
++#endif /* USE_GSTREAMER */
+ /* end tmp */
+ 
+ G_END_DECLS



More information about the SM-Commit mailing list