meson: Pass sysprof=disabled to glib
sysprof cannot be built on Windows, and this causes the build to fail on Windows. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9438>
This commit is contained in:
parent
eef8ec6e47
commit
7788186a30
@ -396,7 +396,7 @@ if gstgl_dep.found()
|
||||
endif
|
||||
|
||||
libm = cc.find_library('m', required : false)
|
||||
gio_dep = dependency('gio-2.0', version: glib_req)
|
||||
gio_dep = dependency('gio-2.0', version: glib_req, default_options: {'sysprof': 'disabled'})
|
||||
gmodule_dep = dependency('gmodule-no-export-2.0')
|
||||
# gio-unix-2.0 is used by sys/bluez
|
||||
|
||||
|
@ -324,7 +324,7 @@ core_conf.set('HAVE_LIBDRM', libdrm_dep.found())
|
||||
# X11 checks are for sys/ and tests/
|
||||
x11_dep = dependency('x11', required : get_option('x11'))
|
||||
# GIO is used by the GIO plugin, and by the TCP, SDP, and RTSP plugins
|
||||
gio_dep = dependency('gio-2.0', version: glib_req)
|
||||
gio_dep = dependency('gio-2.0', version: glib_req, default_options: {'sysprof': 'disabled'})
|
||||
giounix_dep = dependency('', required: false)
|
||||
if host_system != 'windows'
|
||||
giounix_dep = dependency('gio-unix-2.0')
|
||||
|
@ -409,7 +409,7 @@ endif
|
||||
zlib_dep = dependency('zlib')
|
||||
cdata.set('HAVE_ZLIB', true)
|
||||
|
||||
gio_dep = dependency('gio-2.0', version: glib_req)
|
||||
gio_dep = dependency('gio-2.0', version: glib_req, default_options: {'sysprof': 'disabled'})
|
||||
gmodule_dep = dependency('gmodule-no-export-2.0')
|
||||
|
||||
gst_plugins_good_args = ['-DHAVE_CONFIG_H']
|
||||
|
@ -197,7 +197,7 @@ else
|
||||
cdata.set('DISABLE_ORC', 1)
|
||||
endif
|
||||
|
||||
gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_req)
|
||||
gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_req, default_options: {'sysprof': 'disabled'})
|
||||
|
||||
if gmodule_dep.version().version_compare('< 2.67.4')
|
||||
cdata.set('g_memdup2(ptr,sz)', '(G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)')
|
||||
|
@ -569,7 +569,7 @@ glib_req = '>= 2.64.0'
|
||||
|
||||
# Find dependencies
|
||||
glib_dep = dependency('glib-2.0', version: glib_req,
|
||||
fallback: ['glib', 'libglib_dep'])
|
||||
default_options: {'sysprof': 'disabled'})
|
||||
gobject_dep = dependency('gobject-2.0')
|
||||
gmodule_dep = dependency('gmodule-no-export-2.0')
|
||||
if host_system == 'windows'
|
||||
|
Loading…
x
Reference in New Issue
Block a user