[farsight2/master] Reduce requirements to glib 2.12 and pygtk 2.10
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:21:23 PST 2008
---
configure.ac | 6 +++---
transmitters/rawudp/fs-rawudp-stream-transmitter.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index d0daaf0..8e606c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,7 @@ AG_GST_CHECK_FUNCTION
dnl *** checks for dependency libraries ***
dnl GLib is required
-AG_GST_GLIB_CHECK([2.14])
+AG_GST_GLIB_CHECK([2.12])
dnl checks for gstreamer
dnl uninstalled is selected preferentially -- see pkg-config(1)
@@ -344,9 +344,9 @@ AC_ARG_ENABLE([python],
WANT_PYTHON=yes)
if test "x$WANT_PYTHON" = "xyes"; then
AM_PATH_PYTHON
- PKG_CHECK_MODULES(PYFARSIGHT, [ pygobject-2.0 >= 2.14.0
+ PKG_CHECK_MODULES(PYFARSIGHT, [ pygobject-2.0 >= 2.12.0
gst-python-0.10 >= 0.10.10
- pygtk-2.0 >= 2.12 ] )
+ pygtk-2.0 >= 2.10 ] )
fi
AM_CONDITIONAL(WANT_PYTHON, test "x$WANT_PYTHON" = "xyes")
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 79b5c74..a173bab 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -1070,7 +1070,7 @@ fs_rawudp_stream_transmitter_start_stun (FsRawUdpStreamTransmitter *self,
data->component_id = component_id;
g_mutex_lock (data->self->priv->sources_mutex);
-#if 1
+#if GLIB_CHECK_VERSION (2, 14, 0)
/* This is MAY broken in GLib 2.14 (gnome bug #448943) */
/* If the test does not stop (and times out), this may be the cause
* and in this case should be investigated further
--
1.5.6.5
More information about the farsight-commits
mailing list