Merge branch 'pixbuf-fix-for-4-2' into 'gtk-4-2'

Meson: gdk-pixbuf jpeg/png options changed to feature

See merge request GNOME/gtk!3532
This commit is contained in:
Matthias Clasen 2021-05-07 21:14:51 +00:00
commit f639fda994

View File

@ -388,7 +388,7 @@ pangocairo_dep = dependency('pangocairo', version: pango_req,
fallback : ['pango', 'libpangocairo_dep'])
pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'],
default_options: ['png=true', 'jpeg=true', 'builtin_loaders=png,jpeg', 'man=false'])
default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false'])
epoxy_dep = dependency('epoxy', version: epoxy_req,
fallback: ['libepoxy', 'libepoxy_dep'])
harfbuzz_dep = dependency('harfbuzz', version: '>= 0.9', required: false,