Skip to content

Commit

Permalink
meson: update glib minimum version to 2.56
Browse files Browse the repository at this point in the history
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-base/-/merge_requests/874>
  • Loading branch information
Stéphane Cerveau committed Oct 15, 2020
1 parent cea2bcc commit 967e650
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 30 deletions.
11 changes: 0 additions & 11 deletions gst-libs/gst/video/video-anc.c
Expand Up @@ -26,17 +26,6 @@
#include <gst/base/gstbytereader.h>
#include "video-anc.h"

#if !GLIB_CHECK_VERSION(2, 47, 4)
#ifdef __GNUC__
#define G_GNUC_CHECK_VERSION(major, minor) \
((__GNUC__ > (major)) || \
((__GNUC__ == (major)) && \
(__GNUC_MINOR__ >= (minor))))
#else
#define G_GNUC_CHECK_VERSION(major, minor) 0
#endif
#endif

/**
* SECTION:gstvideoanc
* @title: GstVideo Ancillary
Expand Down
18 changes: 0 additions & 18 deletions gst-libs/gst/video/video-hdr.c
Expand Up @@ -41,24 +41,6 @@
(m)->max_display_mastering_luminance, \
(m)->min_display_mastering_luminance

/* 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 video_hdr_ascii_string_to_unsigned
static gboolean
video_hdr_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

/**
* gst_video_mastering_display_info_init:
* @minfo: a #GstVideoMasteringDisplayInfo
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Expand Up @@ -26,7 +26,7 @@ else
have_objc = false
endif

glib_req = '>= 2.44.0'
glib_req = '>= 2.56.0'
orc_req = '>= 0.4.24'
gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)

Expand Down

0 comments on commit 967e650

Please sign in to comment.