1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
https://bugs.gentoo.org/880479
https://bugs.gentoo.org/880405
https://github.com/harfbuzz/harfbuzz/pull/3870
From 2c14943fb06ffd6de4e270454501ff5d305ede6e Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz93@gmail.com>
Date: Tue, 8 Nov 2022 16:24:08 -0500
Subject: [PATCH] meson: fix regression in detecting freetype2/icu-uc when
explicitly disabled
In #3811 / commit 53a194aa3f5f7de0b40e879e41fcbe0de6e9fefe a broken and
half-implemented approach to kind of sort of handling the detection of
both pkg-config and cmake names for dependencies, was implemented. It
just checked for both versions with required: false, but when the build
was configured with *disabled* options, it was still found because it
was treated as auto.
Really, the problem here is trying to outsmart Meson, which handles a
lot of edge cases correctly. But it's possible, albeit very wordy, to
manually implement Meson's internal logic via if/else fallbacks. Do so
here.
--- a/meson.build
+++ b/meson.build
@@ -83,20 +83,35 @@ check_funcs = [
m_dep = cpp.find_library('m', required: false)
-
-# Try pkgconfig name
-freetype_dep = dependency('freetype2', required: false)
-if not freetype_dep.found()
- # Try cmake name
- freetype_dep = dependency('freetype', required: false)
-endif
-if not freetype_dep.found()
- # Subproject fallback, `allow_fallback: true` means the fallback will be
- # tried even if the freetype option is set to `auto`.
- freetype_dep = dependency('freetype2',
+if meson.version().version_compare('>=0.60.0')
+ # pkg-config: freetype2, cmake: Freetype
+ freetype_dep = dependency('freetype2', 'Freetype',
required: get_option('freetype'),
default_options: ['harfbuzz=disabled'],
allow_fallback: true)
+else
+ # painful hack to handle multiple dependencies but also respect options
+ freetype_opt = get_option('freetype')
+ # we want to handle enabled manually after fallbacks, but also handle disabled normally
+ if freetype_opt.enabled()
+ freetype_opt = false
+ endif
+ # try pkg-config name
+ freetype_dep = dependency('freetype2', method: 'pkg-config', required: freetype_opt)
+ # when disabled, leave it not-found
+ if not freetype_dep.found() and not get_option('freetype').disabled()
+ # Try cmake name
+ freetype_dep = dependency('Freetype', method: 'cmake', required: false)
+ # Subproject fallback, `allow_fallback: true` means the fallback will be
+ # tried even if the freetype option is set to `auto`.
+ if not freetype_dep.found()
+ freetype_dep = dependency('freetype2',
+ method: 'pkg-config',
+ required: get_option('freetype'),
+ default_options: ['harfbuzz=disabled'],
+ allow_fallback: true)
+ endif
+ endif
endif
glib_dep = dependency('glib-2.0', required: get_option('glib'))
@@ -104,18 +119,36 @@ gobject_dep = dependency('gobject-2.0', required: get_option('gobject'))
graphite2_dep = dependency('graphite2', required: get_option('graphite2'))
graphite_dep = dependency('graphite2', required: get_option('graphite'))
-# Try pkgconfig name
-icu_dep = dependency('icu-uc', required: false)
-if not icu_dep.found()
- # Try cmake name
- icu_dep = dependency('ICU',
- required: false,
- components: 'uc',
- method: 'cmake')
-endif
-if not icu_dep.found()
- # Subproject fallback if icu option is enabled
- icu_dep = dependency('icu-uc', required: get_option('icu'))
+if meson.version().version_compare('>=0.60.0')
+ # pkg-config: icu-uc, cmake: ICU but with components
+ icu_dep = dependency('icu-uc', 'ICU',
+ components: 'uc',
+ required: get_option('icu'),
+ default_options: ['harfbuzz=disabled'],
+ allow_fallback: true)
+else
+ # painful hack to handle multiple dependencies but also respect options
+ icu_opt = get_option('icu')
+ # we want to handle enabled manually after fallbacks, but also handle disabled normally
+ if icu_opt.enabled()
+ icu_opt = false
+ endif
+ # try pkg-config name
+ icu_dep = dependency('icu-uc', method: 'pkg-config', required: icu_opt)
+ # when disabled, leave it not-found
+ if not icu_dep.found() and not get_option('icu').disabled()
+ # Try cmake name
+ icu_dep = dependency('ICU', method: 'cmake', components: 'uc', required: false)
+ # Try again with subproject fallback. `allow_fallback: true` means the
+ # fallback will be tried even if the icu option is set to `auto`, but
+ # we cannot pass this option until Meson 0.59.0, because no wrap file
+ # is checked into git.
+ if not icu_dep.found()
+ icu_dep = dependency('icu-uc',
+ method: 'pkg-config',
+ required: get_option('icu'))
+ endif
+ endif
endif
if icu_dep.found() and icu_dep.type_name() == 'pkgconfig'
|
GitWeb