diff --git a/configure.ac b/configure.ac index d415dcbda0..d7f33c50d2 100644 --- a/configure.ac +++ b/configure.ac @@ -535,7 +535,7 @@ LIBS="$save_libs" dnl *** checks for dependency libraries *** dnl GLib -GLIB_REQ=2.22 +GLIB_REQ=2.24 AG_GST_GLIB_CHECK([$GLIB_REQ]) diff --git a/docs/random/release b/docs/random/release index 6a8a3779e3..f45bf97c1b 100644 --- a/docs/random/release +++ b/docs/random/release @@ -129,7 +129,7 @@ RELEASE PROCEDURE: + e.g: scp gstreamer-0.10.42.tar.gz master.gnome.org: ssh master.gnome.org - install-module gstreamer-0.10.42.tar.gz + ftpadmin install gstreamer-0.10.42.tar.gz - Send release announcements to: gstreamer-devel@lists.sourceforge.net gstreamer-announce@lists.sourceforge.net kde-multimedia@kde.org gnome-multimedia@gnome.org diff --git a/gst/gstcaps.c b/gst/gstcaps.c index f3158b6944..47d22cbc47 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -847,12 +847,7 @@ gst_caps_set_simple_valist (GstCaps * caps, const char *field, va_list varargs) g_warning ("Don't use G_TYPE_DATE, use GST_TYPE_DATE instead\n"); type = GST_TYPE_DATE; } -#if GLIB_CHECK_VERSION(2,23,3) G_VALUE_COLLECT_INIT (&value, type, varargs, 0, &err); -#else - g_value_init (&value, type); - G_VALUE_COLLECT (&value, varargs, 0, &err); -#endif if (G_UNLIKELY (err)) { g_critical ("%s", err); return; diff --git a/gst/gstchildproxy.c b/gst/gstchildproxy.c index 65e9527a4d..2054aa0298 100644 --- a/gst/gstchildproxy.c +++ b/gst/gstchildproxy.c @@ -391,13 +391,9 @@ gst_child_proxy_set_valist (GstObject * object, if (!gst_child_proxy_lookup (object, name, &target, &pspec)) goto not_found; -#if GLIB_CHECK_VERSION(2,23,3) G_VALUE_COLLECT_INIT (&value, pspec->value_type, var_args, G_VALUE_NOCOPY_CONTENTS, &error); -#else - g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec)); - G_VALUE_COLLECT (&value, var_args, G_VALUE_NOCOPY_CONTENTS, &error); -#endif + if (error) goto cant_copy; diff --git a/gst/gstpoll.c b/gst/gstpoll.c index 76a7a30e6a..8bb282a92f 100644 --- a/gst/gstpoll.c +++ b/gst/gstpoll.c @@ -165,7 +165,7 @@ static gboolean gst_poll_add_fd_unlocked (GstPoll * set, GstPollFD * fd); #define WAKE_EVENT(s) (write ((s)->control_write_fd.fd, "W", 1) == 1) #define RELEASE_EVENT(s) (read ((s)->control_read_fd.fd, (s)->buf, 1) == 1) #else -#define WAKE_EVENT(s) (SetEvent ((s)->wakeup_event)) +#define WAKE_EVENT(s) (SetEvent ((s)->wakeup_event), errno = GetLastError () == NO_ERROR ? 0 : EACCES, errno == 0 ? 1 : 0) #define RELEASE_EVENT(s) (ResetEvent ((s)->wakeup_event)) #endif diff --git a/gst/gstpreset.c b/gst/gstpreset.c index b958baac56..6280896ff6 100644 --- a/gst/gstpreset.c +++ b/gst/gstpreset.c @@ -255,12 +255,13 @@ wrong_name: static guint64 preset_parse_version (const gchar * str_version) { - gint major, minor, micro, nano, num; + guint major, minor, micro, nano; + gint num; major = minor = micro = nano = 0; /* parse version (e.g. 0.10.15.1) to guint64 */ - num = sscanf (str_version, "%d.%d.%d.%d", &major, &minor, µ, &nano); + num = sscanf (str_version, "%u.%u.%u.%u", &major, &minor, µ, &nano); /* make sure we have atleast "major.minor" */ if (num > 1) { guint64 version; diff --git a/gst/gstregistrybinary.h b/gst/gstregistrybinary.h index a367f4100b..aa2c6d31ff 100644 --- a/gst/gstregistrybinary.h +++ b/gst/gstregistrybinary.h @@ -55,12 +55,12 @@ G_BEGIN_DECLS * This _must_ be updated whenever the registry format changes, * we currently use the core version where this change happened. */ -#define GST_MAGIC_BINARY_VERSION_STR ("0.10.30.1") +#define GST_MAGIC_BINARY_VERSION_STR "0.10.30.1" /* * GST_MAGIC_BINARY_VERSION_LEN: * - * length of the version string. + * Maximum length of the version string in the header. */ #define GST_MAGIC_BINARY_VERSION_LEN (64) diff --git a/gst/gststructure.c b/gst/gststructure.c index 7b910ba46f..6ff9432b01 100644 --- a/gst/gststructure.c +++ b/gst/gststructure.c @@ -585,12 +585,7 @@ gst_structure_set_valist_internal (GstStructure * structure, g_warning ("Don't use G_TYPE_DATE, use GST_TYPE_DATE instead\n"); type = GST_TYPE_DATE; } -#if GLIB_CHECK_VERSION(2,23,3) G_VALUE_COLLECT_INIT (&field.value, type, varargs, 0, &err); -#else - g_value_init (&field.value, type); - G_VALUE_COLLECT (&field.value, varargs, 0, &err); -#endif if (G_UNLIKELY (err)) { g_critical ("%s", err); return; diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c index fbd4c3b1e4..03bae21d6d 100644 --- a/gst/gstsystemclock.c +++ b/gst/gstsystemclock.c @@ -51,6 +51,7 @@ # define WIN32_LEAN_AND_MEAN /* prevents from including too many things */ # include /* QueryPerformance* stuff */ # undef WIN32_LEAN_AND_MEAN +# define EWOULDBLOCK EAGAIN /* This is just to placate gcc */ #endif /* G_OS_WIN32 */ #define GET_ENTRY_STATUS(e) (g_atomic_int_get(&GST_CLOCK_ENTRY_STATUS(e))) diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c index fabc24ccfd..ab6eddafab 100644 --- a/gst/gsttaglist.c +++ b/gst/gsttaglist.c @@ -1011,12 +1011,7 @@ gst_tag_list_add_valist (GstTagList * list, GstTagMergeMode mode, g_warning ("unknown tag '%s'", tag); return; } -#if GLIB_CHECK_VERSION(2,23,3) G_VALUE_COLLECT_INIT (&value, info->type, var_args, 0, &error); -#else - g_value_init (&value, info->type); - G_VALUE_COLLECT (&value, var_args, 0, &error); -#endif if (error) { g_warning ("%s: %s", G_STRLOC, error); g_free (error);