From 7b3bccdd756400bfae84b1ed92aaa8a46fc91b23 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 23 May 2022 21:24:40 -0400 Subject: [PATCH] meson: use better zlib dependency fallback zlib is required, and if it isn't found it is checked several ways and then forced via subproject(). This code was added in commit b93e37592a3ccc0eaece1c8fef2d362b1e5fe685, to account for systems where zlib doesn't have pkg-config files installed. But Meson already does dependency fallback, and also, since 0.54.0, does the in-between checks for find_library('z') and has_header('zlib.h') via the "system" type dependency. Simplify dependency lookup by marking it as required, which also makes sure that the console log doesn't confusingly list "not found". Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build | 8 +------- subprojects/gst-plugins-good/meson.build | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build index 7a14fe7ece..892ef5c9f1 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build @@ -70,13 +70,7 @@ endif core_conf.set('HAVE_ISO_CODES', have_iso_codes) # could drop optional zlib dep and use g_zlib_decompressor_new() -zlib_dep = dependency('zlib', required : false) -if not zlib_dep.found() - zlib_dep = cc.find_library('z', required : false) - if not zlib_dep.found() or not cc.has_header('zlib.h') - zlib_dep = subproject('zlib').get_variable('zlib_dep') - endif -endif +zlib_dep = dependency('zlib') core_conf.set('HAVE_ZLIB', true) tag_deps = [gst_base_dep, libm, zlib_dep] diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 83e66a413d..422e47606d 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -345,13 +345,7 @@ if have_gstgl endif endif -zlib_dep = dependency('zlib', required : false) -if not zlib_dep.found() - zlib_dep = cc.find_library('z', required : false) - if not zlib_dep.found() or not cc.has_header('zlib.h') - zlib_dep = subproject('zlib').get_variable('zlib_dep') - endif -endif +zlib_dep = dependency('zlib') cdata.set('HAVE_ZLIB', true) glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libglib_dep']),