mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix zlib detection when there is no pkg-config file

Browse source
This commit is contained in:
Xavier Claessens 2018-11-19 16:31:20 -05:00 committed by Xavier Claessens
parent e0268c02ab
commit 7298139ba1
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-libs/gst/tag/meson.build
View file

@ -70,8 +70,14 @@ endif
core_conf.set('HAVE_ISO_CODES', have_iso_codes) core_conf.set('HAVE_ISO_CODES', have_iso_codes)
# could drop optional zlib dep and use g_zlib_decompressor_new() # could drop optional zlib dep and use g_zlib_decompressor_new()
zlib_dep = dependency('zlib', required: false, fallback: ['zlib', 'zlib_dep']) zlib_dep = dependency('zlib', required : false)
core_conf.set('HAVE_ZLIB', zlib_dep.found()) if not zlib_dep.found()
zlib_dep = cc.find_library('z', required : false)
if not zlib_dep.found()
zlib_dep = subproject('zlib').get_variable('zlib_dep')
endif
endif
core_conf.set('HAVE_ZLIB', true)
tag_deps = [gst_base_dep, libm, zlib_dep] tag_deps = [gst_base_dep, libm, zlib_dep]
gsttag = library('gsttag-@0@'.format(api_version), gsttag = library('gsttag-@0@'.format(api_version),