From 04a78154e1af5e30dcedde6dbaa321be3f0e24b1 Mon Sep 17 00:00:00 2001 From: Jehan Date: Mon, 5 Dec 2022 14:34:48 +0100 Subject: [PATCH] meson: take into account babl's pkg-config name change. See babl!52 (babl commit b8da847) and gimp#8912. --- meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 45b72d017f..155fc166ec 100644 --- a/meson.build +++ b/meson.build @@ -340,7 +340,13 @@ mscms = platform_windows ? cc.find_library('mscms') : no_dep atk_minver = '2.4.0' atk = dependency('atk', version: '>='+atk_minver) babl_minver = '0.1.98' -babl = dependency('babl', version: '>='+babl_minver) +babl = dependency('babl-0.1', version: '>='+babl_minver, required: false) +if not babl.found() + # babl changed its pkg-config name from 'babl' to 'babl-0.1' in version + # 0.1.100 (0.1.99 dev cycle more exactly). 'babl-0.1' is checked in priority + # because it would be a newer version. + babl = dependency('babl', version: '>='+babl_minver) +endif cairo_minver = '1.12.2' cairo = dependency('cairo', version: '>='+cairo_minver)