mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: update glib minimum version to 2.56

Browse source 
In order to support the symbol g_enum_to_string in various
project using GStreamer ( gst-validate etc.), the glib minimum
version should be 2.56.0.

Remove compat code as glib requirement
is now > 2.56

Version used by Ubuntu 18.04 LTS

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1695>
This commit is contained in:
Stéphane Cerveau 2020-10-15 18:26:48 +02:00 committed by GStreamer Merge Bot
parent edc6e0fa1d
commit cbd61e28b2
2 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/dash/gstxmlhelper.c
View file

@ -460,32 +460,6 @@ gst_xml_helper_get_prop_unsigned_integer (xmlNode * a_node,
return exists; return exists;
} }
/* g_ascii_string_to_unsigned is available since 2.54. Get rid of this wrapper
* when we bump the version in 1.18 */
#if !GLIB_CHECK_VERSION(2,54,0)
#define g_ascii_string_to_unsigned gst_xml_helper_ascii_string_to_unsigned
static gboolean
gst_xml_helper_ascii_string_to_unsigned (const gchar * str, guint base,
guint64 min, guint64 max, guint64 * out_num, GError ** error)
{
guint64 number;
gchar *endptr = NULL;
number = g_ascii_strtoull (str, &endptr, base);
/* Be as strict as the implementation of g_ascii_string_to_unsigned in glib */
if (errno)
return FALSE;
if (g_ascii_isspace (str[0]) || str[0] == '-' || str[0] == '+')
return FALSE;
if (*endptr != '\0' || endptr == NULL)
return FALSE;
*out_num = number;
return TRUE;
}
#endif
gboolean gboolean
gst_xml_helper_get_prop_unsigned_integer_64 (xmlNode * a_node, gst_xml_helper_get_prop_unsigned_integer_64 (xmlNode * a_node,
const gchar * property_name, guint64 default_val, guint64 * property_value) const gchar * property_name, guint64 default_val, guint64 * property_value)

2
meson.build
View file

@ -16,7 +16,7 @@ else
endif endif
gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90 gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90
glib_req = '>= 2.44.0' glib_req = '>= 2.56.0'
orc_req = '>= 0.4.17' orc_req = '>= 0.4.17'
gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)