FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

meson: Bump GLib requirement to >= 2.64

Browse Source 
This includes fixes to make GstBus watches non-racy.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2126>
This commit is contained in:
Tim-Philipp Müller 2022-04-06 12:56:30 +01:00
parent 656bea80ea
commit 654f3370a0
9 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subprojects/gst-devtools/meson.build
View File

@ -28,7 +28,7 @@ osxversion = curversion + 1
prefix = get_option('prefix') prefix = get_option('prefix')
glib_req = '>= 2.62.0' glib_req = '>= 2.64.0'
if gst_version_is_stable if gst_version_is_stable
gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)

2
subprojects/gst-editing-services/meson.build
View File

@ -27,7 +27,7 @@ curversion = gst_version_minor * 100 + gst_version_micro
libversion = '@0@.@1@.0'.format(soversion, curversion) libversion = '@0@.@1@.0'.format(soversion, curversion)
osxversion = curversion + 1 osxversion = curversion + 1
glib_req = '>= 2.62.0' glib_req = '>= 2.64.0'
if gst_version_is_stable if gst_version_is_stable
gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)

2
subprojects/gst-plugins-bad/meson.build
View File

@ -17,7 +17,7 @@ endif
gst_version_is_stable = gst_version_minor.is_even() gst_version_is_stable = gst_version_minor.is_even()
gst_version_is_dev = gst_version_minor.is_odd() and gst_version_micro < 90 gst_version_is_dev = gst_version_minor.is_odd() and gst_version_micro < 90
glib_req = '>= 2.62.0' glib_req = '>= 2.64.0'
orc_req = '>= 0.4.17' orc_req = '>= 0.4.17'
if gst_version_is_stable if gst_version_is_stable

2
subprojects/gst-plugins-base/meson.build
View File

@ -27,7 +27,7 @@ else
have_objc = false have_objc = false
endif endif
glib_req = '>= 2.62.0' glib_req = '>= 2.64.0'
orc_req = '>= 0.4.24' orc_req = '>= 0.4.24'
if gst_version_is_stable if gst_version_is_stable

2
subprojects/gst-plugins-good/meson.build
View File

@ -22,7 +22,7 @@ if have_cxx
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
endif endif
glib_req = '>= 2.62.0' glib_req = '>= 2.64.0'
orc_req = '>= 0.4.17' orc_req = '>= 0.4.17'
if gst_version_is_stable if gst_version_is_stable

2
subprojects/gst-plugins-ugly/meson.build
View File

@ -19,7 +19,7 @@ gst_version_is_dev = gst_version_minor.is_odd() and gst_version_micro < 90
have_cxx = add_languages('cpp', native: false, required: false) have_cxx = add_languages('cpp', native: false, required: false)
glib_req = '>= 2.62.0' glib_req = '>= 2.64.0'
if gst_version_is_stable if gst_version_is_stable
gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)

2
subprojects/gst-rtsp-server/meson.build
View File

@ -16,7 +16,7 @@ endif
gst_version_is_stable = gst_version_minor.is_even() gst_version_is_stable = gst_version_minor.is_even()
gst_version_is_dev = gst_version_minor.is_odd() and gst_version_micro < 90 gst_version_is_dev = gst_version_minor.is_odd() and gst_version_micro < 90
glib_req = '>= 2.62.0' glib_req = '>= 2.64.0'
if gst_version_is_stable if gst_version_is_stable
gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)

14
subprojects/gstreamer/gst/gstbus.c
View File

@ -834,7 +834,6 @@ no_handler:
} }
} }
#if GLIB_CHECK_VERSION(2,63,3)
static void static void
gst_bus_source_dispose (GSource * source) gst_bus_source_dispose (GSource * source)
{ {
@ -850,22 +849,11 @@ gst_bus_source_dispose (GSource * source)
bus->priv->gsource = NULL; bus->priv->gsource = NULL;
GST_OBJECT_UNLOCK (bus); GST_OBJECT_UNLOCK (bus);
} }
#endif
static void static void
gst_bus_source_finalize (GSource * source) gst_bus_source_finalize (GSource * source)
{ {
GstBusSource *bsource = (GstBusSource *) source; GstBusSource *bsource = (GstBusSource *) source;
#if !GLIB_CHECK_VERSION(2,63,3)
GstBus *bus = bsource->bus;
GST_DEBUG_OBJECT (bus, "finalize source %p", source);
GST_OBJECT_LOCK (bus);
if (bus->priv->gsource == source)
bus->priv->gsource = NULL;
GST_OBJECT_UNLOCK (bus);
#endif
gst_clear_object (&bsource->bus); gst_clear_object (&bsource->bus);
} }
@ -894,9 +882,7 @@ gst_bus_create_watch_unlocked (GstBus * bus)
source = (GstBusSource *) bus->priv->gsource; source = (GstBusSource *) bus->priv->gsource;
g_source_set_name ((GSource *) source, "GStreamer message bus watch"); g_source_set_name ((GSource *) source, "GStreamer message bus watch");
#if GLIB_CHECK_VERSION(2,63,3)
g_source_set_dispose_function ((GSource *) source, gst_bus_source_dispose); g_source_set_dispose_function ((GSource *) source, gst_bus_source_dispose);
#endif
source->bus = gst_object_ref (bus); source->bus = gst_object_ref (bus);
g_source_add_poll ((GSource *) source, &bus->priv->pollfd); g_source_add_poll ((GSource *) source, &bus->priv->pollfd);

2
subprojects/gstreamer/meson.build
View File

@ -534,7 +534,7 @@ configinc = include_directories('.')
libsinc = include_directories('libs') libsinc = include_directories('libs')
privinc = include_directories('gst') privinc = include_directories('gst')
glib_req = '>= 2.62.0' glib_req = '>= 2.64.0'
# Find dependencies # Find dependencies
glib_dep = dependency('glib-2.0', version: glib_req, glib_dep = dependency('glib-2.0', version: glib_req,