diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-02-16 21:31:49 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-02-16 21:31:49 +0000 |
| commit | 9bb614133480c294ea31c80c469b5bb8c458aaaf (patch) | |
| tree | 3b8ef43d24e1d46369260f4b18fedbaacd74a64a | |
| parent | 2bea237f786265391dfb48d4216073630699afb0 (diff) | |
| parent | daac10fd6ca8cbc415cee10d51a543eb648705f8 (diff) | |
| download | pango-9bb614133480c294ea31c80c469b5bb8c458aaaf.tar.gz | |
Merge branch 'for-main' into 'main'
Enable Cairo by default
See merge request GNOME/pango!591
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 59a39434..fcff9ea7 100644 --- a/meson.build +++ b/meson.build @@ -445,8 +445,7 @@ endif # in a declarative way if not cairo_dep.found() cairo_dep = dependency('cairo', version: cairo_req_version, - fallback: ['cairo', 'libcairo_dep'], required: get_option('cairo'), - default_options: ['freetype=enabled', 'fontconfig=enabled']) + fallback: ['cairo', 'libcairo_dep'], required: get_option('cairo')) cairo_found_type = cairo_dep.type_name() endif diff --git a/meson_options.txt b/meson_options.txt index 235b8a48..58200e00 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -25,7 +25,7 @@ option('libthai', description : 'Build with libthai support') option('cairo', type : 'feature', - value : 'auto', + value : 'enabled', description : 'Build with cairo support') option('xft', type : 'feature', |