mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 21:48:55 +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/gstreamer/-/merge_requests/199>
This commit is contained in:
Stéphane Cerveau 2019-07-03 09:29:26 +02:00
parent 2e507d5a4b
commit c6c6ad2667
4 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/gstiterator.c
View file

@ -629,12 +629,7 @@ gst_iterator_fold (GstIterator * it, GstIteratorFoldFunction func,
fold_done: fold_done:
#if GLIB_CHECK_VERSION (2, 48, 0)
g_value_unset (&item); g_value_unset (&item);
#else
if (item.g_type != 0)
g_value_unset (&item);
#endif
return result; return result;
} }

2
meson.build
View file

@ -478,7 +478,7 @@ libsinc = include_directories('libs')
privinc = include_directories('gst') privinc = include_directories('gst')
# Find dependencies # Find dependencies
glib_dep = dependency('glib-2.0', version : '>=2.44.0', glib_dep = dependency('glib-2.0', version : '>=2.56.0',
fallback: ['glib', 'libglib_dep']) fallback: ['glib', 'libglib_dep'])
gobject_dep = dependency('gobject-2.0', gobject_dep = dependency('gobject-2.0',
fallback: ['glib', 'libgobject_dep']) fallback: ['glib', 'libgobject_dep'])

18
tests/misc/netclock-replay.c
View file

@ -48,24 +48,6 @@ static GOptionEntry entries[] = {
{NULL,} {NULL,}
}; };
/* 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 parse_ascii_string_to_unsigned
static gboolean
parse_ascii_string_to_unsigned (const gchar * str, guint base, guint64 min,
guint64 max, guint64 * out_num, GError ** error)
{
gchar *endptr = NULL;
*out_num = g_ascii_strtoull (str, &endptr, base);
if (errno)
return FALSE;
if (endptr == str)
return FALSE;
return TRUE;
}
#endif
static gboolean static gboolean
parse_time_values (const gchar * line, GstClockTime * local_1, parse_time_values (const gchar * line, GstClockTime * local_1,
GstClockTime * remote_1, GstClockTime * remote_2, GstClockTime * local_2) GstClockTime * remote_1, GstClockTime * remote_2, GstClockTime * local_2)

4
tools/gst-inspect.c
View file

@ -2104,15 +2104,11 @@ main (int argc, char *argv[])
#elif defined(G_OS_WIN32) #elif defined(G_OS_WIN32)
{ {
/* g_log_writer_supports_color is available since 2.50.0 */ /* g_log_writer_supports_color is available since 2.50.0 */
#if GLIB_CHECK_VERSION(2,50,0)
gint fd = _fileno (stdout); gint fd = _fileno (stdout);
/* On Windows 10, g_log_writer_supports_color will also setup the console /* On Windows 10, g_log_writer_supports_color will also setup the console
* so that it correctly interprets ANSI VT sequences if it's supported */ * so that it correctly interprets ANSI VT sequences if it's supported */
if (!_isatty (fd) || !g_log_writer_supports_color (fd)) if (!_isatty (fd) || !g_log_writer_supports_color (fd))
colored_output = FALSE; colored_output = FALSE;
#else
colored_output = FALSE;
#endif
} }
#endif #endif